From c426190074e5d86e8fbdab2ea7d4e312a21a9555 Mon Sep 17 00:00:00 2001 From: "peterv%netscape.com" Date: Wed, 2 May 2001 22:34:23 +0000 Subject: [PATCH] Get P3P support building on Mac. Bug 62399. r=harishd. Not part of the build. git-svn-id: svn://10.0.0.236/trunk@93689 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/extensions/p3p/macbuild/p3p.mcp | Bin 79134 -> 92602 bytes mozilla/extensions/p3p/macbuild/p3pIDL.mcp | Bin 82400 -> 91340 bytes mozilla/extensions/p3p/public/MANIFEST | 3 ++ mozilla/extensions/p3p/src/nsIP3PCService.h | 18 +++---- mozilla/extensions/p3p/src/nsIP3PCUI.h | 2 +- mozilla/extensions/p3p/src/nsIP3PDataStruct.h | 10 ++-- mozilla/extensions/p3p/src/nsIP3PPolicy.h | 2 +- .../extensions/p3p/src/nsIP3PPreferences.h | 6 +-- .../extensions/p3p/src/nsIP3PPrivacyResult.h | 10 ++-- mozilla/extensions/p3p/src/nsIP3PReference.h | 8 +-- mozilla/extensions/p3p/src/nsIP3PTag.h | 12 ++--- mozilla/extensions/p3p/src/nsIP3PUIService.h | 4 +- .../extensions/p3p/src/nsIP3PURIInformation.h | 10 ++-- .../extensions/p3p/src/nsIP3PXMLListener.h | 6 +-- .../extensions/p3p/src/nsP3PDataSchema.cpp | 18 +++---- mozilla/extensions/p3p/src/nsP3PDataSchema.h | 4 +- .../extensions/p3p/src/nsP3PDataStruct.cpp | 2 +- mozilla/extensions/p3p/src/nsP3PDataStruct.h | 2 +- .../extensions/p3p/src/nsP3PHTTPNotify.cpp | 16 +++--- mozilla/extensions/p3p/src/nsP3PHTTPNotify.h | 14 +++--- mozilla/extensions/p3p/src/nsP3PLogging.h | 2 +- mozilla/extensions/p3p/src/nsP3PModule.cpp | 2 +- .../p3p/src/nsP3PObserverFormSubmit.cpp | 6 +-- .../p3p/src/nsP3PObserverFormSubmit.h | 18 +++---- .../extensions/p3p/src/nsP3PObserverHTML.cpp | 16 +++--- .../extensions/p3p/src/nsP3PObserverHTML.h | 12 ++--- .../p3p/src/nsP3PObserverLayout.cpp | 24 ++++----- .../extensions/p3p/src/nsP3PObserverLayout.h | 14 +++--- .../extensions/p3p/src/nsP3PObserverUtils.cpp | 4 +- .../extensions/p3p/src/nsP3PObserverUtils.h | 8 +-- mozilla/extensions/p3p/src/nsP3PObserverXML.h | 12 ++--- mozilla/extensions/p3p/src/nsP3PPolicy.cpp | 14 +++--- mozilla/extensions/p3p/src/nsP3PPolicy.h | 14 +++--- .../extensions/p3p/src/nsP3PPolicyRefFile.cpp | 4 +- .../extensions/p3p/src/nsP3PPolicyRefFile.h | 4 +- .../extensions/p3p/src/nsP3PPreferences.cpp | 6 +-- mozilla/extensions/p3p/src/nsP3PPreferences.h | 4 +- .../extensions/p3p/src/nsP3PPrivacyResult.cpp | 12 ++--- .../extensions/p3p/src/nsP3PPrivacyResult.h | 8 +-- mozilla/extensions/p3p/src/nsP3PReference.cpp | 4 +- mozilla/extensions/p3p/src/nsP3PReference.h | 6 +-- mozilla/extensions/p3p/src/nsP3PService.cpp | 20 ++++---- mozilla/extensions/p3p/src/nsP3PService.h | 26 +++++----- .../p3p/src/nsP3PSimpleEnumerator.h | 6 +-- mozilla/extensions/p3p/src/nsP3PTags.cpp | 2 +- mozilla/extensions/p3p/src/nsP3PTags.h | 2 +- mozilla/extensions/p3p/src/nsP3PUI.cpp | 46 +++++++++--------- mozilla/extensions/p3p/src/nsP3PUI.h | 26 +++++----- mozilla/extensions/p3p/src/nsP3PUIService.cpp | 14 +++--- mozilla/extensions/p3p/src/nsP3PUIService.h | 16 +++--- .../p3p/src/nsP3PURIInformation.cpp | 4 +- .../extensions/p3p/src/nsP3PURIInformation.h | 2 +- .../extensions/p3p/src/nsP3PXMLProcessor.cpp | 22 ++++----- .../extensions/p3p/src/nsP3PXMLProcessor.h | 28 +++++------ mozilla/extensions/p3p/src/nsP3PXMLUtils.cpp | 14 +++--- mozilla/extensions/p3p/src/nsP3PXMLUtils.h | 8 +-- 56 files changed, 290 insertions(+), 287 deletions(-) diff --git a/mozilla/extensions/p3p/macbuild/p3p.mcp b/mozilla/extensions/p3p/macbuild/p3p.mcp index 53b17016c044863a97fbe57f2c9cadd2ae20f279..4deac9d3e63061d65616b9e9eb5cade4c793f50f 100644 GIT binary patch delta 4335 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 P?jCfVcJeUzO5*~p>ob#PI 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 delta 961 zcmYk4T}V_>5XWck-u=3+tLD1t>guj&29g+BrjS~)maS~7`QXPx>S7|gSn7ihMQc_M zL8P4W^ctl|1sMn2hl(U3O$savLP$db!vc*E(;l|DdxaVp&i&7CX6|s#ym_tvGN?}r zba!_FfDQon0v=cgEJ_AYW+>MCI4usv3s*8a^@L62G2|9{d8rjJUZXdy9n_}Dpi`hiLK z^0>@rj^aVe%R*6BhF= z7E{5-LjJ1^Q)z$zit=KMB&y=3kfjP`*nf&W9eXH(<1_n(ck`-MnwX{Vq8SnCGZopKEDPR=7+z9vBv#~KFiPRux!7WgPQl;SV@kT~ zIY4YE*xRS>%zs9^19FJV4Y(>PlYG4a?T+FyiWLU?+9_A}?O(D|9de*gOH?3~BYt*NI0r4WNtj z{8p;B%>wA-HU9MnaoScgEcnfvRi2>cmuj3<5KuRa%(}vdqV+x!tr{Qk61PS%SU32T z%B`KG6^*}ZCLXWxgi5}ya_1q^vl`#nM|_vYNAGf1fcV%G(&HL$Izrs0@$^#eSNS|$ Ts$|jl=QiT@9lpXt0kr)E=HT-V diff --git a/mozilla/extensions/p3p/public/MANIFEST b/mozilla/extensions/p3p/public/MANIFEST index f667df42f35..9277d182612 100644 --- a/mozilla/extensions/p3p/public/MANIFEST +++ b/mozilla/extensions/p3p/public/MANIFEST @@ -22,3 +22,6 @@ # # This is a list of local files which get exported # + +nsIP3PService.idl +nsIP3PUI.idl diff --git a/mozilla/extensions/p3p/src/nsIP3PCService.h b/mozilla/extensions/p3p/src/nsIP3PCService.h index 14b70488eed..5e6cc91827d 100644 --- a/mozilla/extensions/p3p/src/nsIP3PCService.h +++ b/mozilla/extensions/p3p/src/nsIP3PCService.h @@ -28,18 +28,18 @@ #include "nsIP3PTag.h" #include "nsIP3PDataStruct.h" -#include -#include +#include "nsCOMPtr.h" +#include "nsIP3PService.h" -#include -#include -#include -#include +#include "nsIURI.h" +#include "nsIDocShellTreeItem.h" +#include "nsIDOMWindowInternal.h" +#include "nsIContent.h" -#include +#include "nsIRDFDataSource.h" -#include -#include +#include "nsString.h" +#include "nsVoidArray.h" #define NS_IP3PCSERVICE_IID_STR "31430e56-d43d-11d3-9781-002035aee991" diff --git a/mozilla/extensions/p3p/src/nsIP3PCUI.h b/mozilla/extensions/p3p/src/nsIP3PCUI.h index d03f4c9dcb4..24b3b2d3cc3 100644 --- a/mozilla/extensions/p3p/src/nsIP3PCUI.h +++ b/mozilla/extensions/p3p/src/nsIP3PCUI.h @@ -25,7 +25,7 @@ #define nsIP3PUI_h__ #include "nsISupports.h" -#include +#include "nsIP3PUI.h" #define NS_IP3PCUI_IID_STR "31430e62-d43d-11d3-9781-002035aee991" #define NS_IP3PCUI_IID {0x31430e62, 0xd43d, 0x11d3, { 0x97, 0x81, 0x00, 0x20, 0x35, 0xae, 0xe9, 0x91 }} diff --git a/mozilla/extensions/p3p/src/nsIP3PDataStruct.h b/mozilla/extensions/p3p/src/nsIP3PDataStruct.h index c273f581e2f..16e3598d558 100644 --- a/mozilla/extensions/p3p/src/nsIP3PDataStruct.h +++ b/mozilla/extensions/p3p/src/nsIP3PDataStruct.h @@ -26,13 +26,13 @@ #include "nsIP3PTag.h" -#include -#include +#include "nsCOMPtr.h" +#include "nsISupports.h" -#include +#include "nsString.h" -#include -#include +#include "nsISupportsArray.h" +#include "nsISimpleEnumerator.h" #define NS_IP3PDATASTRUCT_IID_STR "31430e5f-d43d-11d3-9781-002035aee991" diff --git a/mozilla/extensions/p3p/src/nsIP3PPolicy.h b/mozilla/extensions/p3p/src/nsIP3PPolicy.h index b839b207053..116d950697a 100644 --- a/mozilla/extensions/p3p/src/nsIP3PPolicy.h +++ b/mozilla/extensions/p3p/src/nsIP3PPolicy.h @@ -26,7 +26,7 @@ #include "nsP3PXMLProcessor.h" -#include +#include "nsIRDFDataSource.h" #define NS_IP3PPOLICY_IID_STR "31430e5b-d43d-11d3-9781-002035aee991" diff --git a/mozilla/extensions/p3p/src/nsIP3PPreferences.h b/mozilla/extensions/p3p/src/nsIP3PPreferences.h index 8667a883937..e29634feb3c 100644 --- a/mozilla/extensions/p3p/src/nsIP3PPreferences.h +++ b/mozilla/extensions/p3p/src/nsIP3PPreferences.h @@ -24,10 +24,10 @@ #ifndef nsIP3PPreferences_h__ #define nsIP3PPreferences_h__ -#include -#include +#include "nsCOMPtr.h" +#include "nsISupports.h" -#include +#include "nsString.h" #define NS_IP3PPREFERENCES_IID_STR "31430e57-d43d-11d3-9781-002035aee991" #define NS_IP3PPREFERENCES_IID {0x31430e57, 0xd43d, 0x11d3, { 0x97, 0x81, 0x00, 0x20, 0x35, 0xae, 0xe9, 0x91 }} diff --git a/mozilla/extensions/p3p/src/nsIP3PPrivacyResult.h b/mozilla/extensions/p3p/src/nsIP3PPrivacyResult.h index 0e5e9e5a6b3..b640fad157e 100644 --- a/mozilla/extensions/p3p/src/nsIP3PPrivacyResult.h +++ b/mozilla/extensions/p3p/src/nsIP3PPrivacyResult.h @@ -26,14 +26,14 @@ #include "nsIP3PPolicy.h" -#include -#include +#include "nsCOMPtr.h" +#include "nsISupports.h" -#include +#include "nsIRDFDataSource.h" -#include +#include "nsISupportsArray.h" -#include +#include "nsString.h" #define NS_IP3PPRIVACYRESULT_IID_STR "31430e5d-d43d-11d3-9781-002035aee991" diff --git a/mozilla/extensions/p3p/src/nsIP3PReference.h b/mozilla/extensions/p3p/src/nsIP3PReference.h index 241240579f6..a4466e0f73c 100644 --- a/mozilla/extensions/p3p/src/nsIP3PReference.h +++ b/mozilla/extensions/p3p/src/nsIP3PReference.h @@ -27,11 +27,11 @@ #include "nsIP3PPolicyRefFile.h" #include "nsIP3PPolicy.h" -#include -#include +#include "nsCOMPtr.h" +#include "nsISupports.h" -#include -#include +#include "nsVoidArray.h" +#include "nsString.h" #define NS_IP3PREFERENCE_IID_STR "31430e5a-d43d-11d3-9781-002035aee991" diff --git a/mozilla/extensions/p3p/src/nsIP3PTag.h b/mozilla/extensions/p3p/src/nsIP3PTag.h index 044ce237524..6b28d50b5a8 100644 --- a/mozilla/extensions/p3p/src/nsIP3PTag.h +++ b/mozilla/extensions/p3p/src/nsIP3PTag.h @@ -24,15 +24,15 @@ #ifndef nsIP3PTag_h__ #define nsIP3PTag_h__ -#include -#include +#include "nsCOMPtr.h" +#include "nsISupports.h" -#include +#include "nsIDOMNode.h" -#include +#include "nsString.h" -#include -#include +#include "nsISupportsArray.h" +#include "nsISimpleEnumerator.h" #define NS_IP3PTAG_IID_STR "31430e5e-d43d-11d3-9781-002035aee991" diff --git a/mozilla/extensions/p3p/src/nsIP3PUIService.h b/mozilla/extensions/p3p/src/nsIP3PUIService.h index 8c37ec7e46a..2c312b55a59 100644 --- a/mozilla/extensions/p3p/src/nsIP3PUIService.h +++ b/mozilla/extensions/p3p/src/nsIP3PUIService.h @@ -26,8 +26,8 @@ #include "nsISupports.h" #include "nsIP3PCUI.h" -#include -#include +#include "nsIDocShellTreeItem.h" +#include "nsIDOMWindowInternal.h" #define NS_IP3PUISERVICE_IID_STR "31430e52-d43d-11d3-9781-002035aee991" diff --git a/mozilla/extensions/p3p/src/nsIP3PURIInformation.h b/mozilla/extensions/p3p/src/nsIP3PURIInformation.h index f5af72d0ead..82be961a47f 100644 --- a/mozilla/extensions/p3p/src/nsIP3PURIInformation.h +++ b/mozilla/extensions/p3p/src/nsIP3PURIInformation.h @@ -24,13 +24,13 @@ #ifndef nsIP3PURIInformation_h__ #define nsIP3PURIInformation_h__ -#include -#include +#include "nsCOMPtr.h" +#include "nsISupports.h" -#include +#include "nsIURI.h" -#include -#include +#include "nsString.h" +#include "nsVoidArray.h" #define NS_IP3PURIINFORMATION_IID_STR "31430e58-d43d-11d3-9781-002035aee991" diff --git a/mozilla/extensions/p3p/src/nsIP3PXMLListener.h b/mozilla/extensions/p3p/src/nsIP3PXMLListener.h index 1e89b2d74dd..1c63ef43b48 100644 --- a/mozilla/extensions/p3p/src/nsIP3PXMLListener.h +++ b/mozilla/extensions/p3p/src/nsIP3PXMLListener.h @@ -24,10 +24,10 @@ #ifndef nsIP3PXMLListener_h__ #define nsIP3PXMLListener_h__ -#include -#include +#include "nsCOMPtr.h" +#include "nsISupports.h" -#include +#include "nsString.h" #define NS_IP3PXMLLISTENER_IID_STR "31430e61-d43d-11d3-9781-002035aee991" diff --git a/mozilla/extensions/p3p/src/nsP3PDataSchema.cpp b/mozilla/extensions/p3p/src/nsP3PDataSchema.cpp index 52fc5812042..9b64a785f09 100644 --- a/mozilla/extensions/p3p/src/nsP3PDataSchema.cpp +++ b/mozilla/extensions/p3p/src/nsP3PDataSchema.cpp @@ -29,19 +29,19 @@ #include "nsP3PSimpleEnumerator.h" #include "nsP3PLogging.h" -#include -#include -#include +#include "nsIDirectoryService.h" +#include "nsIProperties.h" +#include "nsIFile.h" -#include +#include "nsNetUtil.h" -#include +#include "nsXPIDLString.h" -#include -#include -#include +#include "nsIFileLocator.h" +#include "nsFileLocations.h" +#include "nsIFileSpec.h" -#include +#include "nsAutoLock.h" // **************************************************************************** diff --git a/mozilla/extensions/p3p/src/nsP3PDataSchema.h b/mozilla/extensions/p3p/src/nsP3PDataSchema.h index 8069c8279cf..5110ed5f009 100644 --- a/mozilla/extensions/p3p/src/nsP3PDataSchema.h +++ b/mozilla/extensions/p3p/src/nsP3PDataSchema.h @@ -28,8 +28,8 @@ #include "nsIP3PXMLListener.h" #include "nsIP3PDataStruct.h" -#include -#include +#include "nsHashtable.h" +#include "nsVoidArray.h" class nsP3PDataSchema : public nsIP3PDataSchema, diff --git a/mozilla/extensions/p3p/src/nsP3PDataStruct.cpp b/mozilla/extensions/p3p/src/nsP3PDataStruct.cpp index 8f6b157f994..e590b9ac8c4 100644 --- a/mozilla/extensions/p3p/src/nsP3PDataStruct.cpp +++ b/mozilla/extensions/p3p/src/nsP3PDataStruct.cpp @@ -27,7 +27,7 @@ #include "nsP3PTags.h" #include "nsP3PSimpleEnumerator.h" -#include +#include "nsIComponentManager.h" // **************************************************************************** diff --git a/mozilla/extensions/p3p/src/nsP3PDataStruct.h b/mozilla/extensions/p3p/src/nsP3PDataStruct.h index 9aa73f2cbf3..be2164ff420 100644 --- a/mozilla/extensions/p3p/src/nsP3PDataStruct.h +++ b/mozilla/extensions/p3p/src/nsP3PDataStruct.h @@ -26,7 +26,7 @@ #include "nsIP3PDataStruct.h" -#include +#include "nsVoidArray.h" class nsP3PDataStruct : public nsIP3PDataStruct { diff --git a/mozilla/extensions/p3p/src/nsP3PHTTPNotify.cpp b/mozilla/extensions/p3p/src/nsP3PHTTPNotify.cpp index 9173e950c0c..8c491cc2276 100644 --- a/mozilla/extensions/p3p/src/nsP3PHTTPNotify.cpp +++ b/mozilla/extensions/p3p/src/nsP3PHTTPNotify.cpp @@ -26,17 +26,17 @@ #include "nsP3PHTTPNotify.h" #include "nsP3PLogging.h" -#include +#include "nsIServiceManager.h" -#include -#include -#include +#include "nsIHTTPHeader.h" +#include "nsIURI.h" +#include "nsILoadGroup.h" -#include -#include +#include "nsIInterfaceRequestor.h" +#include "nsIDocumentLoader.h" -#include -#include +#include "nsString.h" +#include "nsXPIDLString.h" // **************************************************************************** diff --git a/mozilla/extensions/p3p/src/nsP3PHTTPNotify.h b/mozilla/extensions/p3p/src/nsP3PHTTPNotify.h index 9f05b8e47a5..17a2ac242b8 100644 --- a/mozilla/extensions/p3p/src/nsP3PHTTPNotify.h +++ b/mozilla/extensions/p3p/src/nsP3PHTTPNotify.h @@ -26,17 +26,17 @@ #include "nsIP3PCService.h" -#include -#include -#include +#include "nsCOMPtr.h" +#include "nsISupports.h" +#include "nsIHttpNotify.h" -#include +#include "nsINetModuleMgr.h" -#include +#include "nsIHTTPChannel.h" -#include +#include "nsIDocShellTreeItem.h" -#include +#include "nsIAtom.h" class nsP3PHTTPNotify : public nsIHTTPNotify { diff --git a/mozilla/extensions/p3p/src/nsP3PLogging.h b/mozilla/extensions/p3p/src/nsP3PLogging.h index 86ff7935636..f72c42530e0 100644 --- a/mozilla/extensions/p3p/src/nsP3PLogging.h +++ b/mozilla/extensions/p3p/src/nsP3PLogging.h @@ -24,7 +24,7 @@ #ifndef nsP3PLogging_h__ #define nsP3PLogging_h__ -#include +#include "prlog.h" #ifndef P3P_LOG_DEFINITION extern PRLogModuleInfo *gP3PLogModule; diff --git a/mozilla/extensions/p3p/src/nsP3PModule.cpp b/mozilla/extensions/p3p/src/nsP3PModule.cpp index 3999bfe2a8e..964d110a1a4 100644 --- a/mozilla/extensions/p3p/src/nsP3PModule.cpp +++ b/mozilla/extensions/p3p/src/nsP3PModule.cpp @@ -25,7 +25,7 @@ #include "nsP3PUIService.h" #include "nsP3PUI.h" -#include +#include "nsIGenericFactory.h" // Define a table of CIDs implemented by this module: diff --git a/mozilla/extensions/p3p/src/nsP3PObserverFormSubmit.cpp b/mozilla/extensions/p3p/src/nsP3PObserverFormSubmit.cpp index 8000db4764a..43d6f7fa264 100644 --- a/mozilla/extensions/p3p/src/nsP3PObserverFormSubmit.cpp +++ b/mozilla/extensions/p3p/src/nsP3PObserverFormSubmit.cpp @@ -26,11 +26,11 @@ #include "nsP3PObserverFormSubmit.h" -#include +#include "nsIServiceManager.h" -#include +#include "nsIPresShell.h" -#include +#include "nsString.h" // **************************************************************************** diff --git a/mozilla/extensions/p3p/src/nsP3PObserverFormSubmit.h b/mozilla/extensions/p3p/src/nsP3PObserverFormSubmit.h index f2211924ef8..a88229605d0 100644 --- a/mozilla/extensions/p3p/src/nsP3PObserverFormSubmit.h +++ b/mozilla/extensions/p3p/src/nsP3PObserverFormSubmit.h @@ -26,17 +26,17 @@ #include "nsIP3PCService.h" -#include -#include -#include -#include // nsIFormSubmitObserver.h does not include nsIContent... -#include +#include "nsCOMPtr.h" +#include "nsISupports.h" +#include "nsIObserver.h" +#include "nsIContent.h" // nsIFormSubmitObserver.h does not include nsIContent... +#include "nsIFormSubmitObserver.h" -#include +#include "nsIObserverService.h" -#include -#include -#include +#include "nsIContent.h" +#include "nsIDOMWindowInternal.h" +#include "nsIURI.h" class nsP3PObserverFormSubmit : public nsIObserver, diff --git a/mozilla/extensions/p3p/src/nsP3PObserverHTML.cpp b/mozilla/extensions/p3p/src/nsP3PObserverHTML.cpp index f7edfe971f1..45f0931bf6f 100644 --- a/mozilla/extensions/p3p/src/nsP3PObserverHTML.cpp +++ b/mozilla/extensions/p3p/src/nsP3PObserverHTML.cpp @@ -27,17 +27,17 @@ #include "nsP3PObserverUtils.h" #include "nsP3PLogging.h" -#include +#include "nsIServiceManager.h" -#include +#include "nsIParser.h" -#include -#include -#include -#include +#include "nsIDocShell.h" +#include "nsIDocShellTreeItem.h" +#include "nsIWebNavigation.h" +#include "nsIDocument.h" -#include -#include +#include "nsString.h" +#include "nsXPIDLString.h" // **************************************************************************** diff --git a/mozilla/extensions/p3p/src/nsP3PObserverHTML.h b/mozilla/extensions/p3p/src/nsP3PObserverHTML.h index ab83daf18bc..50b27cd5def 100644 --- a/mozilla/extensions/p3p/src/nsP3PObserverHTML.h +++ b/mozilla/extensions/p3p/src/nsP3PObserverHTML.h @@ -26,13 +26,13 @@ #include "nsIP3PCService.h" -#include -#include -#include -#include -#include +#include "nsCOMPtr.h" +#include "nsISupports.h" +#include "nsIObserver.h" +#include "nsIElementObserver.h" +#include "nsWeakReference.h" -#include +#include "nsIObserverService.h" extern diff --git a/mozilla/extensions/p3p/src/nsP3PObserverLayout.cpp b/mozilla/extensions/p3p/src/nsP3PObserverLayout.cpp index abb10de81cf..74a567a6d5c 100644 --- a/mozilla/extensions/p3p/src/nsP3PObserverLayout.cpp +++ b/mozilla/extensions/p3p/src/nsP3PObserverLayout.cpp @@ -26,22 +26,22 @@ #include "nsP3PObserverLayout.h" #include "nsP3PLogging.h" -#include -#include +#include "nsCOMPtr.h" +#include "nsIServiceManager.h" -#include +#include "nsIPresShell.h" -#include -#include +#include "nsIDocShellTreeItem.h" +#include "nsIWebNavigation.h" -#include -#include -#include -#include -#include +#include "nsCURILoader.h" +#include "nsIURILoader.h" +#include "nsILoadGroup.h" +#include "nsIHTTPChannel.h" +#include "nsISimpleEnumerator.h" -#include -#include +#include "nsString.h" +#include "nsXPIDLString.h" // **************************************************************************** diff --git a/mozilla/extensions/p3p/src/nsP3PObserverLayout.h b/mozilla/extensions/p3p/src/nsP3PObserverLayout.h index 8d1b3c5a7a8..d9ece0c17a1 100644 --- a/mozilla/extensions/p3p/src/nsP3PObserverLayout.h +++ b/mozilla/extensions/p3p/src/nsP3PObserverLayout.h @@ -26,15 +26,15 @@ #include "nsIP3PCService.h" -#include -#include -#include -#include +#include "nsCOMPtr.h" +#include "nsISupports.h" +#include "nsIObserver.h" +#include "nsWeakReference.h" -#include +#include "nsIObserverService.h" -#include -#include +#include "nsIDocShell.h" +#include "nsIURI.h" class nsP3PObserverLayout : public nsIObserver, diff --git a/mozilla/extensions/p3p/src/nsP3PObserverUtils.cpp b/mozilla/extensions/p3p/src/nsP3PObserverUtils.cpp index 4058a69c6d2..c2d745b8966 100644 --- a/mozilla/extensions/p3p/src/nsP3PObserverUtils.cpp +++ b/mozilla/extensions/p3p/src/nsP3PObserverUtils.cpp @@ -26,8 +26,8 @@ #include "nsP3PObserverUtils.h" #include "nsP3PLogging.h" -#include -#include +#include "nsString.h" +#include "nsXPIDLString.h" // P3P Observer Utils: ExamineLINKTag diff --git a/mozilla/extensions/p3p/src/nsP3PObserverUtils.h b/mozilla/extensions/p3p/src/nsP3PObserverUtils.h index 883d466a838..1484943ab32 100644 --- a/mozilla/extensions/p3p/src/nsP3PObserverUtils.h +++ b/mozilla/extensions/p3p/src/nsP3PObserverUtils.h @@ -26,13 +26,13 @@ #include "nsIP3PCService.h" -#include +#include "nsCom.h" -#include +#include "nsIURI.h" -#include +#include "nsIDocShellTreeItem.h" -#include +#include "nsVoidArray.h" class nsP3PObserverUtils { diff --git a/mozilla/extensions/p3p/src/nsP3PObserverXML.h b/mozilla/extensions/p3p/src/nsP3PObserverXML.h index fadbcc93cd8..cc93d7be647 100644 --- a/mozilla/extensions/p3p/src/nsP3PObserverXML.h +++ b/mozilla/extensions/p3p/src/nsP3PObserverXML.h @@ -26,13 +26,13 @@ #include "nsIP3PCService.h" -#include -#include -#include -#include -#include +#include "nsCOMPtr.h" +#include "nsISupports.h" +#include "nsIObserver.h" +#include "nsIElementObserver.h" +#include "nsWeakReference.h" -#include +#include "nsIObserverService.h" extern diff --git a/mozilla/extensions/p3p/src/nsP3PPolicy.cpp b/mozilla/extensions/p3p/src/nsP3PPolicy.cpp index 2f2ee2d70d0..f8b94f9390f 100644 --- a/mozilla/extensions/p3p/src/nsP3PPolicy.cpp +++ b/mozilla/extensions/p3p/src/nsP3PPolicy.cpp @@ -29,15 +29,15 @@ #include "nsP3PSimpleEnumerator.h" #include "nsP3PLogging.h" -#include +#include "nsIServiceManager.h" -#include -#include +#include "rdf.h" +#include "nsRDFCID.h" -#include +#include "nsNetUtil.h" -#include -#include +#include "nsXPIDLString.h" +#include "prprf.h" // **************************************************************************** @@ -92,7 +92,7 @@ NS_NewP3PPolicy( nsString& aPolicyURISpec, // P3P Policy: Constructor nsP3PPolicy::nsP3PPolicy( ) : mDataSchemas( 32, PR_TRUE ), - mPrefsTime( nsnull ), + mPrefsTime( LL_ZERO ), mPrefsResult( P3P_PRIVACY_MET ), mFailedDataTagRefs( 64, PR_TRUE ) { diff --git a/mozilla/extensions/p3p/src/nsP3PPolicy.h b/mozilla/extensions/p3p/src/nsP3PPolicy.h index 22959a45ea2..844c424f9e6 100644 --- a/mozilla/extensions/p3p/src/nsP3PPolicy.h +++ b/mozilla/extensions/p3p/src/nsP3PPolicy.h @@ -28,14 +28,14 @@ #include "nsIP3PDataSchema.h" #include "nsIP3PXMLListener.h" -#include -#include -#include -#include +#include "nsIRDFService.h" +#include "nsIRDFDataSource.h" +#include "nsIRDFResource.h" +#include "nsIRDFContainerUtils.h" -#include -#include -#include +#include "nsHashtable.h" +#include "nsVoidArray.h" +#include "nsSupportsArray.h" class nsP3PPolicy : public nsIP3PPolicy, diff --git a/mozilla/extensions/p3p/src/nsP3PPolicyRefFile.cpp b/mozilla/extensions/p3p/src/nsP3PPolicyRefFile.cpp index 09806699ef4..48bd39399ea 100644 --- a/mozilla/extensions/p3p/src/nsP3PPolicyRefFile.cpp +++ b/mozilla/extensions/p3p/src/nsP3PPolicyRefFile.cpp @@ -29,9 +29,9 @@ #include "nsP3PSimpleEnumerator.h" #include "nsP3PLogging.h" -#include +#include "nsNetUtil.h" -#include +#include "nsXPIDLString.h" // **************************************************************************** diff --git a/mozilla/extensions/p3p/src/nsP3PPolicyRefFile.h b/mozilla/extensions/p3p/src/nsP3PPolicyRefFile.h index 5c42b3f0815..addb6fde883 100644 --- a/mozilla/extensions/p3p/src/nsP3PPolicyRefFile.h +++ b/mozilla/extensions/p3p/src/nsP3PPolicyRefFile.h @@ -26,8 +26,8 @@ #include "nsIP3PPolicyRefFile.h" -#include -#include +#include "nsHashtable.h" +#include "nsVoidArray.h" class nsP3PPolicyRefFile : public nsIP3PPolicyRefFile, diff --git a/mozilla/extensions/p3p/src/nsP3PPreferences.cpp b/mozilla/extensions/p3p/src/nsP3PPreferences.cpp index 56d6810326c..05601acbfe1 100644 --- a/mozilla/extensions/p3p/src/nsP3PPreferences.cpp +++ b/mozilla/extensions/p3p/src/nsP3PPreferences.cpp @@ -25,8 +25,8 @@ #include "nsP3PPreferences.h" #include "nsP3PLogging.h" -#include -#include +#include "nsNetUtil.h" +#include "nsString.h" // **************************************************************************** @@ -253,7 +253,7 @@ nsP3PPreferences::GetTimePrefsLastChanged( PRTime *aResult ) { NS_IMETHODIMP_( PRBool ) nsP3PPreferences::PrefsChanged( PRTime time ) { - return (time < mTimePrefsLastChanged); + return (LL_CMP(time, <, mTimePrefsLastChanged)); } // P3P Preferences: boolean preference retreival routine diff --git a/mozilla/extensions/p3p/src/nsP3PPreferences.h b/mozilla/extensions/p3p/src/nsP3PPreferences.h index 58cabc5cae6..b4ef6632175 100644 --- a/mozilla/extensions/p3p/src/nsP3PPreferences.h +++ b/mozilla/extensions/p3p/src/nsP3PPreferences.h @@ -27,8 +27,8 @@ #include "nsIP3PPreferences.h" #include "nsIP3PCService.h" -#include -#include +#include "nsIPref.h" +#include "nsHashtable.h" class nsP3PPreferences : public nsIP3PPreferences { diff --git a/mozilla/extensions/p3p/src/nsP3PPrivacyResult.cpp b/mozilla/extensions/p3p/src/nsP3PPrivacyResult.cpp index 32d4c79a54d..63252d97500 100644 --- a/mozilla/extensions/p3p/src/nsP3PPrivacyResult.cpp +++ b/mozilla/extensions/p3p/src/nsP3PPrivacyResult.cpp @@ -27,14 +27,14 @@ #include "nsP3PSimpleEnumerator.h" #include "nsP3PLogging.h" -#include -#include +#include "nsIServiceManager.h" +#include "nsIComponentManager.h" -#include -#include +#include "rdf.h" +#include "nsRDFCID.h" -#include -#include +#include "nsXPIDLString.h" +#include "prprf.h" // **************************************************************************** diff --git a/mozilla/extensions/p3p/src/nsP3PPrivacyResult.h b/mozilla/extensions/p3p/src/nsP3PPrivacyResult.h index e7d2c799ca7..dd9587bedbc 100644 --- a/mozilla/extensions/p3p/src/nsP3PPrivacyResult.h +++ b/mozilla/extensions/p3p/src/nsP3PPrivacyResult.h @@ -27,10 +27,10 @@ #include "nsIP3PPrivacyResult.h" #include "nsIP3PCService.h" -#include -#include -#include -#include +#include "nsIRDFService.h" +#include "nsIRDFCompositeDataSource.h" +#include "nsIRDFResource.h" +#include "nsIRDFContainerUtils.h" class nsP3PPrivacyResult : public nsIP3PPrivacyResult { diff --git a/mozilla/extensions/p3p/src/nsP3PReference.cpp b/mozilla/extensions/p3p/src/nsP3PReference.cpp index 6afee04bdef..34934b269f3 100644 --- a/mozilla/extensions/p3p/src/nsP3PReference.cpp +++ b/mozilla/extensions/p3p/src/nsP3PReference.cpp @@ -26,9 +26,9 @@ #include "nsP3PReference.h" #include "nsP3PLogging.h" -#include +#include "nsIComponentManager.h" -#include +#include "nsXPIDLString.h" // **************************************************************************** diff --git a/mozilla/extensions/p3p/src/nsP3PReference.h b/mozilla/extensions/p3p/src/nsP3PReference.h index 13f300a1416..ab62042add0 100644 --- a/mozilla/extensions/p3p/src/nsP3PReference.h +++ b/mozilla/extensions/p3p/src/nsP3PReference.h @@ -26,10 +26,10 @@ #include "nsIP3PReference.h" -#include +#include "nsAutoLock.h" -#include -#include +#include "nsHashtable.h" +#include "nsSupportsArray.h" class nsP3PReference : public nsIP3PReference { diff --git a/mozilla/extensions/p3p/src/nsP3PService.cpp b/mozilla/extensions/p3p/src/nsP3PService.cpp index 4cd39fc97b3..ebe3fdef666 100644 --- a/mozilla/extensions/p3p/src/nsP3PService.cpp +++ b/mozilla/extensions/p3p/src/nsP3PService.cpp @@ -41,23 +41,23 @@ #include "nsP3PPrivacyResult.h" #include "nsP3PLogging.h" -#include +#include "nsIGenericFactory.h" -#include +#include "nsIHTTPProtocolHandler.h" -#include -#include +#include "nsLayoutCID.h" +#include "nsINameSpaceManager.h" -#include +#include "nsNetUtil.h" -#include +#include "nsIDOMNode.h" -#include +#include "nsIWebNavigation.h" -#include -#include +#include "nsString.h" +#include "nsXPIDLString.h" -#include +#include "prprf.h" // **************************************************************************** diff --git a/mozilla/extensions/p3p/src/nsP3PService.h b/mozilla/extensions/p3p/src/nsP3PService.h index c0b83bf51d2..75ffba55caf 100644 --- a/mozilla/extensions/p3p/src/nsP3PService.h +++ b/mozilla/extensions/p3p/src/nsP3PService.h @@ -33,26 +33,26 @@ #include "nsIP3PTag.h" #include "nsIP3PPreferences.h" -#include -#include -#include -#include +#include "nsCOMPtr.h" +#include "nsISupports.h" +#include "nsIComponentManager.h" +#include "nsIGenericFactory.h" -#include +#include "nsICategoryManager.h" -#include +#include "nsICookieService.h" -#include +#include "nsIObserver.h" -#include -#include +#include "nsIHTTPChannel.h" +#include "nsIHttpNotify.h" -#include -#include +#include "nsDeque.h" +#include "nsHashtable.h" -#include +#include "nsIStringBundle.h" -#include +#include "prlog.h" class nsP3PServiceReadData; diff --git a/mozilla/extensions/p3p/src/nsP3PSimpleEnumerator.h b/mozilla/extensions/p3p/src/nsP3PSimpleEnumerator.h index 0c187daac01..1831b31aaec 100644 --- a/mozilla/extensions/p3p/src/nsP3PSimpleEnumerator.h +++ b/mozilla/extensions/p3p/src/nsP3PSimpleEnumerator.h @@ -24,10 +24,10 @@ #ifndef nsP3PSimpleEnumerator_h__ #define nsP3PSimpleEnumerator_h__ -#include -#include +#include "nsCOMPtr.h" +#include "nsISimpleEnumerator.h" -#include +#include "nsISupportsArray.h" class nsP3PSimpleEnumerator : public nsISimpleEnumerator { diff --git a/mozilla/extensions/p3p/src/nsP3PTags.cpp b/mozilla/extensions/p3p/src/nsP3PTags.cpp index d517ca54e63..e7ed72b74e0 100644 --- a/mozilla/extensions/p3p/src/nsP3PTags.cpp +++ b/mozilla/extensions/p3p/src/nsP3PTags.cpp @@ -27,7 +27,7 @@ #include "nsP3PSimpleEnumerator.h" #include "nsP3PLogging.h" -#include +#include "nsIComponentManager.h" // **************************************************************************** diff --git a/mozilla/extensions/p3p/src/nsP3PTags.h b/mozilla/extensions/p3p/src/nsP3PTags.h index 975304320c0..d27488ec517 100644 --- a/mozilla/extensions/p3p/src/nsP3PTags.h +++ b/mozilla/extensions/p3p/src/nsP3PTags.h @@ -27,7 +27,7 @@ #include "nsIP3PTag.h" #include "nsP3PXMLUtils.h" -#include +#include "nsVoidArray.h" class nsP3PTag : public nsIP3PTag { diff --git a/mozilla/extensions/p3p/src/nsP3PUI.cpp b/mozilla/extensions/p3p/src/nsP3PUI.cpp index 2094a03ffd1..25eef9fa889 100644 --- a/mozilla/extensions/p3p/src/nsP3PUI.cpp +++ b/mozilla/extensions/p3p/src/nsP3PUI.cpp @@ -21,34 +21,34 @@ * */ -#include +#include "nspr.h" #include "nsP3PDefines.h" #include "nsP3PUI.h" #include "nsP3PLogging.h" -#include -#include +#include "nsIServiceManager.h" +#include "nsIInterfaceRequestor.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "nsIObserverService.h" +#include "nsIDocumentLoader.h" +#include "nsCURILoader.h" +#include "nsIDocShell.h" +#include "nsIDocShellTreeItem.h" +#include "nsIWebNavigation.h" +#include "nsIDocumentViewer.h" +#include "nsCURILoader.h" +#include "nsIDocument.h" +#include "nsIDOMHTMLDocument.h" +#include "nsIDOMXULDocument.h" +#include "nsIContent.h" +#include "nsIWebProgress.h" +#include "nsIChannel.h" +#include "nsIURI.h" +#include "nsIScriptGlobalObject.h" +#include "nsIScriptGlobalObjectOwner.h" +#include "nsIPrompt.h" -#include +#include "prmem.h" NS_IMPL_ISUPPORTS4( nsP3PUI, nsIP3PUI, @@ -497,7 +497,7 @@ nsP3PUI::OnStateChange(nsIWebProgress *aWebProgress, // Check if this is a redirection nsLoadFlags loadFlags = 0; - rv = pChannel->GetLoadAttributes(&loadFlags); + rv = aRequest->GetLoadFlags(&loadFlags); if (NS_SUCCEEDED( rv )) { if (loadFlags & nsIChannel::LOAD_REPLACE) { diff --git a/mozilla/extensions/p3p/src/nsP3PUI.h b/mozilla/extensions/p3p/src/nsP3PUI.h index 469590454e9..13f7d3a387d 100644 --- a/mozilla/extensions/p3p/src/nsP3PUI.h +++ b/mozilla/extensions/p3p/src/nsP3PUI.h @@ -27,19 +27,19 @@ #include "nsIP3PUI.h" #include "nsIP3PUIService.h" #include "nsIP3PCService.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "nsIPref.h" +#include "nsCOMPtr.h" +#include "nsIDOMElement.h" +#include "nsIObserver.h" +#include "nsIDOMWindow.h" +#include "nsXPIDLString.h" +#include "nsString.h" +#include "nsIDocShell.h" +#include "nsIURI.h" +#include "nsIDocShellTreeItem.h" +#include "nsIWebProgressListener.h" +#include "nsIFormSubmitObserver.h" +#include "nsWeakReference.h" #define P3P_STATUS_NO_P3P 0 #define P3P_STATUS_NO_POLICY 1 diff --git a/mozilla/extensions/p3p/src/nsP3PUIService.cpp b/mozilla/extensions/p3p/src/nsP3PUIService.cpp index 13a8ecddb76..d9e6df3877c 100644 --- a/mozilla/extensions/p3p/src/nsP3PUIService.cpp +++ b/mozilla/extensions/p3p/src/nsP3PUIService.cpp @@ -26,13 +26,13 @@ #include "nsIP3PCUI.h" #include "nsP3PLogging.h" -#include -#include -#include -#include -#include -#include -#include +#include "nsIGenericFactory.h" +#include "nsIP3PUI.h" +#include "nsIScriptGlobalObject.h" +#include "nsIScriptGlobalObjectOwner.h" +#include "nsLayoutCID.h" +#include "nsIPromptService.h" +#include "nsIDOMWindow.h" // **************************************************************************** // nsP3PUIService Implementation routines diff --git a/mozilla/extensions/p3p/src/nsP3PUIService.h b/mozilla/extensions/p3p/src/nsP3PUIService.h index 8151cd80839..c1e496efd07 100644 --- a/mozilla/extensions/p3p/src/nsP3PUIService.h +++ b/mozilla/extensions/p3p/src/nsP3PUIService.h @@ -24,14 +24,14 @@ #ifndef nsP3PUIService_h__ #define nsP3PUIService_h__ -#include -#include -#include -#include -#include -#include -#include -#include +#include "nsCOMPtr.h" +#include "nsISupports.h" +#include "nsIDOMWindowInternal.h" +#include "nsIDocShellTreeItem.h" +#include "nsIP3PUI.h" +#include "nsIPref.h" +#include "nsDeque.h" +#include "nsHashtable.h" #include "nsIP3PCService.h" #include "nsIP3PUIService.h" diff --git a/mozilla/extensions/p3p/src/nsP3PURIInformation.cpp b/mozilla/extensions/p3p/src/nsP3PURIInformation.cpp index a5bc0d8370a..0dae0a4d65c 100644 --- a/mozilla/extensions/p3p/src/nsP3PURIInformation.cpp +++ b/mozilla/extensions/p3p/src/nsP3PURIInformation.cpp @@ -26,9 +26,9 @@ #include "nsP3PURIInformation.h" #include "nsP3PLogging.h" -#include +#include "nsNetUtil.h" -#include +#include "nsXPIDLString.h" // **************************************************************************** diff --git a/mozilla/extensions/p3p/src/nsP3PURIInformation.h b/mozilla/extensions/p3p/src/nsP3PURIInformation.h index 4bb0984702d..696d8f696d0 100644 --- a/mozilla/extensions/p3p/src/nsP3PURIInformation.h +++ b/mozilla/extensions/p3p/src/nsP3PURIInformation.h @@ -26,7 +26,7 @@ #include "nsIP3PURIInformation.h" -#include +#include "nsHashtable.h" class nsP3PURIInformation : public nsIP3PURIInformation { diff --git a/mozilla/extensions/p3p/src/nsP3PXMLProcessor.cpp b/mozilla/extensions/p3p/src/nsP3PXMLProcessor.cpp index cea9fd0846b..a8bfc74d41f 100644 --- a/mozilla/extensions/p3p/src/nsP3PXMLProcessor.cpp +++ b/mozilla/extensions/p3p/src/nsP3PXMLProcessor.cpp @@ -28,22 +28,22 @@ #include "nsP3PTags.h" #include "nsP3PLogging.h" -#include -#include -#include +#include "nsIDOMElement.h" +#include "nsIDOMEventTarget.h" +#include "nsIDOMNSDocument.h" -#include -#include -#include +#include "nsIChannel.h" +#include "nsIInputStream.h" +#include "nsIDOMParser.h" -#include +#include "nsIHTTPChannel.h" -#include +#include "nsLayoutCID.h" -#include +#include "nsNetUtil.h" -#include -#include +#include "nsIHTTPHeader.h" +#include "nsIDocument.h" // **************************************************************************** diff --git a/mozilla/extensions/p3p/src/nsP3PXMLProcessor.h b/mozilla/extensions/p3p/src/nsP3PXMLProcessor.h index 42caa8afb43..f8581a9915a 100644 --- a/mozilla/extensions/p3p/src/nsP3PXMLProcessor.h +++ b/mozilla/extensions/p3p/src/nsP3PXMLProcessor.h @@ -28,27 +28,27 @@ #include "nsIP3PTag.h" #include "nsIP3PXMLListener.h" -#include -#include -#include -#include +#include "nsCOMPtr.h" +#include "nsISupports.h" +#include "nsIDOMEventListener.h" +#include "nsIHttpNotify.h" -#include +#include "nsAutoLock.h" -#include +#include "nsIXMLHttpRequest.h" -#include -#include +#include "nsIDOMDocument.h" +#include "nsIDOMNode.h" -#include -#include -#include +#include "nsINetModuleMgr.h" +#include "nsIURI.h" +#include "nsIHTTPChannel.h" -#include +#include "nsISupportsArray.h" -#include +#include "nsString.h" -#include +#include "prtime.h" class nsP3PXMLProcessor : public nsISupports { diff --git a/mozilla/extensions/p3p/src/nsP3PXMLUtils.cpp b/mozilla/extensions/p3p/src/nsP3PXMLUtils.cpp index b3b57c9a2a9..5fb89463693 100644 --- a/mozilla/extensions/p3p/src/nsP3PXMLUtils.cpp +++ b/mozilla/extensions/p3p/src/nsP3PXMLUtils.cpp @@ -25,16 +25,16 @@ #include "nsP3PXMLUtils.h" -#include +#include "nsIComponentManager.h" -#include -#include -#include -#include +#include "nsIDOMNodeList.h" +#include "nsIDOMNamedNodeMap.h" +#include "nsIDOMAttr.h" +#include "nsIDOMText.h" -#include +#include "nsITextContent.h" -#include +#include "nsXPIDLString.h" // **************************************************************************** diff --git a/mozilla/extensions/p3p/src/nsP3PXMLUtils.h b/mozilla/extensions/p3p/src/nsP3PXMLUtils.h index e118ec2ffc2..186b1ee2379 100644 --- a/mozilla/extensions/p3p/src/nsP3PXMLUtils.h +++ b/mozilla/extensions/p3p/src/nsP3PXMLUtils.h @@ -24,12 +24,12 @@ #ifndef nsP3PXMLUtils_h__ #define nsP3PXMLUtils_h__ -#include +#include "nsCom.h" -#include +#include "nsIDOMNode.h" -#include -#include +#include "nsVoidArray.h" +#include "nsString.h" class nsP3PXMLUtils {