diff --git a/mozilla/accessible/src/base/nsAccessible.cpp b/mozilla/accessible/src/base/nsAccessible.cpp index ebaced85f8b..f7aad6f0af5 100644 --- a/mozilla/accessible/src/base/nsAccessible.cpp +++ b/mozilla/accessible/src/base/nsAccessible.cpp @@ -29,6 +29,7 @@ #include "nsIContent.h" #include "nsIFrame.h" #include "nsIScrollableView.h" +#include "nsIWidget.h" #include "nsRootAccessible.h" #include "nsIScriptGlobalObject.h" #include "nsPIDOMWindow.h" @@ -37,6 +38,8 @@ #include "nsHTMLFormControlAccessible.h" #include "nsHTMLLinkAccessible.h" #include "nsIDOMHTMLAreaElement.h" +#include "nsISelection.h" +#include "nsISelectionController.h" #include "nsIServiceManager.h" #include "nsIStringBundle.h" #include "nsXPIDLString.h" diff --git a/mozilla/accessible/src/base/nsGenericAccessible.cpp b/mozilla/accessible/src/base/nsGenericAccessible.cpp index 2ae05b790b7..9a815144d5a 100644 --- a/mozilla/accessible/src/base/nsGenericAccessible.cpp +++ b/mozilla/accessible/src/base/nsGenericAccessible.cpp @@ -25,6 +25,7 @@ #include "nsIFrame.h" #include "nsCOMPtr.h" #include "nsIWeakReference.h" +#include "nsISelectionController.h" #include "nsReadableUtils.h" #include "nsIContent.h" diff --git a/mozilla/accessible/src/html/nsHTMLAreaAccessible.cpp b/mozilla/accessible/src/html/nsHTMLAreaAccessible.cpp index 7813b3451fc..b87d133fad4 100644 --- a/mozilla/accessible/src/html/nsHTMLAreaAccessible.cpp +++ b/mozilla/accessible/src/html/nsHTMLAreaAccessible.cpp @@ -24,11 +24,13 @@ #include "nsGenericAccessible.h" #include "nsHTMLAreaAccessible.h" #include "nsReadableUtils.h" +#include "nsString.h" #include "nsAccessible.h" #include "nsIAccessibilityService.h" #include "nsIServiceManager.h" #include "nsIDOMElement.h" #include "nsIDOMHTMLAreaElement.h" +#include "nsGUIEvent.h" // --- area ----- diff --git a/mozilla/accessible/src/html/nsHTMLFormControlAccessible.cpp b/mozilla/accessible/src/html/nsHTMLFormControlAccessible.cpp index 5c2baf669e9..3c0fb19c6cb 100644 --- a/mozilla/accessible/src/html/nsHTMLFormControlAccessible.cpp +++ b/mozilla/accessible/src/html/nsHTMLFormControlAccessible.cpp @@ -29,10 +29,12 @@ #include "nsHTMLAtoms.h" #include "nsIDOMHTMLButtonElement.h" #include "nsReadableUtils.h" +#include "nsString.h" #include "nsAccessible.h" #include "nsIFrame.h" #include "nsIDOMHTMLLabelElement.h" #include "nsIDOMHTMLFormElement.h" +#include "nsISelectionController.h" nsHTMLFormControlAccessible::nsHTMLFormControlAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell): nsLeafAccessible(aNode, aShell) diff --git a/mozilla/accessible/src/html/nsHTMLTextAccessible.cpp b/mozilla/accessible/src/html/nsHTMLTextAccessible.cpp index ae954f5d4e5..5f80b633cb6 100644 --- a/mozilla/accessible/src/html/nsHTMLTextAccessible.cpp +++ b/mozilla/accessible/src/html/nsHTMLTextAccessible.cpp @@ -24,6 +24,7 @@ #include "nsHTMLTextAccessible.h" #include "nsWeakReference.h" #include "nsIFrame.h" +#include "nsString.h" #include "nsILink.h" #include "nsILinkHandler.h" #include "nsISelection.h" diff --git a/mozilla/accessible/src/nsAccessible.cpp b/mozilla/accessible/src/nsAccessible.cpp index ebaced85f8b..f7aad6f0af5 100644 --- a/mozilla/accessible/src/nsAccessible.cpp +++ b/mozilla/accessible/src/nsAccessible.cpp @@ -29,6 +29,7 @@ #include "nsIContent.h" #include "nsIFrame.h" #include "nsIScrollableView.h" +#include "nsIWidget.h" #include "nsRootAccessible.h" #include "nsIScriptGlobalObject.h" #include "nsPIDOMWindow.h" @@ -37,6 +38,8 @@ #include "nsHTMLFormControlAccessible.h" #include "nsHTMLLinkAccessible.h" #include "nsIDOMHTMLAreaElement.h" +#include "nsISelection.h" +#include "nsISelectionController.h" #include "nsIServiceManager.h" #include "nsIStringBundle.h" #include "nsXPIDLString.h" diff --git a/mozilla/accessible/src/nsGenericAccessible.cpp b/mozilla/accessible/src/nsGenericAccessible.cpp index 2ae05b790b7..9a815144d5a 100644 --- a/mozilla/accessible/src/nsGenericAccessible.cpp +++ b/mozilla/accessible/src/nsGenericAccessible.cpp @@ -25,6 +25,7 @@ #include "nsIFrame.h" #include "nsCOMPtr.h" #include "nsIWeakReference.h" +#include "nsISelectionController.h" #include "nsReadableUtils.h" #include "nsIContent.h" diff --git a/mozilla/accessible/src/nsHTMLAreaAccessible.cpp b/mozilla/accessible/src/nsHTMLAreaAccessible.cpp index 7813b3451fc..b87d133fad4 100644 --- a/mozilla/accessible/src/nsHTMLAreaAccessible.cpp +++ b/mozilla/accessible/src/nsHTMLAreaAccessible.cpp @@ -24,11 +24,13 @@ #include "nsGenericAccessible.h" #include "nsHTMLAreaAccessible.h" #include "nsReadableUtils.h" +#include "nsString.h" #include "nsAccessible.h" #include "nsIAccessibilityService.h" #include "nsIServiceManager.h" #include "nsIDOMElement.h" #include "nsIDOMHTMLAreaElement.h" +#include "nsGUIEvent.h" // --- area ----- diff --git a/mozilla/accessible/src/nsHTMLFormControlAccessible.cpp b/mozilla/accessible/src/nsHTMLFormControlAccessible.cpp index 5c2baf669e9..3c0fb19c6cb 100644 --- a/mozilla/accessible/src/nsHTMLFormControlAccessible.cpp +++ b/mozilla/accessible/src/nsHTMLFormControlAccessible.cpp @@ -29,10 +29,12 @@ #include "nsHTMLAtoms.h" #include "nsIDOMHTMLButtonElement.h" #include "nsReadableUtils.h" +#include "nsString.h" #include "nsAccessible.h" #include "nsIFrame.h" #include "nsIDOMHTMLLabelElement.h" #include "nsIDOMHTMLFormElement.h" +#include "nsISelectionController.h" nsHTMLFormControlAccessible::nsHTMLFormControlAccessible(nsIDOMNode* aNode, nsIWeakReference* aShell): nsLeafAccessible(aNode, aShell) diff --git a/mozilla/accessible/src/nsHTMLTextAccessible.cpp b/mozilla/accessible/src/nsHTMLTextAccessible.cpp index ae954f5d4e5..5f80b633cb6 100644 --- a/mozilla/accessible/src/nsHTMLTextAccessible.cpp +++ b/mozilla/accessible/src/nsHTMLTextAccessible.cpp @@ -24,6 +24,7 @@ #include "nsHTMLTextAccessible.h" #include "nsWeakReference.h" #include "nsIFrame.h" +#include "nsString.h" #include "nsILink.h" #include "nsILinkHandler.h" #include "nsISelection.h" diff --git a/mozilla/caps/src/nsScriptSecurityManager.cpp b/mozilla/caps/src/nsScriptSecurityManager.cpp index a112bf8d63e..5294e00ebe0 100644 --- a/mozilla/caps/src/nsScriptSecurityManager.cpp +++ b/mozilla/caps/src/nsScriptSecurityManager.cpp @@ -25,6 +25,7 @@ #include "nsScriptSecurityManager.h" #include "nsIServiceManager.h" #include "nsIScriptObjectPrincipal.h" +#include "nsIScriptContext.h" #include "nsIURL.h" #include "nsIJARURI.h" #include "nspr.h" diff --git a/mozilla/caps/src/nsSecurityManagerFactory.cpp b/mozilla/caps/src/nsSecurityManagerFactory.cpp index e5cd1a35643..2f4de065d17 100644 --- a/mozilla/caps/src/nsSecurityManagerFactory.cpp +++ b/mozilla/caps/src/nsSecurityManagerFactory.cpp @@ -34,6 +34,7 @@ #include "nsICategoryManager.h" #include "nsXPIDLString.h" #include "nsCOMPtr.h" +#include "nsIServiceManager.h" /////////////////////// // nsSecurityNameSet // diff --git a/mozilla/content/base/public/nsIContent.h b/mozilla/content/base/public/nsIContent.h index 13cbf46e74b..30061100a16 100644 --- a/mozilla/content/base/public/nsIContent.h +++ b/mozilla/content/base/public/nsIContent.h @@ -25,7 +25,7 @@ #include #include "nslayout.h" #include "nsISupports.h" -#include "nsGUIEvent.h" +#include "nsEvent.h" #include "nsAWritableString.h" // Forward declarations diff --git a/mozilla/content/base/public/nsIDocument.h b/mozilla/content/base/public/nsIDocument.h index 47de8a41a68..7258ac5b4cd 100644 --- a/mozilla/content/base/public/nsIDocument.h +++ b/mozilla/content/base/public/nsIDocument.h @@ -24,8 +24,9 @@ #include "nslayout.h" #include "nsISupports.h" -#include "nsGUIEvent.h" +#include "nsEvent.h" #include "nsAWritableString.h" +#include "nsString.h" class nsIAtom; class nsIArena; diff --git a/mozilla/content/base/src/nsCopySupport.cpp b/mozilla/content/base/src/nsCopySupport.cpp index f246fd77eee..f45fa4d24a5 100644 --- a/mozilla/content/base/src/nsCopySupport.cpp +++ b/mozilla/content/base/src/nsCopySupport.cpp @@ -26,6 +26,7 @@ #include "nsIComponentManager.h" #include "nsIServiceManager.h" #include "nsIClipboard.h" +#include "nsISelection.h" #include "nsWidgetsCID.h" #include "nsIEventStateManager.h" #include "nsIPresContext.h" diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index 3826bcb73c5..beeb796c5c7 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -49,6 +49,7 @@ #include "nsIBaseWindow.h" #include "nsIDOMEventListener.h" +#include "nsGUIEvent.h" #include "nsIDOMStyleSheet.h" #include "nsDOMAttribute.h" diff --git a/mozilla/content/base/src/nsDocumentViewer.cpp b/mozilla/content/base/src/nsDocumentViewer.cpp index 706f84d20fb..53f2cc1fb5d 100644 --- a/mozilla/content/base/src/nsDocumentViewer.cpp +++ b/mozilla/content/base/src/nsDocumentViewer.cpp @@ -83,6 +83,8 @@ #include "nsIFrameManager.h" #include "nsIParser.h" #include "nsIPrintContext.h" +#include "nsGUIEvent.h" +#include "nsHTMLReflowState.h" #include "nsIDOMHTMLAnchorElement.h" #include "nsIDOMHTMLImageElement.h" diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp index 0fa75b539d0..e2086b883aa 100644 --- a/mozilla/content/base/src/nsGenericElement.cpp +++ b/mozilla/content/base/src/nsGenericElement.cpp @@ -42,6 +42,7 @@ #include "nsIFrame.h" #include "nsIPresShell.h" #include "nsIPresContext.h" +#include "nsStyleConsts.h" #include "nsIView.h" #include "nsIViewManager.h" #include "nsString.h" diff --git a/mozilla/content/base/src/nsRange.cpp b/mozilla/content/base/src/nsRange.cpp index 54f491cb248..63436e8970a 100644 --- a/mozilla/content/base/src/nsRange.cpp +++ b/mozilla/content/base/src/nsRange.cpp @@ -40,6 +40,7 @@ #include "nsIComponentManager.h" #include "nsParserCIID.h" #include "nsIHTMLFragmentContentSink.h" +#include "nsIEnumerator.h" #include "nsScriptSecurityManager.h" #include "nsIScriptGlobalObject.h" #include "nsIScriptContext.h" diff --git a/mozilla/content/base/src/nsScriptLoader.cpp b/mozilla/content/base/src/nsScriptLoader.cpp index 2fd0f7587e3..25da8ad16a4 100644 --- a/mozilla/content/base/src/nsScriptLoader.cpp +++ b/mozilla/content/base/src/nsScriptLoader.cpp @@ -32,6 +32,7 @@ #include "nsHTMLAtoms.h" #include "nsNetUtil.h" #include "nsIScriptGlobalObject.h" +#include "nsIScriptContext.h" #include "nsINodeInfo.h" #include "nsINameSpaceManager.h" #include "nsIScriptSecurityManager.h" diff --git a/mozilla/content/base/src/nsSelection.cpp b/mozilla/content/base/src/nsSelection.cpp index e36064a5ef6..d5e94e32658 100644 --- a/mozilla/content/base/src/nsSelection.cpp +++ b/mozilla/content/base/src/nsSelection.cpp @@ -40,6 +40,7 @@ #include "nsIDOMNode.h" #include "nsRange.h" #include "nsISupportsArray.h" +#include "nsGUIEvent.h" #include "nsIDOMKeyEvent.h" #include "nsITableLayout.h" #include "nsITableCellLayout.h" diff --git a/mozilla/content/events/public/nsIEventListenerManager.h b/mozilla/content/events/public/nsIEventListenerManager.h index c70d0d659c6..31321e84012 100644 --- a/mozilla/content/events/public/nsIEventListenerManager.h +++ b/mozilla/content/events/public/nsIEventListenerManager.h @@ -23,7 +23,7 @@ #ifndef nsIEventListenerManager_h__ #define nsIEventListenerManager_h__ -#include "nsGUIEvent.h" +#include "nsEvent.h" #include "nsISupports.h" #include "nsVoidArray.h" diff --git a/mozilla/content/events/public/nsIEventStateManager.h b/mozilla/content/events/public/nsIEventStateManager.h index ea170f5668d..901ed3f22ae 100644 --- a/mozilla/content/events/public/nsIEventStateManager.h +++ b/mozilla/content/events/public/nsIEventStateManager.h @@ -23,7 +23,7 @@ #ifndef nsIEventStateManager_h__ #define nsIEventStateManager_h__ -#include "nsGUIEvent.h" +#include "nsEvent.h" #include "nsISupports.h" #include "nsVoidArray.h" diff --git a/mozilla/content/events/public/nsIPrivateCompositionEvent.h b/mozilla/content/events/public/nsIPrivateCompositionEvent.h index df72b663ded..4b75b5d9241 100644 --- a/mozilla/content/events/public/nsIPrivateCompositionEvent.h +++ b/mozilla/content/events/public/nsIPrivateCompositionEvent.h @@ -23,7 +23,7 @@ #ifndef nsIPrivateCompositionEvent_h__ #define nsIPrivateCompositionEvent_h__ -#include "nsGUIEvent.h" +#include "nsEvent.h" #include "nsISupports.h" // {ECF6BEF1-5F0C-11d3-9EB3-0060089FE59B} diff --git a/mozilla/content/events/public/nsIPrivateDOMEvent.h b/mozilla/content/events/public/nsIPrivateDOMEvent.h index 8d055e0c527..c1e0ec3d4cd 100644 --- a/mozilla/content/events/public/nsIPrivateDOMEvent.h +++ b/mozilla/content/events/public/nsIPrivateDOMEvent.h @@ -23,7 +23,7 @@ #ifndef nsIPrivateDOMEvent_h__ #define nsIPrivateDOMEvent_h__ -#include "nsGUIEvent.h" +#include "nsEvent.h" #include "nsISupports.h" class nsIPresContext; diff --git a/mozilla/content/events/public/nsIPrivateTextEvent.h b/mozilla/content/events/public/nsIPrivateTextEvent.h index 8bdd7c9c4af..b608baa6a87 100644 --- a/mozilla/content/events/public/nsIPrivateTextEvent.h +++ b/mozilla/content/events/public/nsIPrivateTextEvent.h @@ -23,7 +23,7 @@ #ifndef nsIPrivateTextEvent_h__ #define nsIPrivateTextEvent_h__ -#include "nsGUIEvent.h" +#include "nsEvent.h" #include "nsISupports.h" #include "nsIPrivateTextRange.h" diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp index 4d0e239b612..dd661d2d358 100644 --- a/mozilla/content/events/src/nsEventStateManager.cpp +++ b/mozilla/content/events/src/nsEventStateManager.cpp @@ -59,6 +59,7 @@ #include "nsFrameTraversal.h" #include "nsIDocShellTreeItem.h" #include "nsIWebNavigation.h" +#include "nsIContentViewer.h" #include "nsIServiceManager.h" #include "nsIPref.h" diff --git a/mozilla/content/html/content/public/nsIFormSubmitObserver.h b/mozilla/content/html/content/public/nsIFormSubmitObserver.h index 97c735d419d..cda297c4069 100644 --- a/mozilla/content/html/content/public/nsIFormSubmitObserver.h +++ b/mozilla/content/html/content/public/nsIFormSubmitObserver.h @@ -32,10 +32,10 @@ #include "nsISupports.h" #include "prtypes.h" -#include "nsIDOMWindowInternal.h" -#include "nsIURI.h" -class nsString; +class nsIContent; +class nsIDOMWindowInternal; +class nsIURI; // {a6cf9106-15b3-11d2-932e-00805f8add32} #define NS_IFORMSUBMITOBSERVER_IID \ diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.h b/mozilla/content/html/content/src/nsGenericHTMLElement.h index 53526cc2217..1f849c3a894 100644 --- a/mozilla/content/html/content/src/nsGenericHTMLElement.h +++ b/mozilla/content/html/content/src/nsGenericHTMLElement.h @@ -50,6 +50,7 @@ class nsIURI; class nsIFormControlFrame; class nsIForm; class nsIPresState; +struct nsRect; extern void GetGenericHTMLElementIIDs(nsVoidArray& aArray); diff --git a/mozilla/content/html/content/src/nsHTMLButtonElement.cpp b/mozilla/content/html/content/src/nsHTMLButtonElement.cpp index 8d6cc90a49d..7e62193f46b 100644 --- a/mozilla/content/html/content/src/nsHTMLButtonElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLButtonElement.cpp @@ -39,6 +39,7 @@ #include "nsIDOMEvent.h" #include "nsISizeOfHandler.h" #include "nsIDocument.h" +#include "nsGUIEvent.h" class nsHTMLButtonElement : public nsGenericHTMLContainerFormElement, diff --git a/mozilla/content/html/content/src/nsHTMLFormElement.cpp b/mozilla/content/html/content/src/nsHTMLFormElement.cpp index 704db9a7e49..80949174d19 100644 --- a/mozilla/content/html/content/src/nsHTMLFormElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLFormElement.cpp @@ -45,6 +45,7 @@ #include "nsContentUtils.h" #include "nsHashtable.h" #include "nsContentList.h" +#include "nsGUIEvent.h" static const int NS_FORM_CONTROL_LIST_HASHTABLE_SIZE = 16; diff --git a/mozilla/content/html/content/src/nsHTMLImageElement.cpp b/mozilla/content/html/content/src/nsHTMLImageElement.cpp index 73d73423569..e85b882736d 100644 --- a/mozilla/content/html/content/src/nsHTMLImageElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLImageElement.cpp @@ -49,6 +49,7 @@ #include "nsIImageFrame.h" #include "nsLayoutAtoms.h" #include "nsNodeInfoManager.h" +#include "nsGUIEvent.h" #include "nsContentPolicyUtils.h" #include "nsIDOMWindow.h" diff --git a/mozilla/content/html/content/src/nsHTMLInputElement.cpp b/mozilla/content/html/content/src/nsHTMLInputElement.cpp index d3d7331e862..31f1126eedd 100644 --- a/mozilla/content/html/content/src/nsHTMLInputElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLInputElement.cpp @@ -54,6 +54,7 @@ #include "nsDOMError.h" #include "nsIPrivateDOMEvent.h" #include "nsIEditor.h" +#include "nsGUIEvent.h" #include "nsIPresState.h" #include "nsIDOMEvent.h" diff --git a/mozilla/content/html/content/src/nsHTMLLabelElement.cpp b/mozilla/content/html/content/src/nsHTMLLabelElement.cpp index ad80bc1fdbc..9ca9cda2538 100644 --- a/mozilla/content/html/content/src/nsHTMLLabelElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLLabelElement.cpp @@ -38,6 +38,7 @@ #include "nsISizeOfHandler.h" #include "nsIFormControlFrame.h" #include "nsIPresShell.h" +#include "nsGUIEvent.h" class nsHTMLLabelElement : public nsGenericHTMLContainerFormElement, diff --git a/mozilla/content/html/content/src/nsHTMLScriptElement.cpp b/mozilla/content/html/content/src/nsHTMLScriptElement.cpp index 7642fcf0ea3..4d79dc14e18 100644 --- a/mozilla/content/html/content/src/nsHTMLScriptElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLScriptElement.cpp @@ -33,6 +33,7 @@ #include "nsIScriptLoader.h" #include "nsIScriptLoaderObserver.h" #include "nsIScriptElement.h" +#include "nsGUIEvent.h" class nsHTMLScriptElement : public nsGenericHTMLContainerElement, public nsIDOMHTMLScriptElement, diff --git a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp index cc949f65322..6cbfef34a82 100644 --- a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp @@ -42,6 +42,7 @@ #include "nsISelectElement.h" #include "nsISelectControlFrame.h" #include "nsIDOMNSHTMLOptionCollectn.h" +#include "nsGUIEvent.h" // PresState #include "nsISupportsArray.h" diff --git a/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp b/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp index a02cae8df19..becbe84cdeb 100644 --- a/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp @@ -48,6 +48,7 @@ #include "nsIFrame.h" #include "nsIFormControlFrame.h" #include "nsIPrivateDOMEvent.h" +#include "nsGUIEvent.h" #include "nsIRuleNode.h" static NS_DEFINE_CID(kXULControllersCID, NS_XULCONTROLLERS_CID); diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp index d0e220ab0cd..f9daadf6f0c 100644 --- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp +++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp @@ -118,6 +118,7 @@ #include "nsDOMError.h" #include "nsIScrollable.h" #include "nsContentPolicyUtils.h" +#include "nsIScriptContext.h" #include "nsStyleLinkElement.h" #include "nsReadableUtils.h" diff --git a/mozilla/content/html/document/src/nsIHTMLDocument.h b/mozilla/content/html/document/src/nsIHTMLDocument.h index b59f35f0fdb..730e720939b 100644 --- a/mozilla/content/html/document/src/nsIHTMLDocument.h +++ b/mozilla/content/html/document/src/nsIHTMLDocument.h @@ -27,6 +27,7 @@ class nsIImageMap; class nsString; +class nsIDOMNodeList; class nsIDOMHTMLCollection; class nsIDOMHTMLFormElement; class nsIDOMHTMLMapElement; diff --git a/mozilla/content/html/document/src/nsImageDocument.cpp b/mozilla/content/html/document/src/nsImageDocument.cpp index a1e3dfc8ca7..23ba85f9abd 100644 --- a/mozilla/content/html/document/src/nsImageDocument.cpp +++ b/mozilla/content/html/document/src/nsImageDocument.cpp @@ -50,6 +50,7 @@ // Needed to fetch scrollbar prefs for image documents that are iframes/frameset frames #include "nsIScrollable.h" #include "nsWeakReference.h" +#include "nsRect.h" #define NSIMAGEDOCUMENT_PROPERTIES_URI "chrome://communicator/locale/layout/ImageDocument.properties" static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); diff --git a/mozilla/content/html/style/src/nsCSSScanner.cpp b/mozilla/content/html/style/src/nsCSSScanner.cpp index 1eb0ec19c3c..e19c713f493 100644 --- a/mozilla/content/html/style/src/nsCSSScanner.cpp +++ b/mozilla/content/html/style/src/nsCSSScanner.cpp @@ -34,11 +34,11 @@ static char* kNullPointer = "null pointer"; // for #ifdef CSS_REPORT_PARSE_ERRORS #include "nsCOMPtr.h" #include "nsIServiceManager.h" +#include "nsIComponentManager.h" #include "nsReadableUtils.h" #include "nsIURI.h" #include "nsIConsoleService.h" #include "nsIScriptError.h" -#include "nsComponentManagerUtils.h" // put this higher and gcc barfs... // Don't bother collecting whitespace characters in token's mIdent buffer #undef COLLECT_WHITESPACE diff --git a/mozilla/content/xbl/public/nsIBindingManager.h b/mozilla/content/xbl/public/nsIBindingManager.h index 5c706df0775..2ab9f3724fa 100644 --- a/mozilla/content/xbl/public/nsIBindingManager.h +++ b/mozilla/content/xbl/public/nsIBindingManager.h @@ -42,6 +42,7 @@ class nsIXBLDocumentInfo; class nsIAtom; class nsIStreamListener; class nsIXPConnectWrappedJS; +class nsIDOMNodeList; // {55D70FE0-C8E5-11d3-97FB-00400553EEF0} #define NS_IBINDING_MANAGER_IID \ diff --git a/mozilla/content/xbl/src/nsBindingManager.cpp b/mozilla/content/xbl/src/nsBindingManager.cpp index cac80a6818a..ab187595e12 100644 --- a/mozilla/content/xbl/src/nsBindingManager.cpp +++ b/mozilla/content/xbl/src/nsBindingManager.cpp @@ -66,6 +66,7 @@ #include "jsapi.h" #include "nsIXPConnect.h" +#include "nsIScriptContext.h" // Static IIDs/CIDs. Try to minimize these. static NS_DEFINE_CID(kNameSpaceManagerCID, NS_NAMESPACEMANAGER_CID); diff --git a/mozilla/content/xbl/src/nsXBLBinding.cpp b/mozilla/content/xbl/src/nsXBLBinding.cpp index 202c4a4097b..89a19d58364 100644 --- a/mozilla/content/xbl/src/nsXBLBinding.cpp +++ b/mozilla/content/xbl/src/nsXBLBinding.cpp @@ -53,6 +53,7 @@ #include "nsXBLService.h" #include "nsIXBLInsertionPoint.h" #include "nsIXPConnect.h" +#include "nsIScriptContext.h" // Event listeners #include "nsIEventListenerManager.h" diff --git a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp index f7ba0df0cd1..7e6b3a1cf38 100644 --- a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp +++ b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp @@ -54,6 +54,7 @@ #include "nsIServiceManager.h" #include "nsXPIDLString.h" #include "nsXULAtoms.h" +#include "nsGUIEvent.h" #include "nsIXPConnect.h" #include "nsIDOMScriptObjectFactory.h" #include "nsDOMCID.h" diff --git a/mozilla/content/xml/content/src/nsXMLElement.cpp b/mozilla/content/xml/content/src/nsXMLElement.cpp index 1a522f53f46..48c50e16997 100644 --- a/mozilla/content/xml/content/src/nsXMLElement.cpp +++ b/mozilla/content/xml/content/src/nsXMLElement.cpp @@ -41,6 +41,8 @@ #include "nsIRefreshURI.h" #include "nsStyleConsts.h" #include "nsIPresShell.h" +#include "nsGUIEvent.h" +#include "nsIPresContext.h" #include "nsIDOMCSSStyleDeclaration.h" #include "nsIDOMViewCSS.h" diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp index ef97dd94f13..59ab6ddc662 100644 --- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp +++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp @@ -74,6 +74,7 @@ #include "nsParserUtils.h" #include "nsIDocumentViewer.h" #include "nsIScrollable.h" +#include "nsRect.h" #include "nsGenericElement.h" #include "nsIWebNavigation.h" #include "nsIScriptElement.h" diff --git a/mozilla/content/xml/document/src/nsXMLDocument.cpp b/mozilla/content/xml/document/src/nsXMLDocument.cpp index e6a68919c35..77c1b3291a9 100644 --- a/mozilla/content/xml/document/src/nsXMLDocument.cpp +++ b/mozilla/content/xml/document/src/nsXMLDocument.cpp @@ -75,6 +75,7 @@ #include "nsLayoutCID.h" #include "nsContentCID.h" #include "nsDOMAttribute.h" +#include "nsGUIEvent.h" #include "nsCExternalHandlerService.h" #include "nsIMIMEService.h" diff --git a/mozilla/content/xul/content/src/nsXULPopupListener.cpp b/mozilla/content/xul/content/src/nsXULPopupListener.cpp index dd59d6fa677..1f95ff8e880 100644 --- a/mozilla/content/xul/content/src/nsXULPopupListener.cpp +++ b/mozilla/content/xul/content/src/nsXULPopupListener.cpp @@ -31,6 +31,7 @@ */ #include "nsCOMPtr.h" +#include "nsIServiceManager.h" #include "nsXULAtoms.h" #include "nsIDOMElement.h" #include "nsIDOMXULElement.h" @@ -44,6 +45,7 @@ #include "nsContentCID.h" #include "nsIScriptGlobalObject.h" +#include "nsIScriptContext.h" #include "nsIDOMWindowInternal.h" #include "nsIDOMXULDocument.h" #include "nsIDocument.h" diff --git a/mozilla/content/xul/content/src/nsXULTreeElement.cpp b/mozilla/content/xul/content/src/nsXULTreeElement.cpp index 65a38f3433a..0c68cbcb213 100644 --- a/mozilla/content/xul/content/src/nsXULTreeElement.cpp +++ b/mozilla/content/xul/content/src/nsXULTreeElement.cpp @@ -46,6 +46,7 @@ #include "nsLayoutCID.h" #include "nsString.h" #include "nsITreeBoxObject.h" +#include "nsGUIEvent.h" static NS_DEFINE_CID(kCRangeCID, NS_RANGE_CID); static NS_DEFINE_IID(kCContentIteratorCID, NS_CONTENTITERATOR_CID); diff --git a/mozilla/content/xul/document/src/nsXULCommandDispatcher.cpp b/mozilla/content/xul/document/src/nsXULCommandDispatcher.cpp index f6f251f0dbd..2385ef25a31 100644 --- a/mozilla/content/xul/document/src/nsXULCommandDispatcher.cpp +++ b/mozilla/content/xul/document/src/nsXULCommandDispatcher.cpp @@ -49,6 +49,7 @@ #include "nsXULCommandDispatcher.h" #include "prlog.h" #include "nsIDOMEventTarget.h" +#include "nsGUIEvent.h" #include "nsContentUtils.h" #ifdef PR_LOGGING diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp index c0aa708e04f..4361f698532 100644 --- a/mozilla/content/xul/document/src/nsXULDocument.cpp +++ b/mozilla/content/xul/document/src/nsXULDocument.cpp @@ -65,6 +65,7 @@ #include "nsIDOMEvent.h" #include "nsIDOMEventListener.h" #include "nsIDOMEventReceiver.h" +#include "nsGUIEvent.h" #include "nsIDOMRange.h" #include "nsIDOMScriptObjectFactory.h" #include "nsIDOMText.h" @@ -137,6 +138,7 @@ #include "nsIMIMEService.h" #include "nsNetUtil.h" #include "nsMimeTypes.h" +#include "nsISelectionController.h" #include "nsContentUtils.h" diff --git a/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp b/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp index c7703c22a86..bb976321d05 100644 --- a/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp +++ b/mozilla/content/xul/document/src/nsXULPrototypeCache.cpp @@ -40,6 +40,7 @@ #include "nsIDocument.h" #include "nsIXBLDocumentInfo.h" #include "nsIPref.h" +#include "nsIServiceManager.h" class nsXULPrototypeCache : public nsIXULPrototypeCache { diff --git a/mozilla/docshell/base/nsDSURIContentListener.cpp b/mozilla/docshell/base/nsDSURIContentListener.cpp index f60764cf8f9..dcc37dfd65c 100644 --- a/mozilla/docshell/base/nsDSURIContentListener.cpp +++ b/mozilla/docshell/base/nsDSURIContentListener.cpp @@ -24,6 +24,7 @@ #include "nsDSURIContentListener.h" #include "nsIChannel.h" #include "nsXPIDLString.h" +#include "nsIServiceManager.h" //***************************************************************************** //*** nsDSURIContentListener: Object Management diff --git a/mozilla/docshell/base/nsDocShell.h b/mozilla/docshell/base/nsDocShell.h index 1b7c830ea6c..ead84c11e55 100644 --- a/mozilla/docshell/base/nsDocShell.h +++ b/mozilla/docshell/base/nsDocShell.h @@ -32,6 +32,7 @@ #include "nsIContentViewer.h" #include "nsIPref.h" #include "nsVoidArray.h" +#include "nsIScriptContext.h" #include "nsCDocShell.h" #include "nsIDocShellTreeOwner.h" diff --git a/mozilla/docshell/base/nsIContentViewer.idl b/mozilla/docshell/base/nsIContentViewer.idl index ebb9b878643..3a5bb57f051 100644 --- a/mozilla/docshell/base/nsIContentViewer.idl +++ b/mozilla/docshell/base/nsIContentViewer.idl @@ -4,8 +4,7 @@ interface nsIDOMDocument; %{ C++ -#include "nsIWidget.h" - +class nsIWidget; class nsIDeviceContext; struct nsRect; %} diff --git a/mozilla/docshell/base/nsIContentViewerFile.idl b/mozilla/docshell/base/nsIContentViewerFile.idl index 1a8d9abccae..797e8209403 100644 --- a/mozilla/docshell/base/nsIContentViewerFile.idl +++ b/mozilla/docshell/base/nsIContentViewerFile.idl @@ -24,9 +24,9 @@ %{ C++ -#include "nsIDeviceContext.h" -#include "nsIWebShell.h" -#include "nsIDOMWindow.h" +class nsIDeviceContext; +class nsIWebShell; +class nsIDOMWindow; %} [ptr] native nsIDeviceContext(nsIDeviceContext); diff --git a/mozilla/docshell/base/nsIDocShell.idl b/mozilla/docshell/base/nsIDocShell.idl index 2afbeb928d5..dbaf2c5b9a3 100644 --- a/mozilla/docshell/base/nsIDocShell.idl +++ b/mozilla/docshell/base/nsIDocShell.idl @@ -22,12 +22,11 @@ */ #include "nsISupports.idl" -#include "nsIURIContentListener.idl" -#include "nsIURI.idl" -#include "nsIContentViewer.idl" +#include "domstubs.idl" %{ C++ -#include "nsIPresContext.h" +class nsIPresContext; +class nsIPresShell; %} /** @@ -37,11 +36,15 @@ [ptr] native nsIPresContext(nsIPresContext); [ptr] native nsIPresShell(nsIPresShell); +interface nsIURI; +interface nsIContentViewer; +interface nsIURIContentListener; interface nsIChromeEventHandler; interface nsIDocShellLoadInfo; interface nsIDocumentCharsetInfo; interface nsIWebNavigation; interface nsISimpleEnumerator; +interface nsIInputStream; interface nsISHEntry; [scriptable, uuid(69E5DE00-7B8B-11d3-AF61-00A024FFC08C)] diff --git a/mozilla/docshell/base/nsIMarkupDocumentViewer.idl b/mozilla/docshell/base/nsIMarkupDocumentViewer.idl index 94db9f7c76c..d54e74f36ce 100644 --- a/mozilla/docshell/base/nsIMarkupDocumentViewer.idl +++ b/mozilla/docshell/base/nsIMarkupDocumentViewer.idl @@ -20,8 +20,6 @@ * Travis Bogard */ -#include "nsISupports.idl" - /** * The nsIContentViewerEdit */ diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp index a86c2d34734..316564ad3ff 100644 --- a/mozilla/docshell/base/nsWebShell.cpp +++ b/mozilla/docshell/base/nsWebShell.cpp @@ -102,6 +102,9 @@ typedef unsigned long HMTX; #include "nsPIDOMWindow.h" #include "nsIController.h" #include "nsIFocusController.h" +#include "nsGUIEvent.h" +#include "nsISelection.h" +#include "nsISelectionController.h" #include "nsIFileStream.h" #include "nsIHttpChannel.h" // add this to the ick include list...we need it to QI for post data interface diff --git a/mozilla/dom/public/nsIScriptContext.h b/mozilla/dom/public/nsIScriptContext.h index ec7a6661d76..4694665a363 100644 --- a/mozilla/dom/public/nsIScriptContext.h +++ b/mozilla/dom/public/nsIScriptContext.h @@ -31,6 +31,7 @@ class nsIScriptGlobalObject; class nsIScriptSecurityManager; class nsIScriptContextOwner; class nsIPrincipal; +class nsIAtom; typedef void (*nsScriptTerminationFunc)(nsISupports* aRef); diff --git a/mozilla/dom/public/nsIScriptGlobalObject.h b/mozilla/dom/public/nsIScriptGlobalObject.h index 4b4a16b73d6..ca57fb8bbd2 100644 --- a/mozilla/dom/public/nsIScriptGlobalObject.h +++ b/mozilla/dom/public/nsIScriptGlobalObject.h @@ -24,9 +24,7 @@ #define nsIScriptGlobalObject_h__ #include "nsISupports.h" -#include "nsIScriptContext.h" -#include "nsGUIEvent.h" -#include "jsapi.h" +#include "nsEvent.h" class nsIScriptContext; class nsIDOMDocument; @@ -35,6 +33,7 @@ class nsIPresContext; class nsIDocShell; class nsIDOMWindowInternal; class nsIScriptGlobalObjectOwner; +struct JSObject; #define NS_ISCRIPTGLOBALOBJECT_IID \ { 0x2b16fc80, 0xfa41, 0x11d1, \ diff --git a/mozilla/dom/src/base/nsDOMClassInfo.cpp b/mozilla/dom/src/base/nsDOMClassInfo.cpp index 6a5e745246f..08606203e80 100644 --- a/mozilla/dom/src/base/nsDOMClassInfo.cpp +++ b/mozilla/dom/src/base/nsDOMClassInfo.cpp @@ -41,6 +41,8 @@ #include "nsIDocument.h" #include "nsIDOMDocument.h" #include "nsIDOMNSDocument.h" +#include "nsIDOMEvent.h" +#include "nsIDOMKeyEvent.h" #include "nsIDOMEventListener.h" // Window scriptable helper includes diff --git a/mozilla/dom/src/base/nsDOMException.cpp b/mozilla/dom/src/base/nsDOMException.cpp index 8bd5dc1ba09..fb49a251c40 100644 --- a/mozilla/dom/src/base/nsDOMException.cpp +++ b/mozilla/dom/src/base/nsDOMException.cpp @@ -23,6 +23,7 @@ #include "nsIDOMDOMException.h" #include "nsDOMError.h" +#include "nsCRT.h" #include "prprf.h" #include "nsIScriptGlobalObject.h" #include "nsReadableUtils.h" diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp index 0a9fa5976dc..6f0c7c58669 100644 --- a/mozilla/dom/src/base/nsGlobalWindow.cpp +++ b/mozilla/dom/src/base/nsGlobalWindow.cpp @@ -45,7 +45,6 @@ #include "nsIEventListenerManager.h" #include "nsEscape.h" #include "nsStyleCoord.h" -#include "nsHTMLReflowState.h" #include "nsMimeTypeArray.h" #include "nsNetUtil.h" #include "nsPluginArray.h" @@ -100,6 +99,7 @@ #include "nsDOMError.h" #include "nsIWindowWatcher.h" #include "nsPIWindowWatcher.h" +#include "nsIContentViewer.h" #include "nsISupportsPrimitives.h" #include "nsDOMClassInfo.h" #include "nsIJSNativeInitializer.h" diff --git a/mozilla/dom/src/base/nsJSEnvironment.cpp b/mozilla/dom/src/base/nsJSEnvironment.cpp index 12aa78ecdee..e4c121e9d3f 100644 --- a/mozilla/dom/src/base/nsJSEnvironment.cpp +++ b/mozilla/dom/src/base/nsJSEnvironment.cpp @@ -52,6 +52,7 @@ #include "nsIInterfaceRequestor.h" #include "nsIPrompt.h" #include "nsIObserverService.h" +#include "nsGUIEvent.h" #include "nsScriptNameSpaceManager.h" #include "nsIThread.h" diff --git a/mozilla/editor/base/IMETextTxn.cpp b/mozilla/editor/base/IMETextTxn.cpp index 246a730c2be..17ec47ab0cc 100644 --- a/mozilla/editor/base/IMETextTxn.cpp +++ b/mozilla/editor/base/IMETextTxn.cpp @@ -30,6 +30,7 @@ #include "nsIPresShell.h" #include "EditAggregateTxn.h" #include "nsLayoutCID.h" +#include "nsISelectionController.h" // #define DEBUG_IMETXN static NS_DEFINE_IID(kRangeCID, NS_RANGE_CID); diff --git a/mozilla/editor/base/nsComposerCommands.cpp b/mozilla/editor/base/nsComposerCommands.cpp index 3850081d564..f412b0f24c0 100644 --- a/mozilla/editor/base/nsComposerCommands.cpp +++ b/mozilla/editor/base/nsComposerCommands.cpp @@ -37,6 +37,7 @@ #include "nsIClipboard.h" #include "nsXPIDLString.h" +#include "nsCOMPtr.h" #include "nsComposerCommands.h" diff --git a/mozilla/editor/base/nsEditor.cpp b/mozilla/editor/base/nsEditor.cpp index 3b165c67a52..b411803fa02 100644 --- a/mozilla/editor/base/nsEditor.cpp +++ b/mozilla/editor/base/nsEditor.cpp @@ -48,6 +48,7 @@ #include "nsIViewManager.h" #include "nsISelection.h" #include "nsISelectionPrivate.h" +#include "nsISelectionController.h" #include "nsIEnumerator.h" #include "nsIAtom.h" #include "nsISupportsArray.h" @@ -59,6 +60,7 @@ #include "nsIWidget.h" #include "nsIScrollbar.h" #include "nsIPlaintextEditor.h" +#include "nsGUIEvent.h" #include "nsIFrame.h" // Needed by IME code diff --git a/mozilla/editor/base/nsEditorCommands.cpp b/mozilla/editor/base/nsEditorCommands.cpp index 03ea3054e86..a42929baf66 100644 --- a/mozilla/editor/base/nsEditorCommands.cpp +++ b/mozilla/editor/base/nsEditorCommands.cpp @@ -23,6 +23,7 @@ #include "nsCRT.h" +#include "nsString.h" #include "nsIEditor.h" #include "nsIEditorMailSupport.h" diff --git a/mozilla/editor/base/nsEditorEventListeners.cpp b/mozilla/editor/base/nsEditorEventListeners.cpp index 5583ab430ab..f88626512c6 100644 --- a/mozilla/editor/base/nsEditorEventListeners.cpp +++ b/mozilla/editor/base/nsEditorEventListeners.cpp @@ -31,6 +31,7 @@ #include "nsIPresShell.h" #include "nsIDOMElement.h" #include "nsISelection.h" +#include "nsISelectionController.h" #include "nsIDOMCharacterData.h" #include "nsISupportsArray.h" #include "nsIStringStream.h" diff --git a/mozilla/editor/base/nsEditorShell.cpp b/mozilla/editor/base/nsEditorShell.cpp index 3731eb56bce..cf90ea457eb 100644 --- a/mozilla/editor/base/nsEditorShell.cpp +++ b/mozilla/editor/base/nsEditorShell.cpp @@ -54,6 +54,7 @@ #include "nsCURILoader.h" #include "nsNetUtil.h" #include "nsIFileChannel.h" +#include "nsILocalFile.h" #include "nsIScriptGlobalObject.h" #include "nsIWebNavigation.h" @@ -76,6 +77,7 @@ #include "nsIPresContext.h" #include "nsISelection.h" #include "nsISelectionPrivate.h" +#include "nsISelectionController.h" #include "nsIFilePicker.h" #include "nsIFindComponent.h" diff --git a/mozilla/editor/base/nsEditorShell.h b/mozilla/editor/base/nsEditorShell.h index 1d67651ef32..2a22e778a8a 100644 --- a/mozilla/editor/base/nsEditorShell.h +++ b/mozilla/editor/base/nsEditorShell.h @@ -47,6 +47,7 @@ #include "nsIHTMLEditor.h" #include "nsIStringBundle.h" #include "nsICSSStyleSheet.h" +#include "nsISupportsArray.h" // Parser Observation #include "nsEditorParserObserver.h" diff --git a/mozilla/editor/base/nsHTMLEditRules.cpp b/mozilla/editor/base/nsHTMLEditRules.cpp index dcffe5abd7c..f3ed75365f6 100644 --- a/mozilla/editor/base/nsHTMLEditRules.cpp +++ b/mozilla/editor/base/nsHTMLEditRules.cpp @@ -42,6 +42,7 @@ #include "nsIDOMNodeList.h" #include "nsISelection.h" #include "nsISelectionPrivate.h" +#include "nsISelectionController.h" #include "nsIDOMRange.h" #include "nsIDOMNSRange.h" #include "nsIDOMCharacterData.h" diff --git a/mozilla/editor/base/nsHTMLEditor.cpp b/mozilla/editor/base/nsHTMLEditor.cpp index 02edd0e5a40..4feb7bf32f7 100644 --- a/mozilla/editor/base/nsHTMLEditor.cpp +++ b/mozilla/editor/base/nsHTMLEditor.cpp @@ -86,6 +86,7 @@ #include "nsInternetCiter.h" #include "nsISupportsPrimitives.h" #include "SetDocTitleTxn.h" +#include "nsGUIEvent.h" // netwerk #include "nsIURI.h" diff --git a/mozilla/editor/base/nsPlaintextEditor.cpp b/mozilla/editor/base/nsPlaintextEditor.cpp index ac5ae8f211d..bfeebdc1169 100644 --- a/mozilla/editor/base/nsPlaintextEditor.cpp +++ b/mozilla/editor/base/nsPlaintextEditor.cpp @@ -41,6 +41,7 @@ #include "nsIDOMHTMLAnchorElement.h" #include "nsIDOMHTMLImageElement.h" #include "nsISelectionController.h" +#include "nsGUIEvent.h" #include "nsIIndependentSelection.h" //domselections answer to frameselection diff --git a/mozilla/editor/base/nsStyleSheetTxns.cpp b/mozilla/editor/base/nsStyleSheetTxns.cpp index fd02431441e..e255b007848 100644 --- a/mozilla/editor/base/nsStyleSheetTxns.cpp +++ b/mozilla/editor/base/nsStyleSheetTxns.cpp @@ -28,6 +28,7 @@ #include "nsIStyleSet.h" #include "nsIDocument.h" #include "nsIDocumentObserver.h" +#include "nsISelectionController.h" #include "nsStyleSheetTxns.h" diff --git a/mozilla/editor/composer/src/nsComposerCommands.cpp b/mozilla/editor/composer/src/nsComposerCommands.cpp index 3850081d564..f412b0f24c0 100644 --- a/mozilla/editor/composer/src/nsComposerCommands.cpp +++ b/mozilla/editor/composer/src/nsComposerCommands.cpp @@ -37,6 +37,7 @@ #include "nsIClipboard.h" #include "nsXPIDLString.h" +#include "nsCOMPtr.h" #include "nsComposerCommands.h" diff --git a/mozilla/editor/composer/src/nsEditorShell.cpp b/mozilla/editor/composer/src/nsEditorShell.cpp index 3731eb56bce..cf90ea457eb 100644 --- a/mozilla/editor/composer/src/nsEditorShell.cpp +++ b/mozilla/editor/composer/src/nsEditorShell.cpp @@ -54,6 +54,7 @@ #include "nsCURILoader.h" #include "nsNetUtil.h" #include "nsIFileChannel.h" +#include "nsILocalFile.h" #include "nsIScriptGlobalObject.h" #include "nsIWebNavigation.h" @@ -76,6 +77,7 @@ #include "nsIPresContext.h" #include "nsISelection.h" #include "nsISelectionPrivate.h" +#include "nsISelectionController.h" #include "nsIFilePicker.h" #include "nsIFindComponent.h" diff --git a/mozilla/editor/composer/src/nsEditorShell.h b/mozilla/editor/composer/src/nsEditorShell.h index 1d67651ef32..2a22e778a8a 100644 --- a/mozilla/editor/composer/src/nsEditorShell.h +++ b/mozilla/editor/composer/src/nsEditorShell.h @@ -47,6 +47,7 @@ #include "nsIHTMLEditor.h" #include "nsIStringBundle.h" #include "nsICSSStyleSheet.h" +#include "nsISupportsArray.h" // Parser Observation #include "nsEditorParserObserver.h" diff --git a/mozilla/editor/idl/nsIEditor.idl b/mozilla/editor/idl/nsIEditor.idl index 8ab3448fb3b..9bb5ce911be 100644 --- a/mozilla/editor/idl/nsIEditor.idl +++ b/mozilla/editor/idl/nsIEditor.idl @@ -21,18 +21,22 @@ #include "nsISupports.idl" #include "domstubs.idl" -#include "nsISelection.idl" -#include "nsISelectionController.idl" -#include "nsIFile.idl" -#include "nsIAtom.idl" -#include "nsIOutputStream.idl" -#include "nsIDocumentStateListener.idl" -#include "nsITransactionManager.idl" -#include "nsIEditorObserver.idl" -#include "nsIEditActionListener.idl" + +interface nsIFile; +interface nsIAtom; +interface nsISelection; +interface nsISelectionController; +interface nsIDocumentStateListener; +interface nsIOutputStream; +interface nsITransactionManager; +interface nsITransaction; +interface nsIEditorObserver; +interface nsIEditActionListener; %{C++ +#include "nsAWritableString.h" + //class nsIDOMDocument; //class nsIDOMElement; //class nsIDOMNode; diff --git a/mozilla/editor/idl/nsIEditorShell.idl b/mozilla/editor/idl/nsIEditorShell.idl index 369af00827d..7f73e03cda8 100644 --- a/mozilla/editor/idl/nsIEditorShell.idl +++ b/mozilla/editor/idl/nsIEditorShell.idl @@ -21,12 +21,12 @@ */ #include "nsISupports.idl" -#include "nsIFile.idl" -#include "nsISupportsArray.idl" -#include "nsIDocumentStateListener.idl" -#include "nsISelectionController.idl" -#include "nsITransactionManager.idl" +interface nsIFile; +interface nsISupportsArray; +interface nsIDocumentStateListener; +interface nsISelectionController; +interface nsITransactionManager; interface nsIDOMWindowInternal; interface nsIDOMDocument; interface nsISelection; diff --git a/mozilla/editor/libeditor/base/IMETextTxn.cpp b/mozilla/editor/libeditor/base/IMETextTxn.cpp index 246a730c2be..17ec47ab0cc 100644 --- a/mozilla/editor/libeditor/base/IMETextTxn.cpp +++ b/mozilla/editor/libeditor/base/IMETextTxn.cpp @@ -30,6 +30,7 @@ #include "nsIPresShell.h" #include "EditAggregateTxn.h" #include "nsLayoutCID.h" +#include "nsISelectionController.h" // #define DEBUG_IMETXN static NS_DEFINE_IID(kRangeCID, NS_RANGE_CID); diff --git a/mozilla/editor/libeditor/base/nsEditor.cpp b/mozilla/editor/libeditor/base/nsEditor.cpp index 3b165c67a52..b411803fa02 100644 --- a/mozilla/editor/libeditor/base/nsEditor.cpp +++ b/mozilla/editor/libeditor/base/nsEditor.cpp @@ -48,6 +48,7 @@ #include "nsIViewManager.h" #include "nsISelection.h" #include "nsISelectionPrivate.h" +#include "nsISelectionController.h" #include "nsIEnumerator.h" #include "nsIAtom.h" #include "nsISupportsArray.h" @@ -59,6 +60,7 @@ #include "nsIWidget.h" #include "nsIScrollbar.h" #include "nsIPlaintextEditor.h" +#include "nsGUIEvent.h" #include "nsIFrame.h" // Needed by IME code diff --git a/mozilla/editor/libeditor/base/nsEditorCommands.cpp b/mozilla/editor/libeditor/base/nsEditorCommands.cpp index 03ea3054e86..a42929baf66 100644 --- a/mozilla/editor/libeditor/base/nsEditorCommands.cpp +++ b/mozilla/editor/libeditor/base/nsEditorCommands.cpp @@ -23,6 +23,7 @@ #include "nsCRT.h" +#include "nsString.h" #include "nsIEditor.h" #include "nsIEditorMailSupport.h" diff --git a/mozilla/editor/libeditor/base/nsStyleSheetTxns.cpp b/mozilla/editor/libeditor/base/nsStyleSheetTxns.cpp index fd02431441e..e255b007848 100644 --- a/mozilla/editor/libeditor/base/nsStyleSheetTxns.cpp +++ b/mozilla/editor/libeditor/base/nsStyleSheetTxns.cpp @@ -28,6 +28,7 @@ #include "nsIStyleSet.h" #include "nsIDocument.h" #include "nsIDocumentObserver.h" +#include "nsISelectionController.h" #include "nsStyleSheetTxns.h" diff --git a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp index dcffe5abd7c..f3ed75365f6 100644 --- a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp @@ -42,6 +42,7 @@ #include "nsIDOMNodeList.h" #include "nsISelection.h" #include "nsISelectionPrivate.h" +#include "nsISelectionController.h" #include "nsIDOMRange.h" #include "nsIDOMNSRange.h" #include "nsIDOMCharacterData.h" diff --git a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp index 02edd0e5a40..4feb7bf32f7 100644 --- a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp @@ -86,6 +86,7 @@ #include "nsInternetCiter.h" #include "nsISupportsPrimitives.h" #include "SetDocTitleTxn.h" +#include "nsGUIEvent.h" // netwerk #include "nsIURI.h" diff --git a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp index 5583ab430ab..f88626512c6 100644 --- a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp +++ b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp @@ -31,6 +31,7 @@ #include "nsIPresShell.h" #include "nsIDOMElement.h" #include "nsISelection.h" +#include "nsISelectionController.h" #include "nsIDOMCharacterData.h" #include "nsISupportsArray.h" #include "nsIStringStream.h" diff --git a/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp b/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp index ac5ae8f211d..bfeebdc1169 100644 --- a/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp +++ b/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp @@ -41,6 +41,7 @@ #include "nsIDOMHTMLAnchorElement.h" #include "nsIDOMHTMLImageElement.h" #include "nsISelectionController.h" +#include "nsGUIEvent.h" #include "nsIIndependentSelection.h" //domselections answer to frameselection diff --git a/mozilla/editor/libeditor/txtsvc/nsTextServicesDocument.cpp b/mozilla/editor/libeditor/txtsvc/nsTextServicesDocument.cpp index ac6fb0ee3ae..84ca379d122 100644 --- a/mozilla/editor/libeditor/txtsvc/nsTextServicesDocument.cpp +++ b/mozilla/editor/libeditor/txtsvc/nsTextServicesDocument.cpp @@ -23,6 +23,8 @@ #include "nsLayoutCID.h" #include "nsIAtom.h" +#include "nsString.h" +#include "nsIEnumerator.h" #include "nsIContent.h" #include "nsIContentIterator.h" #include "nsIDOMNodeList.h" diff --git a/mozilla/editor/libeditor/txtsvc/nsTextServicesDocument.h b/mozilla/editor/libeditor/txtsvc/nsTextServicesDocument.h index 3e800940e31..cdbb060f8d1 100644 --- a/mozilla/editor/libeditor/txtsvc/nsTextServicesDocument.h +++ b/mozilla/editor/libeditor/txtsvc/nsTextServicesDocument.h @@ -34,6 +34,7 @@ #include "nsITextServicesDocument.h" #include "nsVoidArray.h" #include "nsTSDNotifier.h" +#include "nsISelectionController.h" /** implementation of a text services object. * diff --git a/mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp b/mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp index ac6fb0ee3ae..84ca379d122 100644 --- a/mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp +++ b/mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp @@ -23,6 +23,8 @@ #include "nsLayoutCID.h" #include "nsIAtom.h" +#include "nsString.h" +#include "nsIEnumerator.h" #include "nsIContent.h" #include "nsIContentIterator.h" #include "nsIDOMNodeList.h" diff --git a/mozilla/editor/txtsvc/src/nsTextServicesDocument.h b/mozilla/editor/txtsvc/src/nsTextServicesDocument.h index 3e800940e31..cdbb060f8d1 100644 --- a/mozilla/editor/txtsvc/src/nsTextServicesDocument.h +++ b/mozilla/editor/txtsvc/src/nsTextServicesDocument.h @@ -34,6 +34,7 @@ #include "nsITextServicesDocument.h" #include "nsVoidArray.h" #include "nsTSDNotifier.h" +#include "nsISelectionController.h" /** implementation of a text services object. * diff --git a/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp b/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp index bd865230897..dbfad6f48e9 100644 --- a/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp +++ b/mozilla/embedding/browser/activex/src/control/MozillaBrowser.cpp @@ -46,6 +46,7 @@ #include "nsIPrintListener.h" #include "nsIPrintOptions.h" #include "nsIWebBrowserPrint.h" +#include "nsIWidget.h" #include "nsIDOMWindowInternal.h" #include "nsIDOMHTMLAnchorElement.h" diff --git a/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.h b/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.h index 68722479431..b4ce54a25ae 100644 --- a/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.h +++ b/mozilla/embedding/browser/activex/src/control/WebBrowserContainer.h @@ -28,6 +28,7 @@ #include "nsIContextMenuListener.h" #include "nsICommandHandler.h" #include "nsIEmbeddingSiteWindow.h" +#include "nsIURIContentListener.h" #include "nsWeakReference.h" diff --git a/mozilla/embedding/browser/build/nsWebBrowserModule.cpp b/mozilla/embedding/browser/build/nsWebBrowserModule.cpp index 81de0432c61..19e9d4d4983 100644 --- a/mozilla/embedding/browser/build/nsWebBrowserModule.cpp +++ b/mozilla/embedding/browser/build/nsWebBrowserModule.cpp @@ -21,6 +21,7 @@ */ #include "nsIModule.h" +#include "nsIServiceManager.h" #include "nsIGenericFactory.h" #include "nsICategoryManager.h" #include "nsXPIDLString.h" diff --git a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp index 612107e8d26..8d5a907569b 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp +++ b/mozilla/embedding/browser/gtk/src/EmbedPrivate.cpp @@ -21,6 +21,7 @@ #include #include +#include "nsIWidget.h" // for NS_APPSHELL_CID #include diff --git a/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp b/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp index 54290154218..2a48a5deb98 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp +++ b/mozilla/embedding/browser/gtk/src/EmbedWindow.cpp @@ -24,6 +24,7 @@ #include #include #include +#include "nsIWidget.h" #include "EmbedWindow.h" #include "EmbedPrivate.h" diff --git a/mozilla/embedding/browser/gtk/src/EmbedWindow.h b/mozilla/embedding/browser/gtk/src/EmbedWindow.h index af0dcb16964..c97b7246a8d 100644 --- a/mozilla/embedding/browser/gtk/src/EmbedWindow.h +++ b/mozilla/embedding/browser/gtk/src/EmbedWindow.h @@ -32,6 +32,7 @@ #include #include #include +#include "nsString.h" #include diff --git a/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp b/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp index 19fc6041ec3..df24d490f99 100644 --- a/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp +++ b/mozilla/embedding/browser/powerplant/source/CBrowserShell.cpp @@ -26,7 +26,6 @@ #include "nsCWebBrowser.h" #include "nsIComponentManager.h" -#include "nsComponentManagerUtils.h" #include "nsWidgetsCID.h" #include "nsRepeater.h" #include "nsString.h" @@ -48,6 +47,7 @@ #include "nsIWebBrowserFind.h" #include "nsIWebBrowserFocus.h" #include "nsWeakPtr.h" +#include "nsRect.h" #include #include diff --git a/mozilla/embedding/browser/powerplant/source/CBrowserWindow.cp b/mozilla/embedding/browser/powerplant/source/CBrowserWindow.cp index cb8788cfa3a..1a27867f4b4 100644 --- a/mozilla/embedding/browser/powerplant/source/CBrowserWindow.cp +++ b/mozilla/embedding/browser/powerplant/source/CBrowserWindow.cp @@ -24,7 +24,6 @@ #include "nsReadableUtils.h" #include "nsWidgetsCID.h" #include "nsIComponentManager.h" -#include "nsComponentManagerUtils.h" #include "nsIServiceManager.h" #include "nsIChannel.h" #include "nsIURI.h" diff --git a/mozilla/embedding/browser/powerplant/source/CThrobber.cpp b/mozilla/embedding/browser/powerplant/source/CThrobber.cpp index e517af2a5d6..a857b9d2517 100644 --- a/mozilla/embedding/browser/powerplant/source/CThrobber.cpp +++ b/mozilla/embedding/browser/powerplant/source/CThrobber.cpp @@ -30,13 +30,13 @@ #include "nsIWidget.h" #include "nsWidgetsCID.h" #include "nsIComponentManager.h" -#include "nsComponentManagerUtils.h" #include "nsIImageGroup.h" #include "nsIDeviceContext.h" #include "nsITimer.h" #include "nsIImageRequest.h" #include "nsFont.h" #include "nsIFontMetrics.h" +#include "nsIImage.h" #include "prprf.h" // CIDs diff --git a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp index 1ed0cf28cf4..e73b157c514 100644 --- a/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp +++ b/mozilla/embedding/browser/webBrowser/nsDocShellTreeOwner.cpp @@ -32,6 +32,7 @@ #include "nsIGenericFactory.h" #include "nsStyleCoord.h" #include "nsHTMLReflowState.h" +#include "nsIServiceManager.h" #include "nsXPIDLString.h" // Interfaces needed to be included @@ -58,6 +59,7 @@ #include "nsPIWindowWatcher.h" #include "nsIPrompt.h" #include "nsIWalletService.h" +#include "nsRect.h" #include "nsIWebBrowserChromeFocus.h" static char *sWindowWatcherContractID = "@mozilla.org/embedcomp/window-watcher;1"; diff --git a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp index 397da4e9558..08f1b3a0905 100644 --- a/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp +++ b/mozilla/embedding/browser/webBrowser/nsWebBrowser.cpp @@ -46,6 +46,8 @@ #include "nsIPresShell.h" #include "nsIGlobalHistory.h" #include "nsIDocShellHistory.h" +#include "nsIURIContentListener.h" +#include "nsGUIEvent.h" // for painting the background window #include "nsIDeviceContext.h" diff --git a/mozilla/embedding/components/find/src/nsWebBrowserFind.cpp b/mozilla/embedding/components/find/src/nsWebBrowserFind.cpp index 8cb63bca1c4..c7501cf52fa 100644 --- a/mozilla/embedding/components/find/src/nsWebBrowserFind.cpp +++ b/mozilla/embedding/components/find/src/nsWebBrowserFind.cpp @@ -39,6 +39,7 @@ #include "nsIDocument.h" #include "nsIDOMDocument.h" #include "nsIFocusController.h" +#include "nsISelection.h" #if DEBUG #include "nsIWebNavigation.h" diff --git a/mozilla/embedding/components/windowwatcher/public/nsIWindowWatcher.idl b/mozilla/embedding/components/windowwatcher/public/nsIWindowWatcher.idl index 0309c033609..0bd20b131b7 100644 --- a/mozilla/embedding/components/windowwatcher/public/nsIWindowWatcher.idl +++ b/mozilla/embedding/components/windowwatcher/public/nsIWindowWatcher.idl @@ -41,10 +41,6 @@ design requirement that clients explicitly maintain |activeWindow|, and that windows remove themselves from the service when they are closed. */ -%{C++ -#include "jsapi.h" -%} - #include "nsISupports.idl" interface nsIDOMWindow; diff --git a/mozilla/embedding/components/windowwatcher/public/nsPIWindowWatcher.idl b/mozilla/embedding/components/windowwatcher/public/nsPIWindowWatcher.idl index 03015a1599d..8eb69ee7e23 100644 --- a/mozilla/embedding/components/windowwatcher/public/nsPIWindowWatcher.idl +++ b/mozilla/embedding/components/windowwatcher/public/nsPIWindowWatcher.idl @@ -29,6 +29,10 @@ interface nsIDOMWindow; interface nsISimpleEnumerator; interface nsIWebBrowserChrome; +%{C++ +#include "jspubtd.h" +%} + [ptr] native jsvalptr(jsval); [uuid(d535806e-afaf-47d1-8d89-783ad088c62a)] diff --git a/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp index 4a4d3d6b0e4..a262e947175 100644 --- a/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp +++ b/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp @@ -42,6 +42,7 @@ #include "nsIDOMScreen.h" #include "nsIDOMWindow.h" #include "nsIDOMWindowInternal.h" +#include "nsIScriptContext.h" #include "nsIEventQueue.h" #include "nsIEventQueueService.h" #include "nsIGenericFactory.h" diff --git a/mozilla/embedding/tests/gtkEmbed/WebBrowserChrome.cpp b/mozilla/embedding/tests/gtkEmbed/WebBrowserChrome.cpp index c70b9f8108f..398cc19e9db 100644 --- a/mozilla/embedding/tests/gtkEmbed/WebBrowserChrome.cpp +++ b/mozilla/embedding/tests/gtkEmbed/WebBrowserChrome.cpp @@ -22,6 +22,7 @@ // Local Includes #include "nsIGenericFactory.h" +#include "nsIComponentManager.h" #include "nsString.h" #include "nsXPIDLString.h" #include "nsIURI.h" diff --git a/mozilla/embedding/tests/gtkEmbed/main.cpp b/mozilla/embedding/tests/gtkEmbed/main.cpp index c757ae8c5ce..66cebc2e373 100644 --- a/mozilla/embedding/tests/gtkEmbed/main.cpp +++ b/mozilla/embedding/tests/gtkEmbed/main.cpp @@ -32,6 +32,7 @@ #include "gtkEmbed.h" #include "nsCOMPtr.h" +#include "nsISimpleEnumerator.h" #include "nsEmbedAPI.h" #include "WebBrowserChrome.h" #include "WindowCreator.h" diff --git a/mozilla/embedding/tests/mfcembed/BrowserView.cpp b/mozilla/embedding/tests/mfcembed/BrowserView.cpp index 96628129f44..60db28c2630 100644 --- a/mozilla/embedding/tests/mfcembed/BrowserView.cpp +++ b/mozilla/embedding/tests/mfcembed/BrowserView.cpp @@ -55,6 +55,9 @@ // Print Includes #include "PrintProgressDialog.h" +// Mozilla Includes +#include "nsIWidget.h" + #ifdef _DEBUG #define new DEBUG_NEW diff --git a/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp b/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp index 63083eaf1a9..366b5924578 100644 --- a/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp +++ b/mozilla/embedding/tests/winEmbed/WebBrowserChrome.cpp @@ -21,6 +21,7 @@ // Mozilla Includes #include "nsIGenericFactory.h" +#include "nsIComponentManager.h" #include "nsString.h" #include "nsXPIDLString.h" #include "nsIURI.h" diff --git a/mozilla/embedding/tests/winEmbed/winEmbed.cpp b/mozilla/embedding/tests/winEmbed/winEmbed.cpp index fe70fbb4b40..7793dfa6d57 100644 --- a/mozilla/embedding/tests/winEmbed/winEmbed.cpp +++ b/mozilla/embedding/tests/winEmbed/winEmbed.cpp @@ -43,6 +43,7 @@ #include "nsIObserverService.h" #include "nsIObserver.h" #include "nsIProfileChangeStatus.h" +#include "nsIURI.h" // Local header files #include "winEmbed.h" diff --git a/mozilla/extensions/access-builtin/accessproxy/nsAccessProxyRegistration.cpp b/mozilla/extensions/access-builtin/accessproxy/nsAccessProxyRegistration.cpp index 3505af956cf..57de73d7b69 100644 --- a/mozilla/extensions/access-builtin/accessproxy/nsAccessProxyRegistration.cpp +++ b/mozilla/extensions/access-builtin/accessproxy/nsAccessProxyRegistration.cpp @@ -31,6 +31,7 @@ #include "nsAccessProxy.h" #include "nsIAppShellComponent.h" #include "nsIRegistry.h" +#include "nsIServiceManager.h" #include "prprf.h" #include "nsCRT.h" diff --git a/mozilla/extensions/cookie/nsImages.cpp b/mozilla/extensions/cookie/nsImages.cpp index 59ae3f19f3e..843152cad30 100644 --- a/mozilla/extensions/cookie/nsImages.cpp +++ b/mozilla/extensions/cookie/nsImages.cpp @@ -28,6 +28,7 @@ #include "prmem.h" #include "nsIPref.h" #include "nsTextFormatter.h" +#include "nsIServiceManager.h" #define image_behaviorPref "network.image.imageBehavior" #define image_warningPref "network.image.warnAboutImages" diff --git a/mozilla/extensions/cookie/nsModuleFactory.cpp b/mozilla/extensions/cookie/nsModuleFactory.cpp index 05a20efdae4..d17284990ae 100644 --- a/mozilla/extensions/cookie/nsModuleFactory.cpp +++ b/mozilla/extensions/cookie/nsModuleFactory.cpp @@ -23,6 +23,7 @@ #include "nsIModule.h" #include "nsIGenericFactory.h" +#include "nsIServiceManager.h" #include "nsCookie.h" #include "nsPermission.h" #include "nsCookieManager.h" diff --git a/mozilla/extensions/inspector/base/src/inFlasher.cpp b/mozilla/extensions/inspector/base/src/inFlasher.cpp index c64bf6a482c..a7534db5bbd 100644 --- a/mozilla/extensions/inspector/base/src/inFlasher.cpp +++ b/mozilla/extensions/inspector/base/src/inFlasher.cpp @@ -31,6 +31,7 @@ #include "nsIDocument.h" #include "nsIDocShell.h" #include "nsIPresShell.h" +#include "nsIPresContext.h" #include "nsIRenderingContext.h" #include "nsIContent.h" #include "nsIFrame.h" diff --git a/mozilla/extensions/inspector/base/src/nsCSSDecDataSource.h b/mozilla/extensions/inspector/base/src/nsCSSDecDataSource.h index b05935afb4c..a6ee02bd725 100644 --- a/mozilla/extensions/inspector/base/src/nsCSSDecDataSource.h +++ b/mozilla/extensions/inspector/base/src/nsCSSDecDataSource.h @@ -32,14 +32,12 @@ #include "nsCOMPtr.h" #include "nsISupportsArray.h" #include "nsString.h" +#include "nsHashtable.h" #include "nsIDOMElement.h" #include "nsIDOMCSSStyleRule.h" #include "nsIDOMCSSStyleDeclaration.h" -#include "nsCOMPtr.h" -#include "nsISupportsArray.h" -#include "nsString.h" #include "nsIDocument.h" #include "nsIStyleSheet.h" #include "nsIURI.h" diff --git a/mozilla/extensions/inspector/base/src/nsCSSRuleDataSource.h b/mozilla/extensions/inspector/base/src/nsCSSRuleDataSource.h index 516f9a0d488..684c81f95c5 100644 --- a/mozilla/extensions/inspector/base/src/nsCSSRuleDataSource.h +++ b/mozilla/extensions/inspector/base/src/nsCSSRuleDataSource.h @@ -37,6 +37,7 @@ #include "nsCOMPtr.h" #include "nsISupportsArray.h" #include "nsString.h" +#include "nsHashtable.h" #include "nsIDOMElement.h" #include "nsIDOMDocument.h" #include "nsIDocument.h" diff --git a/mozilla/extensions/transformiix/build/XSLTProcessorModule.cpp b/mozilla/extensions/transformiix/build/XSLTProcessorModule.cpp index 00583b3de62..e04f3ddb340 100755 --- a/mozilla/extensions/transformiix/build/XSLTProcessorModule.cpp +++ b/mozilla/extensions/transformiix/build/XSLTProcessorModule.cpp @@ -25,6 +25,7 @@ #include "nsIGenericFactory.h" #include "nsICategoryManager.h" +#include "nsIServiceManager.h" #include "nsIScriptNameSpaceManager.h" #include "nsXPIDLString.h" diff --git a/mozilla/extensions/wallet/public/nsIWalletService.idl b/mozilla/extensions/wallet/public/nsIWalletService.idl index 62ebca25d37..60ddb0f8ff0 100644 --- a/mozilla/extensions/wallet/public/nsIWalletService.idl +++ b/mozilla/extensions/wallet/public/nsIWalletService.idl @@ -26,7 +26,6 @@ %{ C++ #include "nsString.h" -#include "nsIPresShell.h" // {738CFD52-ABCF-11d2-AB4B-0080C787AD96} #define NS_WALLETSERVICE_CID \ diff --git a/mozilla/extensions/wallet/src/wallet.h b/mozilla/extensions/wallet/src/wallet.h index 395ad4bdf24..2ab3882b6d0 100644 --- a/mozilla/extensions/wallet/src/wallet.h +++ b/mozilla/extensions/wallet/src/wallet.h @@ -35,6 +35,9 @@ #include "nsFileSpec.h" #include "nsIPrompt.h" +class nsIDOMWindowInternal; +class nsIDOMNode; + XP_BEGIN_PROTOS #define HEADER_VERSION "#2c" diff --git a/mozilla/extensions/xmlextras/build/src/nsXMLExtrasModule.cpp b/mozilla/extensions/xmlextras/build/src/nsXMLExtrasModule.cpp index 6a8608906f8..33f701ac827 100644 --- a/mozilla/extensions/xmlextras/build/src/nsXMLExtrasModule.cpp +++ b/mozilla/extensions/xmlextras/build/src/nsXMLExtrasModule.cpp @@ -21,6 +21,7 @@ */ #include "nsIGenericFactory.h" +#include "nsIServiceManager.h" #include "nsDOMSerializer.h" #include "nsXMLHttpRequest.h" #include "nsDOMParser.h" diff --git a/mozilla/extensions/xmlterm/base/mozIXMLTerminal.h b/mozilla/extensions/xmlterm/base/mozIXMLTerminal.h index 7053d48761d..e280960213a 100644 --- a/mozilla/extensions/xmlterm/base/mozIXMLTerminal.h +++ b/mozilla/extensions/xmlterm/base/mozIXMLTerminal.h @@ -34,6 +34,8 @@ #include "mozIXMLTermShell.h" +class nsISelectionController; + /* {0eb82b20-43a2-11d3-8e76-006008948af5} */ #define MOZIXMLTERMINAL_IID_STR "0eb82b20-43a2-11d3-8e76-006008948af5" #define MOZIXMLTERMINAL_IID \ diff --git a/mozilla/extensions/xmlterm/base/mozXMLTermListeners.cpp b/mozilla/extensions/xmlterm/base/mozXMLTermListeners.cpp index 68d995a354b..7c1b913e77a 100644 --- a/mozilla/extensions/xmlterm/base/mozXMLTermListeners.cpp +++ b/mozilla/extensions/xmlterm/base/mozXMLTermListeners.cpp @@ -31,6 +31,7 @@ #include "nsIDOMMouseEvent.h" #include "nsIDOMNSUIEvent.h" #include "nsIPrivateTextEvent.h" +#include "nsISelectionController.h" ///////////////////////////////////////////////////////////////////////// // mozXMLTermKeyListener factory diff --git a/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp b/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp index 8f888ed6143..05e14f3fdbd 100644 --- a/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp +++ b/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp @@ -35,9 +35,12 @@ #include "nsIDOMHTMLDocument.h" #include "nsIDocumentViewer.h" #include "nsIObserver.h" +#include "nsISelectionController.h" #include "nsIPresContext.h" #include "nsICaret.h" +#include "nsRect.h" +#include "nsIURI.h" #include "nsIDOMEventReceiver.h" #include "nsIDOMEventListener.h" diff --git a/mozilla/gfx/public/nsIDeviceContext.h b/mozilla/gfx/public/nsIDeviceContext.h index c06c84803d4..03a84f558f6 100644 --- a/mozilla/gfx/public/nsIDeviceContext.h +++ b/mozilla/gfx/public/nsIDeviceContext.h @@ -27,8 +27,8 @@ #include "nsCoord.h" #include "nsRect.h" #include "nsIWidget.h" +#include "nsIRenderingContext.h" -class nsIRenderingContext; class nsIView; class nsIFontMetrics; class nsIWidget; diff --git a/mozilla/gfx/public/nsIDrawingSurface.h b/mozilla/gfx/public/nsIDrawingSurface.h index 557473ec1dd..9575e6debc9 100644 --- a/mozilla/gfx/public/nsIDrawingSurface.h +++ b/mozilla/gfx/public/nsIDrawingSurface.h @@ -25,7 +25,6 @@ #include "nscore.h" #include "nsISupports.h" -#include "nsRect.h" // a memory area that can be rendered to diff --git a/mozilla/gfx/public/nsIImage.h b/mozilla/gfx/public/nsIImage.h index cfc9330bf45..52902798691 100644 --- a/mozilla/gfx/public/nsIImage.h +++ b/mozilla/gfx/public/nsIImage.h @@ -24,10 +24,12 @@ #define nsIImage_h___ #include "nsISupports.h" -#include "nsRect.h" #include "nsIRenderingContext.h" -typedef struct +struct nsRect; +class nsIDeviceContext; + +struct nsColorMap { //I lifted this from the image lib. The difference is that //this uses nscolor instead of NI_RGB. Multiple color pollution @@ -38,7 +40,7 @@ typedef struct //nscolor *Map; // Colormap colors. PRUint8 *Index; // NULL, if map is in index order, otherwise // specifies the indices of the map entries. */ -} nsColorMap; +}; typedef enum { nsMaskRequirements_kNoMask, diff --git a/mozilla/gfx/public/nsIRenderingContext.h b/mozilla/gfx/public/nsIRenderingContext.h index 114d58e6338..d41d17ab78e 100644 --- a/mozilla/gfx/public/nsIRenderingContext.h +++ b/mozilla/gfx/public/nsIRenderingContext.h @@ -39,6 +39,7 @@ class nsIRegion; struct nsFont; struct nsPoint; +struct nsPathPoint; struct nsRect; #ifdef MOZ_MATHML struct nsBoundingMetrics; @@ -47,7 +48,6 @@ struct nsBoundingMetrics; #ifdef USE_IMG2 /* gfx2 */ -#include "gfxtypes.h" class imgIContainer; #endif diff --git a/mozilla/gfx/src/mac/nsIDrawingSurfaceMac.h b/mozilla/gfx/src/mac/nsIDrawingSurfaceMac.h index bdf0162157f..7b354d47cb3 100644 --- a/mozilla/gfx/src/mac/nsIDrawingSurfaceMac.h +++ b/mozilla/gfx/src/mac/nsIDrawingSurfaceMac.h @@ -25,6 +25,7 @@ #include "nsIDrawingSurface.h" #include "nsIWidget.h" +#include "nsIRenderingContext.h" #include class GraphicsState; diff --git a/mozilla/gfx/src/mac/nsRenderingContextMac.cpp b/mozilla/gfx/src/mac/nsRenderingContextMac.cpp index d62a8070fc5..1693812ad56 100644 --- a/mozilla/gfx/src/mac/nsRenderingContextMac.cpp +++ b/mozilla/gfx/src/mac/nsRenderingContextMac.cpp @@ -25,6 +25,7 @@ #include "nsRenderingContextMac.h" #include "nsDeviceContextMac.h" #include "nsFontMetricsMac.h" +#include "nsIImage.h" #include "nsIRegion.h" #include "nsIEnumerator.h" #include "nsRegionMac.h" diff --git a/mozilla/gfx/src/nsBlender.cpp b/mozilla/gfx/src/nsBlender.cpp index a1b4fa2f4a2..341bcba7c7d 100644 --- a/mozilla/gfx/src/nsBlender.cpp +++ b/mozilla/gfx/src/nsBlender.cpp @@ -23,6 +23,7 @@ #include "nsBlender.h" #include "nsIDeviceContext.h" #include "il_util.h" +#include "nsCRT.h" /** --------------------------------------------------- * See documentation in nsBlender.h diff --git a/mozilla/gfx/src/nsImageManager.cpp b/mozilla/gfx/src/nsImageManager.cpp index 372ab6e26a2..393f763bc93 100644 --- a/mozilla/gfx/src/nsImageManager.cpp +++ b/mozilla/gfx/src/nsImageManager.cpp @@ -26,6 +26,7 @@ #include "nsIObserverService.h" #include "nsWeakReference.h" #include "nsString.h" +#include "nsIServiceManager.h" #include "libimg.h" diff --git a/mozilla/gfx/src/ps/nsRenderingContextPS.cpp b/mozilla/gfx/src/ps/nsRenderingContextPS.cpp index ea501d03c01..3ab74e03493 100644 --- a/mozilla/gfx/src/ps/nsRenderingContextPS.cpp +++ b/mozilla/gfx/src/ps/nsRenderingContextPS.cpp @@ -27,6 +27,7 @@ #include "nsDeviceContextPS.h" #include "nsPostScriptObj.h" #include "nsIRegion.h" +#include "nsIImage.h" static NS_DEFINE_IID(kIRenderingContextIID, NS_IRENDERING_CONTEXT_IID); diff --git a/mozilla/gfx/src/qt/nsFontMetricsQT.h b/mozilla/gfx/src/qt/nsFontMetricsQT.h index 87561eaf2bd..bbdcb69f37e 100644 --- a/mozilla/gfx/src/qt/nsFontMetricsQT.h +++ b/mozilla/gfx/src/qt/nsFontMetricsQT.h @@ -34,6 +34,7 @@ #include "nsICharRepresentable.h" #include "nsICharsetConverterManager.h" #include "nsICharsetConverterManager2.h" +#include "nsVoidArray.h" #include #include diff --git a/mozilla/gfx/src/xlib/nsImageXlib.cpp b/mozilla/gfx/src/xlib/nsImageXlib.cpp index 215cc566cfd..d1d5f455af3 100644 --- a/mozilla/gfx/src/xlib/nsImageXlib.cpp +++ b/mozilla/gfx/src/xlib/nsImageXlib.cpp @@ -30,6 +30,7 @@ #include "nsRenderingContextXlib.h" #include "xlibrgb.h" #include "prlog.h" +#include "nsRect.h" #include "drawers.h" #include "imgScaler.h" diff --git a/mozilla/gfx/src/xlib/nsImageXlib.h b/mozilla/gfx/src/xlib/nsImageXlib.h index 8b51317b5ad..463678435cb 100644 --- a/mozilla/gfx/src/xlib/nsImageXlib.h +++ b/mozilla/gfx/src/xlib/nsImageXlib.h @@ -26,6 +26,7 @@ #define nsImageXlib_h__ #include "nsIImage.h" +#include "nsPoint.h" #include "nsGCCache.h" #include "X11/Xlib.h" diff --git a/mozilla/intl/chardet/src/nsPSMDetectors.h b/mozilla/intl/chardet/src/nsPSMDetectors.h index c2c059f38c2..505d989252b 100644 --- a/mozilla/intl/chardet/src/nsPSMDetectors.h +++ b/mozilla/intl/chardet/src/nsPSMDetectors.h @@ -22,6 +22,7 @@ #ifndef nsPSMDetectors_h__ #define nsPSMDetectors_h__ +#include "nsCOMPtr.h" #include "nsIFactory.h" #include "nsVerifier.h" //---- for verifiers diff --git a/mozilla/intl/uconv/public/nsICharsetConverterManager.h b/mozilla/intl/uconv/public/nsICharsetConverterManager.h index 4bde5ab88fe..a64e6aedc43 100644 --- a/mozilla/intl/uconv/public/nsICharsetConverterManager.h +++ b/mozilla/intl/uconv/public/nsICharsetConverterManager.h @@ -29,7 +29,6 @@ #include "nsIAtom.h" #include "nsIUnicodeEncoder.h" #include "nsIUnicodeDecoder.h" -#include "nsVoidArray.h" #define NS_ICHARSETCONVERTERMANAGER_IID \ {0x3c1c0161, 0x9bd0, 0x11d3, { 0x9d, 0x9, 0x0, 0x50, 0x4, 0x0, 0x7, 0xb2}} diff --git a/mozilla/intl/uconv/src/nsCharsetMenu.cpp b/mozilla/intl/uconv/src/nsCharsetMenu.cpp index 9ce54a50c12..90d20e99f57 100644 --- a/mozilla/intl/uconv/src/nsCharsetMenu.cpp +++ b/mozilla/intl/uconv/src/nsCharsetMenu.cpp @@ -40,6 +40,8 @@ #include "nsIPref.h" #include "nsICurrentCharsetListener.h" #include "nsQuickSort.h" +#include "nsIObserver.h" +#include "nsVoidArray.h" //---------------------------------------------------------------------------- // Global functions and data [declaration] diff --git a/mozilla/intl/uconv/src/nsUConvDll.cpp b/mozilla/intl/uconv/src/nsUConvDll.cpp index f55ef05b71f..8bb07530bd0 100644 --- a/mozilla/intl/uconv/src/nsUConvDll.cpp +++ b/mozilla/intl/uconv/src/nsUConvDll.cpp @@ -24,7 +24,6 @@ #include "nsIComponentManager.h" #include "nsCOMPtr.h" #include "nsICharsetConverterManager.h" -#include "nsCharsetConverterManager.h" #include "nsIUnicodeDecodeHelper.h" #include "nsUnicodeDecodeHelper.h" #include "nsIUnicodeEncodeHelper.h" diff --git a/mozilla/js/src/xpconnect/idl/nsIXPCSecurityManager.idl b/mozilla/js/src/xpconnect/idl/nsIXPCSecurityManager.idl index 3d656475b44..6d49ade8501 100644 --- a/mozilla/js/src/xpconnect/idl/nsIXPCSecurityManager.idl +++ b/mozilla/js/src/xpconnect/idl/nsIXPCSecurityManager.idl @@ -34,10 +34,17 @@ */ #include "nsISupports.idl" -#include "nsIXPConnect.idl" -#include "nsIClassInfo.idl" -[ptr] native JSContext(JSContext); +%{ C++ +#include "jspubtd.h" +%} + +interface nsIClassInfo; +interface nsIXPCNativeCallContext; + +[ptr] native JSContextPtr(JSContext); +[ptr] native JSObjectPtr(JSObject); + native JSVal(jsval); [uuid(31431440-f1ce-11d2-985a-006008962422)] interface nsIXPCSecurityManager : nsISupports diff --git a/mozilla/layout/base/nsCaret.cpp b/mozilla/layout/base/nsCaret.cpp index 9d0540108a1..3f28476af9d 100644 --- a/mozilla/layout/base/nsCaret.cpp +++ b/mozilla/layout/base/nsCaret.cpp @@ -29,6 +29,7 @@ #include "nsITimerCallback.h" #include "nsIComponentManager.h" +#include "nsIServiceManager.h" #include "nsIFrameSelection.h" #include "nsIFrame.h" #include "nsIDOMNode.h" diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp index 706f84d20fb..53f2cc1fb5d 100644 --- a/mozilla/layout/base/nsDocumentViewer.cpp +++ b/mozilla/layout/base/nsDocumentViewer.cpp @@ -83,6 +83,8 @@ #include "nsIFrameManager.h" #include "nsIParser.h" #include "nsIPrintContext.h" +#include "nsGUIEvent.h" +#include "nsHTMLReflowState.h" #include "nsIDOMHTMLAnchorElement.h" #include "nsIDOMHTMLImageElement.h" diff --git a/mozilla/layout/base/nsICaret.h b/mozilla/layout/base/nsICaret.h index 3cfa639141f..c4e6db5d1b8 100644 --- a/mozilla/layout/base/nsICaret.h +++ b/mozilla/layout/base/nsICaret.h @@ -25,13 +25,15 @@ #include "nsISupports.h" #include "nsCOMPtr.h" -#include "nsIPresShell.h" +#include "nsCoord.h" class nsIRenderingContext; class nsIFrame; class nsIView; +class nsIPresShell; struct nsRect; struct nsPoint; +class nsISelection; // IID for the nsICaret interface #define NS_ICARET_IID \ diff --git a/mozilla/layout/base/nsIChromeEventHandler.idl b/mozilla/layout/base/nsIChromeEventHandler.idl index 60284b13728..483dc0649ca 100644 --- a/mozilla/layout/base/nsIChromeEventHandler.idl +++ b/mozilla/layout/base/nsIChromeEventHandler.idl @@ -24,6 +24,7 @@ %{ C++ #include "nsIPresContext.h" +#include "nsEvent.h" %} [ptr] native nsIPresContext(nsIPresContext); diff --git a/mozilla/layout/base/nsIFrameSelection.h b/mozilla/layout/base/nsIFrameSelection.h index 48d66e14523..ba4359feed0 100644 --- a/mozilla/layout/base/nsIFrameSelection.h +++ b/mozilla/layout/base/nsIFrameSelection.h @@ -34,7 +34,6 @@ #include "nsIFrame.h" #include "nsIFocusTracker.h" #include "nsISelection.h" -#include "nsIPresShell.h" #include "nsIContent.h" #include "nsCOMPtr.h" #include "nsIStyleContext.h" diff --git a/mozilla/layout/base/nsIPresShell.h b/mozilla/layout/base/nsIPresShell.h index e88dcd24ce5..34035caad1f 100644 --- a/mozilla/layout/base/nsIPresShell.h +++ b/mozilla/layout/base/nsIPresShell.h @@ -40,12 +40,8 @@ #include "nslayout.h" #include "nsISupports.h" #include "nsCoord.h" -#include "nsISelection.h" #include "nsIReflowCommand.h" -#include "nsGUIEvent.h" - -#include "nsISelectionController.h" //for the selection enums. - +#include "nsEvent.h" class nsIContent; class nsIContentIterator; @@ -68,6 +64,7 @@ class nsILayoutHistoryState; class nsIArena; class nsIReflowCallback; class nsISupportsArray; +class nsIDOMNode; #define NS_IPRESSHELL_IID \ { 0x76e79c60, 0x944e, 0x11d1, \ diff --git a/mozilla/layout/base/nsPresContext.h b/mozilla/layout/base/nsPresContext.h index d439cd20bc1..65a177a966d 100644 --- a/mozilla/layout/base/nsPresContext.h +++ b/mozilla/layout/base/nsPresContext.h @@ -25,15 +25,16 @@ #include "nslayout.h" #include "nsISupports.h" -#include "nsRect.h" #include "nsColor.h" +#include "nsCoord.h" #include "nsIFrameImageLoader.h" -#include "nsILanguageAtom.h" +#include "nsAWritableString.h" #ifdef IBMBIDI class nsBidiPresUtils; #endif // IBMBIDI struct nsFont; +struct nsRect; class nsIContent; class nsIDocument; @@ -52,6 +53,7 @@ class nsIEventStateManager; class nsIURI; class nsILookAndFeel; class nsICSSPseudoComparator; +class nsILanguageAtom; #ifdef MOZ_REFLOW_PERF class nsIRenderingContext; diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index db76a3eba3f..fca1124aa9b 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -65,6 +65,7 @@ #include "nsIDeviceContext.h" #include "nsIEventStateManager.h" #include "nsIDOMEvent.h" +#include "nsGUIEvent.h" #include "nsHTMLParts.h" #include "nsISelection.h" #include "nsISelectionController.h" diff --git a/mozilla/layout/base/public/nsHTMLReflowState.h b/mozilla/layout/base/public/nsHTMLReflowState.h index f98a995e69f..383d51acc40 100644 --- a/mozilla/layout/base/public/nsHTMLReflowState.h +++ b/mozilla/layout/base/public/nsHTMLReflowState.h @@ -23,6 +23,8 @@ #define nsHTMLReflowState_h___ #include "nslayout.h" +#include "nsMargin.h" +#include "nsStyleCoord.h" class nsIFrame; class nsIPresContext; diff --git a/mozilla/layout/base/public/nsICaret.h b/mozilla/layout/base/public/nsICaret.h index 3cfa639141f..c4e6db5d1b8 100644 --- a/mozilla/layout/base/public/nsICaret.h +++ b/mozilla/layout/base/public/nsICaret.h @@ -25,13 +25,15 @@ #include "nsISupports.h" #include "nsCOMPtr.h" -#include "nsIPresShell.h" +#include "nsCoord.h" class nsIRenderingContext; class nsIFrame; class nsIView; +class nsIPresShell; struct nsRect; struct nsPoint; +class nsISelection; // IID for the nsICaret interface #define NS_ICARET_IID \ diff --git a/mozilla/layout/base/public/nsIChromeEventHandler.idl b/mozilla/layout/base/public/nsIChromeEventHandler.idl index 60284b13728..483dc0649ca 100644 --- a/mozilla/layout/base/public/nsIChromeEventHandler.idl +++ b/mozilla/layout/base/public/nsIChromeEventHandler.idl @@ -24,6 +24,7 @@ %{ C++ #include "nsIPresContext.h" +#include "nsEvent.h" %} [ptr] native nsIPresContext(nsIPresContext); diff --git a/mozilla/layout/base/public/nsIFrame.h b/mozilla/layout/base/public/nsIFrame.h index a22b53dacec..3616cc77055 100644 --- a/mozilla/layout/base/public/nsIFrame.h +++ b/mozilla/layout/base/public/nsIFrame.h @@ -25,16 +25,19 @@ #include #include "nslayout.h" #include "nsISupports.h" -#include "nsSize.h" -#include "nsGUIEvent.h" -#include "nsStyleConsts.h" +#include "nsEvent.h" #include "nsStyleStruct.h" -#include "nsStyleCoord.h" -#include "nsHTMLReflowState.h" +#include "nsSize.h" +#include "nsMargin.h" +#include "nsRect.h" #ifdef MOZ_MATHML #include "nsIRenderingContext.h" //to get struct nsBoundingMetrics #endif +struct nsGUIEvent; +struct nsHTMLReflowState; +class nsIReflowCommand; + /** * New rules of reflow: * 1. you get a WillReflow() followed by a Reflow() followed by a DidReflow() in order diff --git a/mozilla/layout/base/public/nsIFrameSelection.h b/mozilla/layout/base/public/nsIFrameSelection.h index 48d66e14523..ba4359feed0 100644 --- a/mozilla/layout/base/public/nsIFrameSelection.h +++ b/mozilla/layout/base/public/nsIFrameSelection.h @@ -34,7 +34,6 @@ #include "nsIFrame.h" #include "nsIFocusTracker.h" #include "nsISelection.h" -#include "nsIPresShell.h" #include "nsIContent.h" #include "nsCOMPtr.h" #include "nsIStyleContext.h" diff --git a/mozilla/layout/base/public/nsIPresContext.h b/mozilla/layout/base/public/nsIPresContext.h index d439cd20bc1..65a177a966d 100644 --- a/mozilla/layout/base/public/nsIPresContext.h +++ b/mozilla/layout/base/public/nsIPresContext.h @@ -25,15 +25,16 @@ #include "nslayout.h" #include "nsISupports.h" -#include "nsRect.h" #include "nsColor.h" +#include "nsCoord.h" #include "nsIFrameImageLoader.h" -#include "nsILanguageAtom.h" +#include "nsAWritableString.h" #ifdef IBMBIDI class nsBidiPresUtils; #endif // IBMBIDI struct nsFont; +struct nsRect; class nsIContent; class nsIDocument; @@ -52,6 +53,7 @@ class nsIEventStateManager; class nsIURI; class nsILookAndFeel; class nsICSSPseudoComparator; +class nsILanguageAtom; #ifdef MOZ_REFLOW_PERF class nsIRenderingContext; diff --git a/mozilla/layout/base/public/nsIPresShell.h b/mozilla/layout/base/public/nsIPresShell.h index e88dcd24ce5..34035caad1f 100644 --- a/mozilla/layout/base/public/nsIPresShell.h +++ b/mozilla/layout/base/public/nsIPresShell.h @@ -40,12 +40,8 @@ #include "nslayout.h" #include "nsISupports.h" #include "nsCoord.h" -#include "nsISelection.h" #include "nsIReflowCommand.h" -#include "nsGUIEvent.h" - -#include "nsISelectionController.h" //for the selection enums. - +#include "nsEvent.h" class nsIContent; class nsIContentIterator; @@ -68,6 +64,7 @@ class nsILayoutHistoryState; class nsIArena; class nsIReflowCallback; class nsISupportsArray; +class nsIDOMNode; #define NS_IPRESSHELL_IID \ { 0x76e79c60, 0x944e, 0x11d1, \ diff --git a/mozilla/layout/base/public/nsPresContext.h b/mozilla/layout/base/public/nsPresContext.h index d439cd20bc1..65a177a966d 100644 --- a/mozilla/layout/base/public/nsPresContext.h +++ b/mozilla/layout/base/public/nsPresContext.h @@ -25,15 +25,16 @@ #include "nslayout.h" #include "nsISupports.h" -#include "nsRect.h" #include "nsColor.h" +#include "nsCoord.h" #include "nsIFrameImageLoader.h" -#include "nsILanguageAtom.h" +#include "nsAWritableString.h" #ifdef IBMBIDI class nsBidiPresUtils; #endif // IBMBIDI struct nsFont; +struct nsRect; class nsIContent; class nsIDocument; @@ -52,6 +53,7 @@ class nsIEventStateManager; class nsIURI; class nsILookAndFeel; class nsICSSPseudoComparator; +class nsILanguageAtom; #ifdef MOZ_REFLOW_PERF class nsIRenderingContext; diff --git a/mozilla/layout/base/src/nsCaret.cpp b/mozilla/layout/base/src/nsCaret.cpp index 9d0540108a1..3f28476af9d 100644 --- a/mozilla/layout/base/src/nsCaret.cpp +++ b/mozilla/layout/base/src/nsCaret.cpp @@ -29,6 +29,7 @@ #include "nsITimerCallback.h" #include "nsIComponentManager.h" +#include "nsIServiceManager.h" #include "nsIFrameSelection.h" #include "nsIFrame.h" #include "nsIDOMNode.h" diff --git a/mozilla/layout/base/src/nsCopySupport.cpp b/mozilla/layout/base/src/nsCopySupport.cpp index f246fd77eee..f45fa4d24a5 100644 --- a/mozilla/layout/base/src/nsCopySupport.cpp +++ b/mozilla/layout/base/src/nsCopySupport.cpp @@ -26,6 +26,7 @@ #include "nsIComponentManager.h" #include "nsIServiceManager.h" #include "nsIClipboard.h" +#include "nsISelection.h" #include "nsWidgetsCID.h" #include "nsIEventStateManager.h" #include "nsIPresContext.h" diff --git a/mozilla/layout/base/src/nsFrameImageLoader.cpp b/mozilla/layout/base/src/nsFrameImageLoader.cpp index 647c317f7e9..7699cf50052 100644 --- a/mozilla/layout/base/src/nsFrameImageLoader.cpp +++ b/mozilla/layout/base/src/nsFrameImageLoader.cpp @@ -24,6 +24,7 @@ #include "nsIViewManager.h" #include "nsIView.h" #include "nsIFrame.h" +#include "nsIImage.h" #include "nsIURL.h" #include "nsIImageGroup.h" #include "nsIImageRequest.h" diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp index 2b8ee507001..16553c0db64 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.cpp +++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp @@ -66,6 +66,7 @@ #include "nsIAccessibilityService.h" #include "nsIServiceManager.h" #include "nsIDOMNode.h" +#include "nsGUIEvent.h" static NS_DEFINE_CID(kTextNodeCID, NS_TEXTNODE_CID); static NS_DEFINE_CID(kHTMLElementFactoryCID, NS_HTML_ELEMENT_FACTORY_CID); diff --git a/mozilla/layout/forms/nsImageControlFrame.cpp b/mozilla/layout/forms/nsImageControlFrame.cpp index 78390ebcc49..bcde79dc3a7 100644 --- a/mozilla/layout/forms/nsImageControlFrame.cpp +++ b/mozilla/layout/forms/nsImageControlFrame.cpp @@ -44,6 +44,7 @@ #include "nsStyleConsts.h" #include "nsFormFrame.h" #include "nsFormControlFrame.h" +#include "nsGUIEvent.h" #include "nsIAccessibilityService.h" //Enumeration of possible mouse states used to detect mouse clicks diff --git a/mozilla/layout/forms/nsListControlFrame.cpp b/mozilla/layout/forms/nsListControlFrame.cpp index 20d994ed526..e97ef1aae53 100644 --- a/mozilla/layout/forms/nsListControlFrame.cpp +++ b/mozilla/layout/forms/nsListControlFrame.cpp @@ -58,6 +58,7 @@ #include "nsVoidArray.h" #include "nsIScrollableFrame.h" #include "nsIDOMEventTarget.h" +#include "nsGUIEvent.h" #include "nsIAccessibilityService.h" #include "nsISelectElement.h" #include "nsIPrivateDOMEvent.h" diff --git a/mozilla/layout/generic/nsAbsoluteContainingBlock.h b/mozilla/layout/generic/nsAbsoluteContainingBlock.h index 48bac9ebca9..a4d6c4a2683 100644 --- a/mozilla/layout/generic/nsAbsoluteContainingBlock.h +++ b/mozilla/layout/generic/nsAbsoluteContainingBlock.h @@ -24,6 +24,7 @@ #include "nslayout.h" #include "nsFrameList.h" +#include "nsHTMLReflowState.h" class nsIAtom; class nsIFrame; diff --git a/mozilla/layout/generic/nsBlockBandData.cpp b/mozilla/layout/generic/nsBlockBandData.cpp index 97fcfe9a55a..498463088c4 100644 --- a/mozilla/layout/generic/nsBlockBandData.cpp +++ b/mozilla/layout/generic/nsBlockBandData.cpp @@ -22,6 +22,7 @@ #include "nsCOMPtr.h" #include "nsBlockBandData.h" #include "nsIFrame.h" +#include "nsHTMLReflowState.h" #include "nsIStyleContext.h" #include "nsIPresContext.h" #include "nsIPresShell.h" diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index 480d66245bf..ffdbdd8f3ef 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -58,6 +58,7 @@ #include "nsSpaceManager.h" #include "prenv.h" #include "plstr.h" +#include "nsGUIEvent.h" #ifdef IBMBIDI #include "nsBidiPresUtils.h" diff --git a/mozilla/layout/generic/nsBlockReflowContext.h b/mozilla/layout/generic/nsBlockReflowContext.h index 65139793669..9ee9009c9c0 100644 --- a/mozilla/layout/generic/nsBlockReflowContext.h +++ b/mozilla/layout/generic/nsBlockReflowContext.h @@ -23,6 +23,7 @@ #define nsBlockReflowContext_h___ #include "nsIFrame.h" +#include "nsHTMLReflowState.h" class nsBlockFrame; class nsIFrame; diff --git a/mozilla/layout/generic/nsContainerFrame.cpp b/mozilla/layout/generic/nsContainerFrame.cpp index 099d377564d..cb02817b77d 100644 --- a/mozilla/layout/generic/nsContainerFrame.cpp +++ b/mozilla/layout/generic/nsContainerFrame.cpp @@ -41,6 +41,7 @@ #include "nsCOMPtr.h" #include "nsLayoutAtoms.h" #include "nsIViewManager.h" +#include "nsIWidget.h" #ifdef NS_DEBUG #undef NOISY diff --git a/mozilla/layout/generic/nsFrame.h b/mozilla/layout/generic/nsFrame.h index 7b01c9c2a45..6ab7be1ae76 100644 --- a/mozilla/layout/generic/nsFrame.h +++ b/mozilla/layout/generic/nsFrame.h @@ -34,6 +34,7 @@ #include "nsIPresShell.h" #include "nsIReflowCommand.h" #include "nsIFrameSelection.h" +#include "nsHTMLReflowState.h" /** * nsFrame logging constants. We redefine the nspr diff --git a/mozilla/layout/generic/nsFrameFrame.cpp b/mozilla/layout/generic/nsFrameFrame.cpp index b3594174cdc..549b461d464 100644 --- a/mozilla/layout/generic/nsFrameFrame.cpp +++ b/mozilla/layout/generic/nsFrameFrame.cpp @@ -64,12 +64,14 @@ #include "nsIScrollable.h" #include "nsINameSpaceManager.h" #include "nsIPrintContext.h" +#include "nsIWidget.h" #include "nsIWebProgress.h" #include "nsIWebProgressListener.h" #include "nsWeakReference.h" #include "nsIDOMEventTarget.h" #include "nsIDOMEventListener.h" #include "nsIDOMWindow.h" +#include "nsIRenderingContext.h" // For Accessibility #include "nsIAccessibilityService.h" diff --git a/mozilla/layout/generic/nsFrameSetFrame.cpp b/mozilla/layout/generic/nsFrameSetFrame.cpp index 5abdf2043a8..ea36a1aff76 100644 --- a/mozilla/layout/generic/nsFrameSetFrame.cpp +++ b/mozilla/layout/generic/nsFrameSetFrame.cpp @@ -46,6 +46,9 @@ #include "nsILookAndFeel.h" #include "nsWidgetsCID.h" #include "nsIComponentManager.h" +#include "nsGUIEvent.h" +#include "nsIRenderingContext.h" + // masks for mEdgeVisibility #define LEFT_VIS 0x0001 #define RIGHT_VIS 0x0002 diff --git a/mozilla/layout/generic/nsHTMLFrame.cpp b/mozilla/layout/generic/nsHTMLFrame.cpp index 7104349d102..c344f3ff210 100644 --- a/mozilla/layout/generic/nsHTMLFrame.cpp +++ b/mozilla/layout/generic/nsHTMLFrame.cpp @@ -19,6 +19,7 @@ * * Contributor(s): */ +#include "nsIServiceManager.h" #include "nsHTMLParts.h" #include "nsHTMLContainerFrame.h" #include "nsCSSRendering.h" diff --git a/mozilla/layout/generic/nsHTMLReflowState.h b/mozilla/layout/generic/nsHTMLReflowState.h index f98a995e69f..383d51acc40 100644 --- a/mozilla/layout/generic/nsHTMLReflowState.h +++ b/mozilla/layout/generic/nsHTMLReflowState.h @@ -23,6 +23,8 @@ #define nsHTMLReflowState_h___ #include "nslayout.h" +#include "nsMargin.h" +#include "nsStyleCoord.h" class nsIFrame; class nsIPresContext; diff --git a/mozilla/layout/generic/nsIFrame.h b/mozilla/layout/generic/nsIFrame.h index a22b53dacec..3616cc77055 100644 --- a/mozilla/layout/generic/nsIFrame.h +++ b/mozilla/layout/generic/nsIFrame.h @@ -25,16 +25,19 @@ #include #include "nslayout.h" #include "nsISupports.h" -#include "nsSize.h" -#include "nsGUIEvent.h" -#include "nsStyleConsts.h" +#include "nsEvent.h" #include "nsStyleStruct.h" -#include "nsStyleCoord.h" -#include "nsHTMLReflowState.h" +#include "nsSize.h" +#include "nsMargin.h" +#include "nsRect.h" #ifdef MOZ_MATHML #include "nsIRenderingContext.h" //to get struct nsBoundingMetrics #endif +struct nsGUIEvent; +struct nsHTMLReflowState; +class nsIReflowCommand; + /** * New rules of reflow: * 1. you get a WillReflow() followed by a Reflow() followed by a DidReflow() in order diff --git a/mozilla/layout/generic/nsImageFrame.cpp b/mozilla/layout/generic/nsImageFrame.cpp index f8c5fc5d31b..423b65de557 100644 --- a/mozilla/layout/generic/nsImageFrame.cpp +++ b/mozilla/layout/generic/nsImageFrame.cpp @@ -65,6 +65,7 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #include "nsIAccessibilityService.h" #include "nsIServiceManager.h" #include "nsIDOMNode.h" +#include "nsGUIEvent.h" #include "imgIContainer.h" #include "imgILoader.h" diff --git a/mozilla/layout/generic/nsObjectFrame.cpp b/mozilla/layout/generic/nsObjectFrame.cpp index 598b03912f8..a4baeb2c5ff 100644 --- a/mozilla/layout/generic/nsObjectFrame.cpp +++ b/mozilla/layout/generic/nsObjectFrame.cpp @@ -67,6 +67,10 @@ #include "nsXPIDLString.h" #include "nsIDOMRange.h" #include "nsIPrintContext.h" +#include "nsIWidget.h" +#include "nsGUIEvent.h" +#include "nsIRenderingContext.h" +#include "nsIContentViewer.h" #include "nsIDocShell.h" // headers for plugin scriptability diff --git a/mozilla/layout/generic/nsSelection.cpp b/mozilla/layout/generic/nsSelection.cpp index e36064a5ef6..d5e94e32658 100644 --- a/mozilla/layout/generic/nsSelection.cpp +++ b/mozilla/layout/generic/nsSelection.cpp @@ -40,6 +40,7 @@ #include "nsIDOMNode.h" #include "nsRange.h" #include "nsISupportsArray.h" +#include "nsGUIEvent.h" #include "nsIDOMKeyEvent.h" #include "nsITableLayout.h" #include "nsITableCellLayout.h" diff --git a/mozilla/layout/generic/nsTextFrame.cpp b/mozilla/layout/generic/nsTextFrame.cpp index 772ed49f96f..e9296312237 100644 --- a/mozilla/layout/generic/nsTextFrame.cpp +++ b/mozilla/layout/generic/nsTextFrame.cpp @@ -69,6 +69,7 @@ #include "nsIAccessible.h" #include "nsINameSpaceManager.h" #include "nsIAccessibilityService.h" +#include "nsGUIEvent.h" #ifdef IBMBIDI #include "nsBidiFrames.h" diff --git a/mozilla/layout/html/base/src/nsAbsoluteContainingBlock.h b/mozilla/layout/html/base/src/nsAbsoluteContainingBlock.h index 48bac9ebca9..a4d6c4a2683 100644 --- a/mozilla/layout/html/base/src/nsAbsoluteContainingBlock.h +++ b/mozilla/layout/html/base/src/nsAbsoluteContainingBlock.h @@ -24,6 +24,7 @@ #include "nslayout.h" #include "nsFrameList.h" +#include "nsHTMLReflowState.h" class nsIAtom; class nsIFrame; diff --git a/mozilla/layout/html/base/src/nsBlockBandData.cpp b/mozilla/layout/html/base/src/nsBlockBandData.cpp index 97fcfe9a55a..498463088c4 100644 --- a/mozilla/layout/html/base/src/nsBlockBandData.cpp +++ b/mozilla/layout/html/base/src/nsBlockBandData.cpp @@ -22,6 +22,7 @@ #include "nsCOMPtr.h" #include "nsBlockBandData.h" #include "nsIFrame.h" +#include "nsHTMLReflowState.h" #include "nsIStyleContext.h" #include "nsIPresContext.h" #include "nsIPresShell.h" diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index 480d66245bf..ffdbdd8f3ef 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -58,6 +58,7 @@ #include "nsSpaceManager.h" #include "prenv.h" #include "plstr.h" +#include "nsGUIEvent.h" #ifdef IBMBIDI #include "nsBidiPresUtils.h" diff --git a/mozilla/layout/html/base/src/nsBlockReflowContext.h b/mozilla/layout/html/base/src/nsBlockReflowContext.h index 65139793669..9ee9009c9c0 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowContext.h +++ b/mozilla/layout/html/base/src/nsBlockReflowContext.h @@ -23,6 +23,7 @@ #define nsBlockReflowContext_h___ #include "nsIFrame.h" +#include "nsHTMLReflowState.h" class nsBlockFrame; class nsIFrame; diff --git a/mozilla/layout/html/base/src/nsContainerFrame.cpp b/mozilla/layout/html/base/src/nsContainerFrame.cpp index 099d377564d..cb02817b77d 100644 --- a/mozilla/layout/html/base/src/nsContainerFrame.cpp +++ b/mozilla/layout/html/base/src/nsContainerFrame.cpp @@ -41,6 +41,7 @@ #include "nsCOMPtr.h" #include "nsLayoutAtoms.h" #include "nsIViewManager.h" +#include "nsIWidget.h" #ifdef NS_DEBUG #undef NOISY diff --git a/mozilla/layout/html/base/src/nsFrame.h b/mozilla/layout/html/base/src/nsFrame.h index 7b01c9c2a45..6ab7be1ae76 100644 --- a/mozilla/layout/html/base/src/nsFrame.h +++ b/mozilla/layout/html/base/src/nsFrame.h @@ -34,6 +34,7 @@ #include "nsIPresShell.h" #include "nsIReflowCommand.h" #include "nsIFrameSelection.h" +#include "nsHTMLReflowState.h" /** * nsFrame logging constants. We redefine the nspr diff --git a/mozilla/layout/html/base/src/nsHTMLFrame.cpp b/mozilla/layout/html/base/src/nsHTMLFrame.cpp index 7104349d102..c344f3ff210 100644 --- a/mozilla/layout/html/base/src/nsHTMLFrame.cpp +++ b/mozilla/layout/html/base/src/nsHTMLFrame.cpp @@ -19,6 +19,7 @@ * * Contributor(s): */ +#include "nsIServiceManager.h" #include "nsHTMLParts.h" #include "nsHTMLContainerFrame.h" #include "nsCSSRendering.h" diff --git a/mozilla/layout/html/base/src/nsHTMLImageLoader.h b/mozilla/layout/html/base/src/nsHTMLImageLoader.h index d0b4ef9ae2e..f5e6efb60e4 100644 --- a/mozilla/layout/html/base/src/nsHTMLImageLoader.h +++ b/mozilla/layout/html/base/src/nsHTMLImageLoader.h @@ -25,6 +25,7 @@ #include "nslayout.h" #include "nsString.h" #include "nsIPresContext.h" +#include "nsSize.h" class nsIFrame; class nsImageMap; diff --git a/mozilla/layout/html/base/src/nsImageFrame.cpp b/mozilla/layout/html/base/src/nsImageFrame.cpp index f8c5fc5d31b..423b65de557 100644 --- a/mozilla/layout/html/base/src/nsImageFrame.cpp +++ b/mozilla/layout/html/base/src/nsImageFrame.cpp @@ -65,6 +65,7 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #include "nsIAccessibilityService.h" #include "nsIServiceManager.h" #include "nsIDOMNode.h" +#include "nsGUIEvent.h" #include "imgIContainer.h" #include "imgILoader.h" diff --git a/mozilla/layout/html/base/src/nsObjectFrame.cpp b/mozilla/layout/html/base/src/nsObjectFrame.cpp index 598b03912f8..a4baeb2c5ff 100644 --- a/mozilla/layout/html/base/src/nsObjectFrame.cpp +++ b/mozilla/layout/html/base/src/nsObjectFrame.cpp @@ -67,6 +67,10 @@ #include "nsXPIDLString.h" #include "nsIDOMRange.h" #include "nsIPrintContext.h" +#include "nsIWidget.h" +#include "nsGUIEvent.h" +#include "nsIRenderingContext.h" +#include "nsIContentViewer.h" #include "nsIDocShell.h" // headers for plugin scriptability diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index db76a3eba3f..fca1124aa9b 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -65,6 +65,7 @@ #include "nsIDeviceContext.h" #include "nsIEventStateManager.h" #include "nsIDOMEvent.h" +#include "nsGUIEvent.h" #include "nsHTMLParts.h" #include "nsISelection.h" #include "nsISelectionController.h" diff --git a/mozilla/layout/html/base/src/nsTextFrame.cpp b/mozilla/layout/html/base/src/nsTextFrame.cpp index 772ed49f96f..e9296312237 100644 --- a/mozilla/layout/html/base/src/nsTextFrame.cpp +++ b/mozilla/layout/html/base/src/nsTextFrame.cpp @@ -69,6 +69,7 @@ #include "nsIAccessible.h" #include "nsINameSpaceManager.h" #include "nsIAccessibilityService.h" +#include "nsGUIEvent.h" #ifdef IBMBIDI #include "nsBidiFrames.h" diff --git a/mozilla/layout/html/document/src/nsFrameFrame.cpp b/mozilla/layout/html/document/src/nsFrameFrame.cpp index b3594174cdc..549b461d464 100644 --- a/mozilla/layout/html/document/src/nsFrameFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameFrame.cpp @@ -64,12 +64,14 @@ #include "nsIScrollable.h" #include "nsINameSpaceManager.h" #include "nsIPrintContext.h" +#include "nsIWidget.h" #include "nsIWebProgress.h" #include "nsIWebProgressListener.h" #include "nsWeakReference.h" #include "nsIDOMEventTarget.h" #include "nsIDOMEventListener.h" #include "nsIDOMWindow.h" +#include "nsIRenderingContext.h" // For Accessibility #include "nsIAccessibilityService.h" diff --git a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp index 5abdf2043a8..ea36a1aff76 100644 --- a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp @@ -46,6 +46,9 @@ #include "nsILookAndFeel.h" #include "nsWidgetsCID.h" #include "nsIComponentManager.h" +#include "nsGUIEvent.h" +#include "nsIRenderingContext.h" + // masks for mEdgeVisibility #define LEFT_VIS 0x0001 #define RIGHT_VIS 0x0002 diff --git a/mozilla/layout/html/forms/public/nsIFormSubmitObserver.h b/mozilla/layout/html/forms/public/nsIFormSubmitObserver.h index 97c735d419d..cda297c4069 100644 --- a/mozilla/layout/html/forms/public/nsIFormSubmitObserver.h +++ b/mozilla/layout/html/forms/public/nsIFormSubmitObserver.h @@ -32,10 +32,10 @@ #include "nsISupports.h" #include "prtypes.h" -#include "nsIDOMWindowInternal.h" -#include "nsIURI.h" -class nsString; +class nsIContent; +class nsIDOMWindowInternal; +class nsIURI; // {a6cf9106-15b3-11d2-932e-00805f8add32} #define NS_IFORMSUBMITOBSERVER_IID \ diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp index 2b8ee507001..16553c0db64 100644 --- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp @@ -66,6 +66,7 @@ #include "nsIAccessibilityService.h" #include "nsIServiceManager.h" #include "nsIDOMNode.h" +#include "nsGUIEvent.h" static NS_DEFINE_CID(kTextNodeCID, NS_TEXTNODE_CID); static NS_DEFINE_CID(kHTMLElementFactoryCID, NS_HTML_ELEMENT_FACTORY_CID); diff --git a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp index 619cda897f3..144befdee2f 100644 --- a/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp +++ b/mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp @@ -83,6 +83,7 @@ #include "nsIStyleSheet.h"//observe documents to send onchangenotifications #include "nsIStyleRule.h"//observe documents to send onchangenotifications #include "nsIDOMEventListener.h"//observe documents to send onchangenotifications +#include "nsGUIEvent.h" #include "nsIDOMFocusListener.h" //onchange events #include "nsIDOMCharacterData.h" //for selection setting helper func diff --git a/mozilla/layout/html/forms/src/nsImageControlFrame.cpp b/mozilla/layout/html/forms/src/nsImageControlFrame.cpp index 78390ebcc49..bcde79dc3a7 100644 --- a/mozilla/layout/html/forms/src/nsImageControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsImageControlFrame.cpp @@ -44,6 +44,7 @@ #include "nsStyleConsts.h" #include "nsFormFrame.h" #include "nsFormControlFrame.h" +#include "nsGUIEvent.h" #include "nsIAccessibilityService.h" //Enumeration of possible mouse states used to detect mouse clicks diff --git a/mozilla/layout/html/forms/src/nsListControlFrame.cpp b/mozilla/layout/html/forms/src/nsListControlFrame.cpp index 20d994ed526..e97ef1aae53 100644 --- a/mozilla/layout/html/forms/src/nsListControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsListControlFrame.cpp @@ -58,6 +58,7 @@ #include "nsVoidArray.h" #include "nsIScrollableFrame.h" #include "nsIDOMEventTarget.h" +#include "nsGUIEvent.h" #include "nsIAccessibilityService.h" #include "nsISelectElement.h" #include "nsIPrivateDOMEvent.h" diff --git a/mozilla/layout/style/nsCSSScanner.cpp b/mozilla/layout/style/nsCSSScanner.cpp index 1eb0ec19c3c..e19c713f493 100644 --- a/mozilla/layout/style/nsCSSScanner.cpp +++ b/mozilla/layout/style/nsCSSScanner.cpp @@ -34,11 +34,11 @@ static char* kNullPointer = "null pointer"; // for #ifdef CSS_REPORT_PARSE_ERRORS #include "nsCOMPtr.h" #include "nsIServiceManager.h" +#include "nsIComponentManager.h" #include "nsReadableUtils.h" #include "nsIURI.h" #include "nsIConsoleService.h" #include "nsIScriptError.h" -#include "nsComponentManagerUtils.h" // put this higher and gcc barfs... // Don't bother collecting whitespace characters in token's mIdent buffer #undef COLLECT_WHITESPACE diff --git a/mozilla/layout/svg/base/src/nsPolygonFrame.cpp b/mozilla/layout/svg/base/src/nsPolygonFrame.cpp index acc2f83b17a..6253a3842dd 100644 --- a/mozilla/layout/svg/base/src/nsPolygonFrame.cpp +++ b/mozilla/layout/svg/base/src/nsPolygonFrame.cpp @@ -37,6 +37,7 @@ #include "nsPoint.h" #include "nsSVGAtoms.h" #include "nsIDeviceContext.h" +#include "nsGUIEvent.h" #include "nsIReflowCommand.h" extern nsresult diff --git a/mozilla/layout/svg/base/src/nsSVGPathFrame.cpp b/mozilla/layout/svg/base/src/nsSVGPathFrame.cpp index 93a67e9a8e7..4def2633a54 100644 --- a/mozilla/layout/svg/base/src/nsSVGPathFrame.cpp +++ b/mozilla/layout/svg/base/src/nsSVGPathFrame.cpp @@ -37,7 +37,9 @@ #include "nsPoint.h" #include "nsSVGAtoms.h" #include "nsIDeviceContext.h" +#include "nsGUIEvent.h" //#include "nsSVGPathCID.h" + // // NS_NewSVGPathFrame // diff --git a/mozilla/layout/xul/base/public/nsIMenuFrame.h b/mozilla/layout/xul/base/public/nsIMenuFrame.h index e315122cd22..57f66149f12 100644 --- a/mozilla/layout/xul/base/public/nsIMenuFrame.h +++ b/mozilla/layout/xul/base/public/nsIMenuFrame.h @@ -28,6 +28,7 @@ { 0x6a4cde51, 0x6c05, 0x11d3, { 0xbb, 0x50, 0x0, 0x10, 0x4b, 0x7b, 0x7d, 0xeb } } class nsIMenuParent; +class nsIDOMElement; enum nsMenuType { eMenuType_Normal = 0, diff --git a/mozilla/layout/xul/base/public/nsITreeFrame.h b/mozilla/layout/xul/base/public/nsITreeFrame.h index a41f09c21cd..649308be758 100644 --- a/mozilla/layout/xul/base/public/nsITreeFrame.h +++ b/mozilla/layout/xul/base/public/nsITreeFrame.h @@ -24,6 +24,7 @@ #define nsITreeFrame_h__ #include "nsISupports.h" +class nsIDOMElement; #define BLAH_IID_STR "06b8921c-1dd2-11b2-96f2-d5925c3d48ca" diff --git a/mozilla/layout/xul/base/src/nsBox.cpp b/mozilla/layout/xul/base/src/nsBox.cpp index 79e68c84f09..181b4c8bd16 100644 --- a/mozilla/layout/xul/base/src/nsBox.cpp +++ b/mozilla/layout/xul/base/src/nsBox.cpp @@ -40,6 +40,7 @@ #include "nsIDOMNode.h" #include "nsIDOMNamedNodeMap.h" #include "nsIDOMAttr.h" +#include "nsIWidget.h" //#define DEBUG_LAYOUT diff --git a/mozilla/layout/xul/base/src/nsBoxFrame.cpp b/mozilla/layout/xul/base/src/nsBoxFrame.cpp index e74b9e6ca02..7ac8c46701f 100644 --- a/mozilla/layout/xul/base/src/nsBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsBoxFrame.cpp @@ -80,6 +80,7 @@ #include "nsViewsCID.h" #include "nsIScrollableView.h" #include "nsHTMLContainerFrame.h" +#include "nsIWidget.h" static NS_DEFINE_IID(kWidgetCID, NS_CHILD_CID); static NS_DEFINE_IID(kCChildCID, NS_CHILD_CID); diff --git a/mozilla/layout/xul/base/src/nsBoxLayoutState.h b/mozilla/layout/xul/base/src/nsBoxLayoutState.h index 928a95e02d9..18e5b06a557 100644 --- a/mozilla/layout/xul/base/src/nsBoxLayoutState.h +++ b/mozilla/layout/xul/base/src/nsBoxLayoutState.h @@ -34,6 +34,7 @@ #include "nsCOMPtr.h" #include "nsIPresContext.h" #include "nsIPresShell.h" +#include "nsHTMLReflowState.h" class nsReflowState; class nsCalculatedBoxInfo; diff --git a/mozilla/layout/xul/base/src/nsBoxObject.cpp b/mozilla/layout/xul/base/src/nsBoxObject.cpp index a02659e9043..f14f0f60e21 100644 --- a/mozilla/layout/xul/base/src/nsBoxObject.cpp +++ b/mozilla/layout/xul/base/src/nsBoxObject.cpp @@ -38,6 +38,7 @@ #include "nsIServiceManager.h" #include "nsIDOMClassInfo.h" #include "nsIView.h" +#include "nsIWidget.h" #include "nsIDOMXULElement.h" // Static IIDs/CIDs. Try to minimize these. diff --git a/mozilla/layout/xul/base/src/nsEditorBoxObject.cpp b/mozilla/layout/xul/base/src/nsEditorBoxObject.cpp index b440bc47f9b..2e8fd65d679 100644 --- a/mozilla/layout/xul/base/src/nsEditorBoxObject.cpp +++ b/mozilla/layout/xul/base/src/nsEditorBoxObject.cpp @@ -27,6 +27,7 @@ #include "nsIPresShell.h" #include "nsIFrame.h" #include "nsIEditorShell.h" +#include "nsIComponentManager.h" class nsEditorBoxObject : public nsIEditorBoxObject, public nsBoxObject { diff --git a/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp b/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp index 465d52485b9..fa01c3592b8 100644 --- a/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuBarFrame.cpp @@ -41,6 +41,7 @@ #include "nsIViewManager.h" #include "nsIFrameManager.h" #include "nsMenuPopupFrame.h" +#include "nsGUIEvent.h" // diff --git a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp index 9e78717e88e..402e57a9820 100644 --- a/mozilla/layout/xul/base/src/nsMenuBarListener.cpp +++ b/mozilla/layout/xul/base/src/nsMenuBarListener.cpp @@ -30,6 +30,7 @@ #include "nsIDOMEventReceiver.h" #include "nsIDOMEventListener.h" #include "nsIDOMNSUIEvent.h" +#include "nsGUIEvent.h" // Drag & Drop, Clipboard #include "nsIServiceManager.h" diff --git a/mozilla/layout/xul/base/src/nsMenuFrame.cpp b/mozilla/layout/xul/base/src/nsMenuFrame.cpp index 0953544133d..4df734d3837 100644 --- a/mozilla/layout/xul/base/src/nsMenuFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuFrame.cpp @@ -67,7 +67,8 @@ #include "nsIScrollableView.h" #include "nsXPIDLString.h" #include "nsIStringBundle.h" - +#include "nsGUIEvent.h" + #define NS_MENU_POPUP_LIST_INDEX 0 #ifdef XP_PC diff --git a/mozilla/layout/xul/base/src/nsMenuListener.cpp b/mozilla/layout/xul/base/src/nsMenuListener.cpp index a33762ce578..ac18401d713 100644 --- a/mozilla/layout/xul/base/src/nsMenuListener.cpp +++ b/mozilla/layout/xul/base/src/nsMenuListener.cpp @@ -30,6 +30,7 @@ #include "nsIDOMEventReceiver.h" #include "nsIDOMEventListener.h" #include "nsIDOMNSUIEvent.h" +#include "nsGUIEvent.h" // Drag & Drop, Clipboard #include "nsIServiceManager.h" diff --git a/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp b/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp index 8521dddae29..f863fe850cb 100644 --- a/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp +++ b/mozilla/layout/xul/base/src/nsMenuPopupFrame.cpp @@ -53,6 +53,7 @@ #include "nsBoxLayoutState.h" #include "nsIScrollableView.h" #include "nsIFrameManager.h" +#include "nsGUIEvent.h" static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); diff --git a/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp b/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp index 5051c6fda38..ffe575a73fd 100644 --- a/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp +++ b/mozilla/layout/xul/base/src/nsPopupSetFrame.cpp @@ -53,6 +53,7 @@ #include "nsBoxLayoutState.h" #include "nsIScrollableFrame.h" #include "nsCSSFrameConstructor.h" +#include "nsGUIEvent.h" #define NS_MENU_POPUP_LIST_INDEX 0 diff --git a/mozilla/layout/xul/base/src/nsResizerFrame.cpp b/mozilla/layout/xul/base/src/nsResizerFrame.cpp index be7aa0c0659..bd68b2d4c35 100644 --- a/mozilla/layout/xul/base/src/nsResizerFrame.cpp +++ b/mozilla/layout/xul/base/src/nsResizerFrame.cpp @@ -41,6 +41,7 @@ #include "nsIScriptGlobalObject.h" #include "nsIViewManager.h" #include "nsXULAtoms.h" +#include "nsGUIEvent.h" // // NS_NewXULButtonFrame diff --git a/mozilla/layout/xul/base/src/nsScrollbarButtonFrame.cpp b/mozilla/layout/xul/base/src/nsScrollbarButtonFrame.cpp index 5f6b2ad55fa..fee2351b2dc 100644 --- a/mozilla/layout/xul/base/src/nsScrollbarButtonFrame.cpp +++ b/mozilla/layout/xul/base/src/nsScrollbarButtonFrame.cpp @@ -42,6 +42,7 @@ #include "nsIScrollbarFrame.h" #include "nsIScrollbarMediator.h" #include "nsRepeatService.h" +#include "nsGUIEvent.h" // // NS_NewToolbarFrame diff --git a/mozilla/layout/xul/base/src/nsSliderFrame.cpp b/mozilla/layout/xul/base/src/nsSliderFrame.cpp index 1b70dc313a2..a613adc4faa 100644 --- a/mozilla/layout/xul/base/src/nsSliderFrame.cpp +++ b/mozilla/layout/xul/base/src/nsSliderFrame.cpp @@ -67,6 +67,7 @@ #include "nsSprocketLayout.h" #include "nsIPref.h" #include "nsIServiceManager.h" +#include "nsGUIEvent.h" #define DEBUG_SLIDER PR_FALSE diff --git a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp index 0dfa226fcfa..f5539702173 100644 --- a/mozilla/layout/xul/base/src/nsSplitterFrame.cpp +++ b/mozilla/layout/xul/base/src/nsSplitterFrame.cpp @@ -59,6 +59,7 @@ #include "nsHTMLContainerFrame.h" #include "nsINodeInfo.h" #include "nsIAnonymousContent.h" +#include "nsGUIEvent.h" #include "nsContentCID.h" static NS_DEFINE_IID(kAnonymousElementCID, NS_ANONYMOUSCONTENT_CID); diff --git a/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp b/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp index 1e87f2c31ad..c7bb85993d8 100644 --- a/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsTextBoxFrame.cpp @@ -44,6 +44,7 @@ #include "nsMenuBarListener.h" #include "nsIPref.h" #include "nsXPIDLString.h" +#include "nsIServiceManager.h" #ifdef IBMBIDI #include "nsIUBidiUtils.h" diff --git a/mozilla/layout/xul/base/src/nsTitleBarFrame.cpp b/mozilla/layout/xul/base/src/nsTitleBarFrame.cpp index b5c504d1a9c..15dd3b23770 100644 --- a/mozilla/layout/xul/base/src/nsTitleBarFrame.cpp +++ b/mozilla/layout/xul/base/src/nsTitleBarFrame.cpp @@ -37,6 +37,7 @@ #include "nsIDOMWindowInternal.h" #include "nsIScriptGlobalObject.h" #include "nsIViewManager.h" +#include "nsGUIEvent.h" // // NS_NewTitleBarFrame diff --git a/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.h b/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.h index 1a67e6c51fb..6c0529e1535 100644 --- a/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.h +++ b/mozilla/layout/xul/base/src/outliner/src/nsOutlinerBodyFrame.h @@ -30,6 +30,7 @@ #include "nsIRenderingContext.h" #include "nsIDragSession.h" #include "nsIWidget.h" +#include "nsHashtable.h" #ifdef USE_IMG2 #include "imgIDecoderObserver.h" diff --git a/mozilla/layout/xul/base/src/outliner/src/nsOutlinerSelection.cpp b/mozilla/layout/xul/base/src/outliner/src/nsOutlinerSelection.cpp index 0d6a59d6e74..6af7c8d10a1 100644 --- a/mozilla/layout/xul/base/src/outliner/src/nsOutlinerSelection.cpp +++ b/mozilla/layout/xul/base/src/outliner/src/nsOutlinerSelection.cpp @@ -32,6 +32,7 @@ #include "nsIPresContext.h" #include "nsIContent.h" #include "nsIDocument.h" +#include "nsGUIEvent.h" // A helper class for managing our ranges of selection. struct nsOutlinerRange diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.h b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.h index 1a67e6c51fb..6c0529e1535 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.h +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeBodyFrame.h @@ -30,6 +30,7 @@ #include "nsIRenderingContext.h" #include "nsIDragSession.h" #include "nsIWidget.h" +#include "nsHashtable.h" #ifdef USE_IMG2 #include "imgIDecoderObserver.h" diff --git a/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp b/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp index 0d6a59d6e74..6af7c8d10a1 100644 --- a/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp +++ b/mozilla/layout/xul/base/src/tree/src/nsTreeSelection.cpp @@ -32,6 +32,7 @@ #include "nsIPresContext.h" #include "nsIContent.h" #include "nsIDocument.h" +#include "nsGUIEvent.h" // A helper class for managing our ranges of selection. struct nsOutlinerRange diff --git a/mozilla/mailnews/absync/public/nsIAbSyncListener.idl b/mozilla/mailnews/absync/public/nsIAbSyncListener.idl index 3f0c356bf51..f37c3af7a37 100644 --- a/mozilla/mailnews/absync/public/nsIAbSyncListener.idl +++ b/mozilla/mailnews/absync/public/nsIAbSyncListener.idl @@ -22,7 +22,6 @@ #include "nsISupports.idl" #include "nsrootidl.idl" -#include "nsIFileSpec.idl" %{C++ %} diff --git a/mozilla/mailnews/absync/public/nsIAbSyncPostListener.idl b/mozilla/mailnews/absync/public/nsIAbSyncPostListener.idl index fe19155a92d..e27818acb38 100644 --- a/mozilla/mailnews/absync/public/nsIAbSyncPostListener.idl +++ b/mozilla/mailnews/absync/public/nsIAbSyncPostListener.idl @@ -22,7 +22,6 @@ #include "nsISupports.idl" #include "nsrootidl.idl" -#include "nsIFileSpec.idl" %{C++ %} diff --git a/mozilla/mailnews/absync/src/nsABSyncDriver.cpp b/mozilla/mailnews/absync/src/nsABSyncDriver.cpp index f881495e7af..a2625f4627d 100644 --- a/mozilla/mailnews/absync/src/nsABSyncDriver.cpp +++ b/mozilla/mailnews/absync/src/nsABSyncDriver.cpp @@ -26,6 +26,7 @@ #include "nsTextFormatter.h" #include "nsIStringBundle.h" #include "prmem.h" +#include "nsString.h" NS_IMPL_THREADSAFE_ISUPPORTS1(nsAbSyncDriver, nsIAbSyncDriver) //NS_IMPL_ISUPPORTS1(nsAbSyncDriver, nsIAbSyncDriver) diff --git a/mozilla/mailnews/absync/src/nsABSyncDriver.h b/mozilla/mailnews/absync/src/nsABSyncDriver.h index 1e62dee11fe..59fd26921ba 100644 --- a/mozilla/mailnews/absync/src/nsABSyncDriver.h +++ b/mozilla/mailnews/absync/src/nsABSyncDriver.h @@ -26,6 +26,7 @@ #include "nsIAbSyncDriver.h" #include "nsIMsgStatusFeedback.h" #include "nsIStringBundle.h" +#include "nsCOMPtr.h" class nsAbSyncDriver : public nsIAbSyncDriver { diff --git a/mozilla/mailnews/absync/src/nsAbSync.h b/mozilla/mailnews/absync/src/nsAbSync.h index 9a82f8cb078..8d1ad78c7cc 100644 --- a/mozilla/mailnews/absync/src/nsAbSync.h +++ b/mozilla/mailnews/absync/src/nsAbSync.h @@ -34,6 +34,7 @@ #include "nsVoidArray.h" #include "nsIStringBundle.h" #include "nsIDocShell.h" +#include "nsIFileSpec.h" // // Basic Sync Logic diff --git a/mozilla/mailnews/absync/src/nsAbSyncPostEngine.cpp b/mozilla/mailnews/absync/src/nsAbSyncPostEngine.cpp index 48a89fe056f..ddc6ee250f4 100644 --- a/mozilla/mailnews/absync/src/nsAbSyncPostEngine.cpp +++ b/mozilla/mailnews/absync/src/nsAbSyncPostEngine.cpp @@ -25,6 +25,8 @@ #include "nsCOMPtr.h" #include #include "nscore.h" +#include "prprf.h" +#include "nsEscape.h" #include "nsIFactory.h" #include "nsISupports.h" #include "comi18n.h" diff --git a/mozilla/mailnews/addrbook/src/nsAbAddressCollecter.cpp b/mozilla/mailnews/addrbook/src/nsAbAddressCollecter.cpp index 73f2fa991d2..49eff75e165 100644 --- a/mozilla/mailnews/addrbook/src/nsAbAddressCollecter.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbAddressCollecter.cpp @@ -34,6 +34,7 @@ #include "nsIRDFService.h" #include "nsRDFCID.h" #include "nsXPIDLString.h" +#include "prmem.h" // For the new pref API's static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); diff --git a/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp b/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp index 87006336005..df7c2ab2e52 100644 --- a/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbAutoCompleteSession.cpp @@ -33,6 +33,7 @@ #include "nsMsgI18N.h" #include "nsIMsgIdentity.h" #include "nsIPref.h" +#include "prmem.h" static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); diff --git a/mozilla/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp b/mozilla/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp index cf2f791cf7c..e274a251eca 100644 --- a/mozilla/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp +++ b/mozilla/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp @@ -42,6 +42,7 @@ #include "nsIRDFResource.h" #include "nsIRDFService.h" #include "nsRDFCID.h" +#include "prmem.h" extern const char *kWorkAddressBook; diff --git a/mozilla/mailnews/base/build/nsMsgFactory.cpp b/mozilla/mailnews/base/build/nsMsgFactory.cpp index 574b0eb8eee..50fc453bee7 100644 --- a/mozilla/mailnews/base/build/nsMsgFactory.cpp +++ b/mozilla/mailnews/base/build/nsMsgFactory.cpp @@ -39,6 +39,7 @@ #include "nsMsgGroupRecord.h" #include "nsIRegistry.h" +#include "nsIContentViewer.h" /* Include all of the interfaces our factory can generate components for */ diff --git a/mozilla/mailnews/base/public/msgCore.h b/mozilla/mailnews/base/public/msgCore.h index 296b9537d16..bbd82b07fe4 100644 --- a/mozilla/mailnews/base/public/msgCore.h +++ b/mozilla/mailnews/base/public/msgCore.h @@ -27,21 +27,11 @@ #define msgCore_h__ #include "nscore.h" -#include "xp_core.h" -#include "nsCRT.h" -#include "prmem.h" -#include "plstr.h" -#include "prprf.h" +#include "nsCRT.h" #include "nsString.h" #include "nsVoidArray.h" -#include "nsCRT.h" -#include "nsEscape.h" -#include "nsFileSpec.h" - -#include "nsTime.h" - class nsIMsgDBHdr; class nsIMsgFolder; diff --git a/mozilla/mailnews/base/public/nsIMsgCopyService.idl b/mozilla/mailnews/base/public/nsIMsgCopyService.idl index 8e9ce5cea2e..d74d13e794d 100644 --- a/mozilla/mailnews/base/public/nsIMsgCopyService.idl +++ b/mozilla/mailnews/base/public/nsIMsgCopyService.idl @@ -23,7 +23,6 @@ #include "nsrootidl.idl" #include "nsISupports.idl" #include "nsIMsgFolder.idl" -#include "nsIFileSpec.idl" #include "nsIMsgCopyServiceListener.idl" #include "nsISupportsArray.idl" @@ -34,6 +33,7 @@ interface nsIMsgDBHdr; interface nsITransactionManager; interface nsIMsgWindow; +interface nsIFileSpec; [scriptable, uuid(bce41600-28df-11d3-abf7-00805f8ac968)] interface nsIMsgCopyService : nsISupports { diff --git a/mozilla/mailnews/base/public/nsIMsgCopyServiceListener.idl b/mozilla/mailnews/base/public/nsIMsgCopyServiceListener.idl index 492bef8364d..8b5f96ab5bd 100644 --- a/mozilla/mailnews/base/public/nsIMsgCopyServiceListener.idl +++ b/mozilla/mailnews/base/public/nsIMsgCopyServiceListener.idl @@ -23,6 +23,10 @@ #include "nsrootidl.idl" #include "nsISupports.idl" +%{C++ +#include "nsString.h" +%} + [ptr] native nsCString(nsCString); /* [ptr] native nsString(nsString); */ diff --git a/mozilla/mailnews/base/public/nsIMsgFolder.idl b/mozilla/mailnews/base/public/nsIMsgFolder.idl index a85099fd43f..f943586353e 100644 --- a/mozilla/mailnews/base/public/nsIMsgFolder.idl +++ b/mozilla/mailnews/base/public/nsIMsgFolder.idl @@ -24,7 +24,6 @@ #include "nsIFolder.idl" #include "nsIMsgThread.idl" #include "nsIMsgIncomingServer.idl" -#include "nsIFileSpec.idl" #include "nsISupportsArray.idl" #include "nsIMsgCopyServiceListener.idl" #include "nsIUrlListener.idl" @@ -45,6 +44,9 @@ interface nsIMsgFilterList; interface nsIMsgFolderCacheElement; interface nsAutoString; interface nsITransport; +interface nsIFileSpec; +interface nsIOutputStream; +interface nsIInputStream; typedef long nsMsgBiffState; // enumerated type for determining if a message has been replied to, forwarded, etc. diff --git a/mozilla/mailnews/base/public/nsIMsgIncomingServer.idl b/mozilla/mailnews/base/public/nsIMsgIncomingServer.idl index 3401daab851..ae706982d80 100644 --- a/mozilla/mailnews/base/public/nsIMsgIncomingServer.idl +++ b/mozilla/mailnews/base/public/nsIMsgIncomingServer.idl @@ -21,9 +21,9 @@ */ #include "nsISupports.idl" -#include "nsIFileSpec.idl" #include "MailNewsTypes2.idl" +interface nsIFileSpec; interface nsIFolder; interface nsIMsgFolderCache; interface nsIMsgWindow; diff --git a/mozilla/mailnews/base/public/nsIMsgProtocolInfo.idl b/mozilla/mailnews/base/public/nsIMsgProtocolInfo.idl index d1b2f9637ca..60ed8c628aa 100644 --- a/mozilla/mailnews/base/public/nsIMsgProtocolInfo.idl +++ b/mozilla/mailnews/base/public/nsIMsgProtocolInfo.idl @@ -21,7 +21,8 @@ */ #include "nsISupports.idl" -#include "nsIFileSpec.idl" + +interface nsIFileSpec; %{C++ #define NS_MSGPROTOCOLINFO_CONTRACTID_PREFIX \ diff --git a/mozilla/mailnews/base/search/public/nsIMsgSearchScopeTerm.idl b/mozilla/mailnews/base/search/public/nsIMsgSearchScopeTerm.idl index 2275f562203..39f13f3d828 100644 --- a/mozilla/mailnews/base/search/public/nsIMsgSearchScopeTerm.idl +++ b/mozilla/mailnews/base/search/public/nsIMsgSearchScopeTerm.idl @@ -21,10 +21,9 @@ * Alec Flett */ -#include "nsIFileSpec.idl" -#include "nsIInputStream.idl" #include "nsIMsgSearchSession.idl" +interface nsIFileSpec; interface nsIMsgFolder; [scriptable, uuid(10f5c44f-5a11-44e0-9b6b-4db81ba97963)] diff --git a/mozilla/mailnews/base/search/public/nsMsgBodyHandler.h b/mozilla/mailnews/base/search/public/nsMsgBodyHandler.h index 15c145adc04..3ffe36c8b9e 100644 --- a/mozilla/mailnews/base/search/public/nsMsgBodyHandler.h +++ b/mozilla/mailnews/base/search/public/nsMsgBodyHandler.h @@ -3,6 +3,7 @@ #define __nsMsgBodyHandler_h #include "nsIMsgSearchScopeTerm.h" +#include "nsIFileSpec.h" //--------------------------------------------------------------------------- // MSG_BodyHandler: used to retrive lines from POP and IMAP offline messages. diff --git a/mozilla/mailnews/base/search/src/nsMsgBodyHandler.cpp b/mozilla/mailnews/base/search/src/nsMsgBodyHandler.cpp index c7ebd84e689..caaa4e1b44c 100644 --- a/mozilla/mailnews/base/search/src/nsMsgBodyHandler.cpp +++ b/mozilla/mailnews/base/search/src/nsMsgBodyHandler.cpp @@ -27,6 +27,7 @@ #include "nsMsgSearchTerm.h" #include "nsFileStream.h" #include "nsIFileStream.h" +#include "nsIFileSpec.h" nsMsgBodyHandler::nsMsgBodyHandler (nsIMsgSearchScopeTerm * scope, PRUint32 offset, PRUint32 numLines, nsIMsgDBHdr* msg, nsIMsgDatabase * db) { diff --git a/mozilla/mailnews/base/search/src/nsMsgFilter.cpp b/mozilla/mailnews/base/search/src/nsMsgFilter.cpp index d366bf73e69..770cc68b6b7 100644 --- a/mozilla/mailnews/base/search/src/nsMsgFilter.cpp +++ b/mozilla/mailnews/base/search/src/nsMsgFilter.cpp @@ -37,6 +37,7 @@ #include "nsIMsgAccountManager.h" #include "nsMsgSearchValue.h" #include "nsReadableUtils.h" +#include "nsEscape.h" static const char *kImapPrefix = "//imap:"; diff --git a/mozilla/mailnews/base/search/src/nsMsgFilterList.h b/mozilla/mailnews/base/search/src/nsMsgFilterList.h index 6125883582d..24619632f93 100644 --- a/mozilla/mailnews/base/search/src/nsMsgFilterList.h +++ b/mozilla/mailnews/base/search/src/nsMsgFilterList.h @@ -28,6 +28,7 @@ #include "nsIMsgFilterList.h" #include "nsCOMPtr.h" #include "nsISupportsArray.h" +#include "nsIFileSpec.h" const PRInt16 kFileVersion = 8; const PRInt16 k60Beta1Version = 7; diff --git a/mozilla/mailnews/base/search/src/nsMsgLocalSearch.cpp b/mozilla/mailnews/base/search/src/nsMsgLocalSearch.cpp index 38c01a17f70..b4f5e435aff 100644 --- a/mozilla/mailnews/base/search/src/nsMsgLocalSearch.cpp +++ b/mozilla/mailnews/base/search/src/nsMsgLocalSearch.cpp @@ -37,6 +37,7 @@ #include "nsMsgSearchValue.h" #include "nsIMsgLocalMailFolder.h" #include "nsIMsgWindow.h" +#include "nsIFileSpec.h" static NS_DEFINE_CID(kValidityManagerCID, NS_MSGSEARCHVALIDITYMANAGER_CID); diff --git a/mozilla/mailnews/base/search/src/nsMsgSearchAdapter.cpp b/mozilla/mailnews/base/search/src/nsMsgSearchAdapter.cpp index 3400770f0d1..862f6a02188 100644 --- a/mozilla/mailnews/base/search/src/nsMsgSearchAdapter.cpp +++ b/mozilla/mailnews/base/search/src/nsMsgSearchAdapter.cpp @@ -32,6 +32,8 @@ #include "nsMsgSearchBoolExpression.h" #include "nsIIOService.h" #include "nsNetCID.h" +#include "prprf.h" + // This stuff lives in the base class because the IMAP search syntax // is used by the Dredd SEARCH command as well as IMAP itself diff --git a/mozilla/mailnews/base/search/src/nsMsgSearchNews.cpp b/mozilla/mailnews/base/search/src/nsMsgSearchNews.cpp index 79230c49786..2fe229c5909 100644 --- a/mozilla/mailnews/base/search/src/nsMsgSearchNews.cpp +++ b/mozilla/mailnews/base/search/src/nsMsgSearchNews.cpp @@ -28,6 +28,7 @@ #include "nsIMsgHdr.h" #include "nsMsgSearchNews.h" #include "nsIDBFolderInfo.h" +#include "prprf.h" // Implementation of search for IMAP mail folders diff --git a/mozilla/mailnews/base/search/src/nsMsgSearchTerm.cpp b/mozilla/mailnews/base/search/src/nsMsgSearchTerm.cpp index af56b76b033..ad5112c1aff 100644 --- a/mozilla/mailnews/base/search/src/nsMsgSearchTerm.cpp +++ b/mozilla/mailnews/base/search/src/nsMsgSearchTerm.cpp @@ -39,6 +39,7 @@ #include "nsMsgI18N.h" #include "nsIMimeConverter.h" #include "nsMsgMimeCID.h" +#include "nsTime.h" //--------------------------------------------------------------------------- // nsMsgSearchTerm specifies one criterion, e.g. name contains phil diff --git a/mozilla/mailnews/base/src/nsMessenger.cpp b/mozilla/mailnews/base/src/nsMessenger.cpp index d330a3e3747..e289a3aa6d7 100644 --- a/mozilla/mailnews/base/src/nsMessenger.cpp +++ b/mozilla/mailnews/base/src/nsMessenger.cpp @@ -32,6 +32,7 @@ #include "nsEscape.h" #include "nsXPIDLString.h" #include "nsTextFormatter.h" +#include "nsIFileSpec.h" #ifdef XP_MAC #include "nsIAppleFileDecoder.h" #endif diff --git a/mozilla/mailnews/base/src/nsMsgCopyService.cpp b/mozilla/mailnews/base/src/nsMsgCopyService.cpp index 187980d77b0..efb907c65a3 100644 --- a/mozilla/mailnews/base/src/nsMsgCopyService.cpp +++ b/mozilla/mailnews/base/src/nsMsgCopyService.cpp @@ -25,6 +25,7 @@ #include "nsVoidArray.h" #include "nsMsgKeyArray.h" #include "nspr.h" +#include "nsIFileSpec.h" // ******************** nsCopySource ****************** // diff --git a/mozilla/mailnews/base/src/nsMsgFolderCache.cpp b/mozilla/mailnews/base/src/nsMsgFolderCache.cpp index 9d080c7d799..50b19c06a3b 100644 --- a/mozilla/mailnews/base/src/nsMsgFolderCache.cpp +++ b/mozilla/mailnews/base/src/nsMsgFolderCache.cpp @@ -28,6 +28,7 @@ #include "nsMorkCID.h" #include "nsIMdbFactoryFactory.h" #include "nsFileStream.h" +#include "nsIFileSpec.h" #include "nsXPIDLString.h" #include "nsMsgBaseCID.h" diff --git a/mozilla/mailnews/base/src/nsMsgFolderCache.h b/mozilla/mailnews/base/src/nsMsgFolderCache.h index f180fc7dea1..ab2e2a13bce 100644 --- a/mozilla/mailnews/base/src/nsMsgFolderCache.h +++ b/mozilla/mailnews/base/src/nsMsgFolderCache.h @@ -29,6 +29,7 @@ #include "nsCOMPtr.h" #include "mdb.h" #include "nsHashtable.h" +#include "nsFileSpec.h" class nsMsgFolderCache : public nsIMsgFolderCache { diff --git a/mozilla/mailnews/base/src/nsMsgFolderCacheElement.cpp b/mozilla/mailnews/base/src/nsMsgFolderCacheElement.cpp index a19ed0dac76..6fa742a2ef9 100644 --- a/mozilla/mailnews/base/src/nsMsgFolderCacheElement.cpp +++ b/mozilla/mailnews/base/src/nsMsgFolderCacheElement.cpp @@ -22,6 +22,7 @@ #include "msgCore.h" #include "nsMsgFolderCacheElement.h" +#include "prmem.h" nsMsgFolderCacheElement::nsMsgFolderCacheElement() { diff --git a/mozilla/mailnews/base/src/nsMsgNotificationManager.cpp b/mozilla/mailnews/base/src/nsMsgNotificationManager.cpp index 4fee4cb745e..cab7cf33aa3 100644 --- a/mozilla/mailnews/base/src/nsMsgNotificationManager.cpp +++ b/mozilla/mailnews/base/src/nsMsgNotificationManager.cpp @@ -31,6 +31,7 @@ #include "nsIMsgFolder.h" // TO include biffState enum. Change to bool later... #include "nsMemory.h" #include "nsXPIDLString.h" +#include "prprf.h" static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID); diff --git a/mozilla/mailnews/base/src/nsMsgStatusFeedback.cpp b/mozilla/mailnews/base/src/nsMsgStatusFeedback.cpp index bbdae6f8952..1ed6413d56d 100644 --- a/mozilla/mailnews/base/src/nsMsgStatusFeedback.cpp +++ b/mozilla/mailnews/base/src/nsMsgStatusFeedback.cpp @@ -37,6 +37,7 @@ #include "nsIDocShell.h" #include "nsIDocShellTreeItem.h" #include "nsIChannel.h" +#include "prinrval.h" #define MSGFEEDBACK_TIMER_INTERVAL 500 diff --git a/mozilla/mailnews/base/src/nsSubscribableServer.cpp b/mozilla/mailnews/base/src/nsSubscribableServer.cpp index f167a213969..78a1d3b3856 100644 --- a/mozilla/mailnews/base/src/nsSubscribableServer.cpp +++ b/mozilla/mailnews/base/src/nsSubscribableServer.cpp @@ -36,6 +36,7 @@ #include "nsIRDFDataSource.h" #include "nsIRDFResource.h" #include "nsIRDFLiteral.h" +#include "nsIServiceManager.h" #include "nsMsgUtf7Utils.h" #include "nsMsgUtils.h" diff --git a/mozilla/mailnews/base/src/nsSubscribableServer.h b/mozilla/mailnews/base/src/nsSubscribableServer.h index 3db020a5d47..7903857538c 100644 --- a/mozilla/mailnews/base/src/nsSubscribableServer.h +++ b/mozilla/mailnews/base/src/nsSubscribableServer.h @@ -30,6 +30,7 @@ #include "nsIRDFService.h" #include "nsSubscribeDataSource.h" #include "nsIRDFResource.h" +#include "nsString.h" typedef struct _subscribeTreeNode { char *name; diff --git a/mozilla/mailnews/base/util/nsMsgDBFolder.cpp b/mozilla/mailnews/base/util/nsMsgDBFolder.cpp index 8b60a09a664..baea7b92d05 100644 --- a/mozilla/mailnews/base/util/nsMsgDBFolder.cpp +++ b/mozilla/mailnews/base/util/nsMsgDBFolder.cpp @@ -22,6 +22,7 @@ */ #include "msgCore.h" +#include "xp_core.h" #include "nsMsgDBFolder.h" #include "nsMsgFolderFlags.h" #include "nsIPref.h" diff --git a/mozilla/mailnews/base/util/nsMsgFolder.cpp b/mozilla/mailnews/base/util/nsMsgFolder.cpp index f5eab6857c5..7879c84035f 100644 --- a/mozilla/mailnews/base/util/nsMsgFolder.cpp +++ b/mozilla/mailnews/base/util/nsMsgFolder.cpp @@ -32,6 +32,7 @@ #include "nsAutoLock.h" #include "nsMemory.h" #include "nsIStringBundle.h" +#include "nsEscape.h" #include "nsMsgFolder.h" #include "nsMsgFolderFlags.h" diff --git a/mozilla/mailnews/base/util/nsMsgFolder.h b/mozilla/mailnews/base/util/nsMsgFolder.h index 7b171757542..10c7700ee01 100644 --- a/mozilla/mailnews/base/util/nsMsgFolder.h +++ b/mozilla/mailnews/base/util/nsMsgFolder.h @@ -40,6 +40,7 @@ #include "nsWeakReference.h" #include "nsIMsgFilterList.h" #include "nsIUrlListener.h" +#include "nsIFileSpec.h" /* * MsgFolder diff --git a/mozilla/mailnews/base/util/nsMsgGroupRecord.cpp b/mozilla/mailnews/base/util/nsMsgGroupRecord.cpp index d5bfd26a3e8..8719e6653fb 100644 --- a/mozilla/mailnews/base/util/nsMsgGroupRecord.cpp +++ b/mozilla/mailnews/base/util/nsMsgGroupRecord.cpp @@ -27,6 +27,7 @@ #include "plstr.h" #include "prmem.h" +#include "prprf.h" #include "nsEscape.h" #include "nsCRT.h" diff --git a/mozilla/mailnews/base/util/nsMsgI18N.cpp b/mozilla/mailnews/base/util/nsMsgI18N.cpp index cb2f56f867f..80184be1335 100644 --- a/mozilla/mailnews/base/util/nsMsgI18N.cpp +++ b/mozilla/mailnews/base/util/nsMsgI18N.cpp @@ -44,6 +44,8 @@ #include "nsHankakuToZenkakuCID.h" #include "nsXPIDLString.h" #include "nsString.h" +#include "prmem.h" +#include "nsFileSpec.h" static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); static NS_DEFINE_CID(kCMimeConverterCID, NS_MIME_CONVERTER_CID); diff --git a/mozilla/mailnews/base/util/nsMsgI18N.h b/mozilla/mailnews/base/util/nsMsgI18N.h index 871d56e59c6..31bb4ced4bc 100644 --- a/mozilla/mailnews/base/util/nsMsgI18N.h +++ b/mozilla/mailnews/base/util/nsMsgI18N.h @@ -25,7 +25,7 @@ #include "nscore.h" #include "msgCore.h" - +class nsFileSpec; #ifndef kMAX_CSNAME #define kMAX_CSNAME 64 diff --git a/mozilla/mailnews/base/util/nsMsgIdentity.cpp b/mozilla/mailnews/base/util/nsMsgIdentity.cpp index 724c67a44fa..5fcd926d228 100644 --- a/mozilla/mailnews/base/util/nsMsgIdentity.cpp +++ b/mozilla/mailnews/base/util/nsMsgIdentity.cpp @@ -32,6 +32,7 @@ #include "nsRDFCID.h" #include "nsMsgFolderFlags.h" #include "nsIMsgFolder.h" +#include "prprf.h" static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); diff --git a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp index dcb63202d6c..874a72c7a83 100644 --- a/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp +++ b/mozilla/mailnews/base/util/nsMsgIncomingServer.cpp @@ -31,6 +31,7 @@ #include "nsIServiceManager.h" #include "nsCOMPtr.h" #include "nsXPIDLString.h" +#include "nsEscape.h" #include "nsMsgBaseCID.h" #include "nsMsgDBCID.h" diff --git a/mozilla/mailnews/base/util/nsMsgIncomingServer.h b/mozilla/mailnews/base/util/nsMsgIncomingServer.h index e0a79f828a3..9e4cd116a87 100644 --- a/mozilla/mailnews/base/util/nsMsgIncomingServer.h +++ b/mozilla/mailnews/base/util/nsMsgIncomingServer.h @@ -31,6 +31,7 @@ #include "nsCOMPtr.h" #include "nsWeakReference.h" #include "nsIMsgDatabase.h" +#include "nsIFileSpec.h" class nsIMsgFolderCache; class nsIMsgProtocolInfo; diff --git a/mozilla/mailnews/base/util/nsMsgKeySet.cpp b/mozilla/mailnews/base/util/nsMsgKeySet.cpp index c7ff39fc064..65bf4d66e5b 100644 --- a/mozilla/mailnews/base/util/nsMsgKeySet.cpp +++ b/mozilla/mailnews/base/util/nsMsgKeySet.cpp @@ -26,6 +26,7 @@ #include "MailNewsTypes.h" #include "nsMsgKeySet.h" #include "prprf.h" +#include "prmem.h" #if defined(DEBUG_seth_) || defined(DEBUG_sspitzer_) #define DEBUG_MSGKEYSET 1 diff --git a/mozilla/mailnews/base/util/nsMsgLineBuffer.cpp b/mozilla/mailnews/base/util/nsMsgLineBuffer.cpp index 7f90bda7179..cab7ddd6863 100644 --- a/mozilla/mailnews/base/util/nsMsgLineBuffer.cpp +++ b/mozilla/mailnews/base/util/nsMsgLineBuffer.cpp @@ -22,6 +22,7 @@ #include "msgCore.h" #include "prlog.h" +#include "prmem.h" #include "nsMsgLineBuffer.h" #include "nsIInputStream.h" // used by nsMsgLineStreamBuffer diff --git a/mozilla/mailnews/base/util/nsMsgProtocol.cpp b/mozilla/mailnews/base/util/nsMsgProtocol.cpp index 9228fe886d2..d1c738770ea 100644 --- a/mozilla/mailnews/base/util/nsMsgProtocol.cpp +++ b/mozilla/mailnews/base/util/nsMsgProtocol.cpp @@ -38,6 +38,7 @@ #include "nsIWebProgressListener.h" #include "nsIPipe.h" #include "nsIPrompt.h" +#include "prprf.h" #include "nsIStringBundle.h" static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID); diff --git a/mozilla/mailnews/base/util/nsMsgUtf7Utils.cpp b/mozilla/mailnews/base/util/nsMsgUtf7Utils.cpp index af470c305ab..6efe0c1e5d6 100644 --- a/mozilla/mailnews/base/util/nsMsgUtf7Utils.cpp +++ b/mozilla/mailnews/base/util/nsMsgUtf7Utils.cpp @@ -24,6 +24,7 @@ #include "nsCOMPtr.h" #include "nsICharsetConverterManager.h" +#include "prmem.h" static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); diff --git a/mozilla/mailnews/base/util/nsMsgUtils.cpp b/mozilla/mailnews/base/util/nsMsgUtils.cpp index 94bb46175d5..29a9f686e7b 100644 --- a/mozilla/mailnews/base/util/nsMsgUtils.cpp +++ b/mozilla/mailnews/base/util/nsMsgUtils.cpp @@ -26,6 +26,7 @@ #include "nsMsgUtils.h" #include "nsString.h" #include "nsFileSpec.h" +#include "nsEscape.h" #include "nsIServiceManager.h" #include "nsCOMPtr.h" #include "nsIImapUrl.h" @@ -36,6 +37,7 @@ #include "nsMsgBaseCID.h" #include "nsMsgImapCID.h" #include "nsMsgI18N.h" +#include "prprf.h" #include "nsNetCID.h" #include "nsIIOService.h" diff --git a/mozilla/mailnews/compose/public/nsIMsgSend.idl b/mozilla/mailnews/compose/public/nsIMsgSend.idl index b7313f08296..919f5ea0b0e 100644 --- a/mozilla/mailnews/compose/public/nsIMsgSend.idl +++ b/mozilla/mailnews/compose/public/nsIMsgSend.idl @@ -31,7 +31,6 @@ #include "nsISupports.idl" #include "nsISupportsArray.idl" #include "nsrootidl.idl" -#include "nsIFileSpec.idl" #include "nsIMsgIdentity.idl" #include "nsIMsgCompFields.idl" #include "nsIMsgSendListener.idl" @@ -43,12 +42,16 @@ %{C++ #include "nsIURL.h" +#include "nsString.h" +class nsFileSpec; +class nsOutputFileStream; %} interface nsIURI; interface nsIMsgDBHdr; interface nsIMsgHdr; interface nsIDocShell; +interface nsIFileSpec; typedef long nsMsgDeliverMode; diff --git a/mozilla/mailnews/compose/public/nsIMsgSendLater.idl b/mozilla/mailnews/compose/public/nsIMsgSendLater.idl index ce9e2fd74be..b8698d98161 100644 --- a/mozilla/mailnews/compose/public/nsIMsgSendLater.idl +++ b/mozilla/mailnews/compose/public/nsIMsgSendLater.idl @@ -23,7 +23,6 @@ #include "nsISupports.idl" #include "nsISupportsArray.idl" #include "nsrootidl.idl" -#include "nsIFileSpec.idl" #include "nsIMsgIdentity.idl" #include "nsIMsgCompFields.idl" #include "nsIMsgSendListener.idl" diff --git a/mozilla/mailnews/compose/public/nsIMsgSendListener.idl b/mozilla/mailnews/compose/public/nsIMsgSendListener.idl index 4e5c732df93..9f1f51ca11e 100644 --- a/mozilla/mailnews/compose/public/nsIMsgSendListener.idl +++ b/mozilla/mailnews/compose/public/nsIMsgSendListener.idl @@ -21,7 +21,8 @@ */ #include "nsISupports.idl" -#include "nsIFileSpec.idl" + +interface nsIFileSpec; [scriptable, uuid(ED3D3227-2803-11D3-82B7-444553540002)] interface nsIMsgSendListener : nsISupports { diff --git a/mozilla/mailnews/compose/public/nsISmtpService.idl b/mozilla/mailnews/compose/public/nsISmtpService.idl index 8c0dffdf746..81ed13bb9ac 100644 --- a/mozilla/mailnews/compose/public/nsISmtpService.idl +++ b/mozilla/mailnews/compose/public/nsISmtpService.idl @@ -21,7 +21,6 @@ */ #include "nsISupports.idl" -#include "nsIFileSpec.idl" interface nsISmtpServer; interface nsIURI; @@ -29,6 +28,7 @@ interface nsIUrlListener; interface nsISupportsArray; interface nsIMsgIdentity; interface nsIInterfaceRequestor; +interface nsIFileSpec; interface nsIMsgStatusFeedback; [scriptable, uuid(FBAF0F10-CA9B-11d2-8063-006008128C4E)] diff --git a/mozilla/mailnews/compose/public/nsISmtpUrl.idl b/mozilla/mailnews/compose/public/nsISmtpUrl.idl index ec645ccdfd3..9ced7ce4e47 100644 --- a/mozilla/mailnews/compose/public/nsISmtpUrl.idl +++ b/mozilla/mailnews/compose/public/nsISmtpUrl.idl @@ -21,7 +21,6 @@ */ #include "nsISupports.idl" -#include "nsIFileSpec.idl" %{ C++ @@ -33,6 +32,7 @@ interface nsIPrompt; interface nsIAuthPrompt; interface nsISmtpServer; interface nsIInterfaceRequestor; +interface nsIFileSpec; [scriptable, uuid(16ADF2F1-BBAD-11d2-804E-006008128C4E)] interface nsISmtpUrl : nsISupports { diff --git a/mozilla/mailnews/compose/src/nsMsgAppleCodes.h b/mozilla/mailnews/compose/src/nsMsgAppleCodes.h index 9869f7fb1ff..5e13746c29f 100644 --- a/mozilla/mailnews/compose/src/nsMsgAppleCodes.h +++ b/mozilla/mailnews/compose/src/nsMsgAppleCodes.h @@ -87,7 +87,7 @@ typedef struct myFInfo /* the mac FInfo structure for the cross platform. */ } myFInfo; -XP_BEGIN_PROTOS +PR_BEGIN_EXTERN_C /* ** string utils. */ @@ -111,7 +111,7 @@ int ap_decode_file_infor(appledouble_decode_object* p_ap_decode_obj); int ap_decode_process_header(appledouble_decode_object* p_ap_decode_obj, PRBool firstime); int ap_decode_process_data( appledouble_decode_object* p_ap_decode_obj, PRBool firstime); -XP_END_PROTOS +PR_END_EXTERN_C #ifdef XP_MAC #if PRAGMA_STRUCT_ALIGN diff --git a/mozilla/mailnews/compose/src/nsMsgAppleDouble.h b/mozilla/mailnews/compose/src/nsMsgAppleDouble.h index bd8433eba81..07afb7a3c04 100644 --- a/mozilla/mailnews/compose/src/nsMsgAppleDouble.h +++ b/mozilla/mailnews/compose/src/nsMsgAppleDouble.h @@ -195,7 +195,7 @@ typedef struct _appledouble_decode_object ** The protypes. */ -XP_BEGIN_PROTOS +PR_BEGIN_EXTERN_C int ap_encode_init(appledouble_encode_object *p_ap_encode_obj, char* fname, @@ -221,6 +221,6 @@ int ap_decode_next(appledouble_decode_object* p_ap_decode_obj, int ap_decode_end(appledouble_decode_object* p_ap_decode_obj, PRBool is_aborting); -XP_END_PROTOS +PR_END_EXTERN_C #endif diff --git a/mozilla/mailnews/compose/src/nsMsgAppleDoubleEncode.cpp b/mozilla/mailnews/compose/src/nsMsgAppleDoubleEncode.cpp index d9bc1a17a33..7bcb3d5799e 100644 --- a/mozilla/mailnews/compose/src/nsMsgAppleDoubleEncode.cpp +++ b/mozilla/mailnews/compose/src/nsMsgAppleDoubleEncode.cpp @@ -39,6 +39,7 @@ #include "nsIMIMEService.h" #include "nsIMIMEInfo.h" #include "nsMimeTypes.h" +#include "prmem.h" #ifdef XP_MAC diff --git a/mozilla/mailnews/compose/src/nsMsgAppleEncode.cpp b/mozilla/mailnews/compose/src/nsMsgAppleEncode.cpp index c4c7cf33274..bc5dab4f05a 100755 --- a/mozilla/mailnews/compose/src/nsMsgAppleEncode.cpp +++ b/mozilla/mailnews/compose/src/nsMsgAppleEncode.cpp @@ -30,6 +30,7 @@ #include "nscore.h" #include "msgCore.h" #include "nsMimeTypes.h" +#include "prprf.h" #include "nsMsgAppleDouble.h" #include "nsMsgAppleCodes.h" @@ -41,14 +42,14 @@ /* ** Local Functions prototypes. */ -PRIVATE int output64chunk( appledouble_encode_object* p_ap_encode_obj, +static int output64chunk( appledouble_encode_object* p_ap_encode_obj, int c1, int c2, int c3, int pads); -PRIVATE int to64(appledouble_encode_object* p_ap_encode_obj, +static int to64(appledouble_encode_object* p_ap_encode_obj, char *p, int in_size); -PRIVATE int finish64(appledouble_encode_object* p_ap_encode_obj); +static int finish64(appledouble_encode_object* p_ap_encode_obj); #define BUFF_LEFT(p) ((p)->s_outbuff - (p)->pos_outbuff) @@ -394,7 +395,7 @@ static char *default_type = APPLICATION_OCTET_STREAM; * Determins the format of the file "inputf". The name * of the file format (or NULL on error) is returned. */ -PRIVATE char *magic_look(char *inbuff, int numread) +static char *magic_look(char *inbuff, int numread) { int i, j; @@ -547,7 +548,7 @@ static char basis_64[] = ** convert the stream in the inbuff to 64 format and put it in the out buff. ** To make the life easier, the caller will responcable of the cheking of the outbuff's bundary. */ -PRIVATE int +static int to64(appledouble_encode_object* p_ap_encode_obj, char *p, int in_size) @@ -648,7 +649,7 @@ to64(appledouble_encode_object* p_ap_encode_obj, /* ** clear the left base64 encodes. */ -PRIVATE int +static int finish64(appledouble_encode_object* p_ap_encode_obj) { int status; @@ -678,7 +679,7 @@ finish64(appledouble_encode_object* p_ap_encode_obj) return status; } -PRIVATE int output64chunk( +static int output64chunk( appledouble_encode_object* p_ap_encode_obj, int c1, int c2, int c3, int pads) { diff --git a/mozilla/mailnews/compose/src/nsMsgCompFields.cpp b/mozilla/mailnews/compose/src/nsMsgCompFields.cpp index 156ff9b6d48..cd554c176af 100644 --- a/mozilla/mailnews/compose/src/nsMsgCompFields.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCompFields.cpp @@ -29,6 +29,7 @@ #include "nsMsgRecipientArray.h" #include "nsIMsgHeaderParser.h" #include "nsMsgCompUtils.h" +#include "prmem.h" #include "nsIFileChannel.h" static NS_DEFINE_CID(kHeaderParserCID, NS_MSGHEADERPARSER_CID); diff --git a/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp b/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp index d8078dbcacc..cf0607a893b 100644 --- a/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp +++ b/mozilla/mailnews/compose/src/nsMsgCompUtils.cpp @@ -24,6 +24,8 @@ #include "nsMsgCompUtils.h" #include "nsIPref.h" #include "prmem.h" +#include "nsEscape.h" +#include "nsIFileSpec.h" #include "nsMsgSend.h" #include "nsIIOService.h" #include "nsIHttpProtocolHandler.h" diff --git a/mozilla/mailnews/compose/src/nsMsgCompose.h b/mozilla/mailnews/compose/src/nsMsgCompose.h index f6ebfaf8341..65bf7cd9c6f 100644 --- a/mozilla/mailnews/compose/src/nsMsgCompose.h +++ b/mozilla/mailnews/compose/src/nsMsgCompose.h @@ -28,6 +28,7 @@ #include "nsWeakReference.h" #include "nsMsgCompFields.h" #include "nsIOutputStream.h" +#include "nsIDocumentStateListener.h" #include "nsIMsgQuote.h" #include "nsIMsgSendListener.h" #include "nsIMsgCopyServiceListener.h" diff --git a/mozilla/mailnews/compose/src/nsMsgSendLater.cpp b/mozilla/mailnews/compose/src/nsMsgSendLater.cpp index b3f85b53dd7..02c3109176a 100644 --- a/mozilla/mailnews/compose/src/nsMsgSendLater.cpp +++ b/mozilla/mailnews/compose/src/nsMsgSendLater.cpp @@ -51,6 +51,7 @@ #include "nsIURI.h" #include "nsISmtpUrl.h" #include "nsIChannel.h" +#include "prlog.h" static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); static NS_DEFINE_CID(kCMsgMailSessionCID, NS_MSGMAILSESSION_CID); diff --git a/mozilla/mailnews/compose/src/nsMsgSendPart.cpp b/mozilla/mailnews/compose/src/nsMsgSendPart.cpp index fb9721977c8..f8959786ffa 100644 --- a/mozilla/mailnews/compose/src/nsMsgSendPart.cpp +++ b/mozilla/mailnews/compose/src/nsMsgSendPart.cpp @@ -33,6 +33,7 @@ #include "nsFileStream.h" #include "nsMsgMimeCID.h" #include "nsMimeTypes.h" +#include "prmem.h" // defined in msgCompGlue.cpp static char *mime_mailto_stream_read_buffer = 0; diff --git a/mozilla/mailnews/compose/src/nsSmtpDataSource.cpp b/mozilla/mailnews/compose/src/nsSmtpDataSource.cpp index b3f980d3181..f9d58fa4ee7 100644 --- a/mozilla/mailnews/compose/src/nsSmtpDataSource.cpp +++ b/mozilla/mailnews/compose/src/nsSmtpDataSource.cpp @@ -24,6 +24,7 @@ #include "nsXPIDLString.h" #include "nsEnumeratorUtils.h" #include "nsRDFCID.h" +#include "nsIServiceManager.h" #include "nsISmtpService.h" #include "nsISmtpServer.h" diff --git a/mozilla/mailnews/compose/src/nsSmtpDataSource.h b/mozilla/mailnews/compose/src/nsSmtpDataSource.h index 464f5ef274a..6291d8ac89f 100644 --- a/mozilla/mailnews/compose/src/nsSmtpDataSource.h +++ b/mozilla/mailnews/compose/src/nsSmtpDataSource.h @@ -26,6 +26,7 @@ #define __nsSmtpDataSource_h #include "nscore.h" +#include "nsCOMPtr.h" #include "nsIRDFDataSource.h" #include "nsIRDFResource.h" #include "nsMsgRDFUtils.h" diff --git a/mozilla/mailnews/compose/src/nsSmtpDelegateFactory.cpp b/mozilla/mailnews/compose/src/nsSmtpDelegateFactory.cpp index c1b22d026b5..6cbc9a71282 100644 --- a/mozilla/mailnews/compose/src/nsSmtpDelegateFactory.cpp +++ b/mozilla/mailnews/compose/src/nsSmtpDelegateFactory.cpp @@ -25,6 +25,7 @@ #include "nsCOMPtr.h" #include "nsXPIDLString.h" +#include "nsIServiceManager.h" #include "nsIURL.h" #include "nsNetCID.h" diff --git a/mozilla/mailnews/compose/src/nsSmtpProtocol.cpp b/mozilla/mailnews/compose/src/nsSmtpProtocol.cpp index 18c5962bc46..6f46d577ba8 100644 --- a/mozilla/mailnews/compose/src/nsSmtpProtocol.cpp +++ b/mozilla/mailnews/compose/src/nsSmtpProtocol.cpp @@ -47,6 +47,7 @@ #include "prlog.h" #include "prerror.h" #include "prprf.h" +#include "prmem.h" #include "plbase64.h" #include "nsEscape.h" #include "nsMsgUtils.h" diff --git a/mozilla/mailnews/compose/src/nsSmtpService.cpp b/mozilla/mailnews/compose/src/nsSmtpService.cpp index 863d1bb760e..58fedb0ec0c 100644 --- a/mozilla/mailnews/compose/src/nsSmtpService.cpp +++ b/mozilla/mailnews/compose/src/nsSmtpService.cpp @@ -26,6 +26,7 @@ #include "nsIPref.h" #include "nsIIOService.h" #include "nsNetCID.h" +#include "nsEscape.h" #include "nsNetUtil.h" #include "nsSmtpService.h" diff --git a/mozilla/mailnews/compose/src/nsSmtpUrl.cpp b/mozilla/mailnews/compose/src/nsSmtpUrl.cpp index b3d95daf92e..3a534e993d4 100644 --- a/mozilla/mailnews/compose/src/nsSmtpUrl.cpp +++ b/mozilla/mailnews/compose/src/nsSmtpUrl.cpp @@ -27,6 +27,7 @@ #include "nsSmtpUrl.h" #include "nsString.h" #include "nsXPIDLString.h" +#include "nsEscape.h" static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); diff --git a/mozilla/mailnews/db/msgdb/public/nsDBFolderInfo.h b/mozilla/mailnews/db/msgdb/public/nsDBFolderInfo.h index 2d2915dbb55..e6ae705aae9 100644 --- a/mozilla/mailnews/db/msgdb/public/nsDBFolderInfo.h +++ b/mozilla/mailnews/db/msgdb/public/nsDBFolderInfo.h @@ -31,6 +31,7 @@ #include "mdb.h" #include "nsMsgKeyArray.h" #include "nsIDBFolderInfo.h" +#include class nsMsgDatabase; diff --git a/mozilla/mailnews/db/msgdb/public/nsIMsgDatabase.idl b/mozilla/mailnews/db/msgdb/public/nsIMsgDatabase.idl index 28fdbd57975..271512f60d8 100644 --- a/mozilla/mailnews/db/msgdb/public/nsIMsgDatabase.idl +++ b/mozilla/mailnews/db/msgdb/public/nsIMsgDatabase.idl @@ -22,7 +22,6 @@ #include "nsISupports.idl" #include "MailNewsTypes2.idl" -#include "nsIFileSpec.idl" #include "nsIDBChangeAnnouncer.idl" #include "nsIMsgDBView.idl" @@ -30,6 +29,7 @@ #include "nsMsgKeyArray.h" %} +interface nsIFileSpec; interface nsIDBChangeListener; interface nsIMsgDBHdr; interface nsISimpleEnumerator; diff --git a/mozilla/mailnews/db/msgdb/src/nsImapMailDatabase.cpp b/mozilla/mailnews/db/msgdb/src/nsImapMailDatabase.cpp index fdd64dca657..9ee5119049d 100644 --- a/mozilla/mailnews/db/msgdb/src/nsImapMailDatabase.cpp +++ b/mozilla/mailnews/db/msgdb/src/nsImapMailDatabase.cpp @@ -25,6 +25,7 @@ #include "nsImapMailDatabase.h" #include "nsDBFolderInfo.h" #include "nsLocalFolderSummarySpec.h" +#include "nsIFileSpec.h" nsImapMailDatabase::nsImapMailDatabase() { diff --git a/mozilla/mailnews/db/msgdb/src/nsMailDatabase.cpp b/mozilla/mailnews/db/msgdb/src/nsMailDatabase.cpp index f8c2936a87c..33c174d47f5 100644 --- a/mozilla/mailnews/db/msgdb/src/nsMailDatabase.cpp +++ b/mozilla/mailnews/db/msgdb/src/nsMailDatabase.cpp @@ -30,6 +30,9 @@ #include "nsFileSpec.h" #include "nsMsgOfflineImapOperation.h" #include "nsMsgFolderFlags.h" +#include "prlog.h" +#include "prprf.h" +#include "nsIFileSpec.h" const char *kOfflineOpsScope = "ns:msg:db:row:scope:ops:all"; // scope for all offine ops table const char *kOfflineOpsTableKind = "ns:msg:db:table:kind:ops"; diff --git a/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp b/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp index 738c60b723d..ab458ea90e9 100644 --- a/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp +++ b/mozilla/mailnews/db/msgdb/src/nsMsgDatabase.cpp @@ -37,6 +37,9 @@ #include "nsMorkCID.h" #include "nsIMdbFactoryFactory.h" #include "xp_file.h" +#include "prprf.h" +#include "nsTime.h" +#include "nsIFileSpec.h" #include "nsILocale.h" #include "nsLocaleCID.h" diff --git a/mozilla/mailnews/db/msgdb/src/nsMsgThread.cpp b/mozilla/mailnews/db/msgdb/src/nsMsgThread.cpp index bce69301027..efa2177f695 100644 --- a/mozilla/mailnews/db/msgdb/src/nsMsgThread.cpp +++ b/mozilla/mailnews/db/msgdb/src/nsMsgThread.cpp @@ -43,7 +43,7 @@ nsMsgThread::nsMsgThread(nsMsgDatabase *db, nsIMdbTable *table) if (table && db) { - table->GetMetaRow(db->GetEnv(), nil, nil, &m_metaRow); + table->GetMetaRow(db->GetEnv(), nsnull, nsnull, &m_metaRow); InitCachedValues(); } } diff --git a/mozilla/mailnews/db/msgdb/src/nsNewsDatabase.cpp b/mozilla/mailnews/db/msgdb/src/nsNewsDatabase.cpp index dab85823219..8dc67c7620e 100644 --- a/mozilla/mailnews/db/msgdb/src/nsNewsDatabase.cpp +++ b/mozilla/mailnews/db/msgdb/src/nsNewsDatabase.cpp @@ -27,6 +27,8 @@ #include "nsNewsSummarySpec.h" #include "nsMsgKeySet.h" #include "nsCOMPtr.h" +#include "prlog.h" +#include "nsIFileSpec.h" #if defined(DEBUG_sspitzer_) || defined(DEBUG_seth_) #define DEBUG_NEWS_DATABASE 1 diff --git a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp index ff57e21b863..4ec3494f3f1 100644 --- a/mozilla/mailnews/imap/src/nsImapMailFolder.cpp +++ b/mozilla/mailnews/imap/src/nsImapMailFolder.cpp @@ -23,6 +23,7 @@ #include "msgCore.h" +#include "xp_core.h" #include "nsMsgImapCID.h" #include "nsImapMailFolder.h" #include "nsIEnumerator.h" diff --git a/mozilla/mailnews/imap/src/nsImapOfflineSync.h b/mozilla/mailnews/imap/src/nsImapOfflineSync.h index 8d9cc889fdf..9be983dd8b0 100644 --- a/mozilla/mailnews/imap/src/nsImapOfflineSync.h +++ b/mozilla/mailnews/imap/src/nsImapOfflineSync.h @@ -29,6 +29,7 @@ #include "nsIMsgOfflineImapOperation.h" #include "nsIMsgWindow.h" #include "nsIMsgFolder.h" +#include "nsIFileSpec.h" class nsImapOfflineSync : public nsIUrlListener, public nsIMsgCopyServiceListener { public: // set to one folder to playback one folder only diff --git a/mozilla/mailnews/imap/src/nsImapUrl.cpp b/mozilla/mailnews/imap/src/nsImapUrl.cpp index 4a4f9de4ac6..efafee2dbb7 100644 --- a/mozilla/mailnews/imap/src/nsImapUrl.cpp +++ b/mozilla/mailnews/imap/src/nsImapUrl.cpp @@ -52,6 +52,7 @@ #include "nsMsgUtils.h" #include "nsIMsgHdr.h" #include "nsIProgressEventSink.h" +#include "nsEscape.h" static NS_DEFINE_CID(kCImapMockChannel, NS_IMAPMOCKCHANNEL_CID); static NS_DEFINE_CID(kMsgMailSessionCID, NS_MSGMAILSESSION_CID); diff --git a/mozilla/mailnews/imap/src/nsImapUrl.h b/mozilla/mailnews/imap/src/nsImapUrl.h index a3fec6153d1..689127b3de4 100644 --- a/mozilla/mailnews/imap/src/nsImapUrl.h +++ b/mozilla/mailnews/imap/src/nsImapUrl.h @@ -36,6 +36,7 @@ #include "nsWeakPtr.h" #include "nsXPIDLString.h" +#include "nsIFileSpec.h" class nsImapUrl : public nsIImapUrl, public nsMsgMailNewsUrl, public nsIMsgMessageUrl, public nsIMsgI18NUrl { diff --git a/mozilla/mailnews/imap/src/nsImapUtils.cpp b/mozilla/mailnews/imap/src/nsImapUtils.cpp index 6639a09b6c0..11373353a58 100644 --- a/mozilla/mailnews/imap/src/nsImapUtils.cpp +++ b/mozilla/mailnews/imap/src/nsImapUtils.cpp @@ -26,6 +26,8 @@ #include "nsCOMPtr.h" #include "nsIServiceManager.h" #include "prsystem.h" +#include "nsEscape.h" +#include "nsIFileSpec.h" // stuff for temporary root folder hack #include "nsIMsgAccountManager.h" diff --git a/mozilla/mailnews/import/outlook/src/MapiMessage.cpp b/mozilla/mailnews/import/outlook/src/MapiMessage.cpp index 540c7478ddb..641e625f664 100644 --- a/mozilla/mailnews/import/outlook/src/MapiMessage.cpp +++ b/mozilla/mailnews/import/outlook/src/MapiMessage.cpp @@ -21,6 +21,7 @@ */ #include "nscore.h" +#include #include "nsString.h" #include "nsFileSpec.h" diff --git a/mozilla/mailnews/import/src/nsImportMail.cpp b/mozilla/mailnews/import/src/nsImportMail.cpp index 378768d68d5..f10b9276ded 100644 --- a/mozilla/mailnews/import/src/nsImportMail.cpp +++ b/mozilla/mailnews/import/src/nsImportMail.cpp @@ -26,6 +26,7 @@ #include "prthread.h" +#include "prprf.h" #include "nscore.h" #include "nsCOMPtr.h" #include "nsISupportsArray.h" diff --git a/mozilla/mailnews/local/public/nsILocalMailIncomingServer.idl b/mozilla/mailnews/local/public/nsILocalMailIncomingServer.idl index 8940a44d1eb..882c8b06cbb 100644 --- a/mozilla/mailnews/local/public/nsILocalMailIncomingServer.idl +++ b/mozilla/mailnews/local/public/nsILocalMailIncomingServer.idl @@ -21,12 +21,12 @@ */ #include "nsISupports.idl" -#include "nsIFileSpec.idl" interface nsIURI; interface nsIMsgWindow; interface nsIUrlListener; interface nsIMsgFolder; +interface nsIFileSpec; [scriptable, uuid(ee87cc60-1dd1-11b2-b25a-ff87320f212d)] interface nsILocalMailIncomingServer : nsISupports { diff --git a/mozilla/mailnews/local/public/nsIMovemailIncomingServer.idl b/mozilla/mailnews/local/public/nsIMovemailIncomingServer.idl index e69f5423121..47e2074e446 100644 --- a/mozilla/mailnews/local/public/nsIMovemailIncomingServer.idl +++ b/mozilla/mailnews/local/public/nsIMovemailIncomingServer.idl @@ -22,7 +22,6 @@ */ #include "nsISupports.idl" -#include "nsIFileSpec.idl" [scriptable, uuid(0dbfa510-1dd2-11b2-9f0e-849c5a241ab6)] interface nsIMovemailIncomingServer : nsISupports { diff --git a/mozilla/mailnews/local/public/nsINoIncomingServer.idl b/mozilla/mailnews/local/public/nsINoIncomingServer.idl index de67ae16b54..7110d0cb422 100644 --- a/mozilla/mailnews/local/public/nsINoIncomingServer.idl +++ b/mozilla/mailnews/local/public/nsINoIncomingServer.idl @@ -21,7 +21,6 @@ */ #include "nsISupports.idl" -#include "nsIFileSpec.idl" interface nsIFileSpec; diff --git a/mozilla/mailnews/local/public/nsIPop3IncomingServer.idl b/mozilla/mailnews/local/public/nsIPop3IncomingServer.idl index 38bc1dbcbea..7080cb912a5 100644 --- a/mozilla/mailnews/local/public/nsIPop3IncomingServer.idl +++ b/mozilla/mailnews/local/public/nsIPop3IncomingServer.idl @@ -21,7 +21,6 @@ */ #include "nsISupports.idl" -#include "nsIFileSpec.idl" [scriptable, uuid(758a8970-e628-11d2-b7fc-00805f05ffa5)] interface nsIPop3IncomingServer : nsISupports { diff --git a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp index 56c827f0b38..b1f5220b619 100644 --- a/mozilla/mailnews/local/src/nsLocalMailFolder.cpp +++ b/mozilla/mailnews/local/src/nsLocalMailFolder.cpp @@ -83,6 +83,7 @@ #include "nsIMsgMailSession.h" #include "nsIMsgFolderCompactor.h" #include "nsNetCID.h" +#include "nsEscape.h" #include "nsLocalStringBundle.h" diff --git a/mozilla/mailnews/local/src/nsLocalUtils.cpp b/mozilla/mailnews/local/src/nsLocalUtils.cpp index a897c6368b2..842f6f39268 100644 --- a/mozilla/mailnews/local/src/nsLocalUtils.cpp +++ b/mozilla/mailnews/local/src/nsLocalUtils.cpp @@ -25,6 +25,8 @@ #include "nsIServiceManager.h" #include "prsystem.h" #include "nsCOMPtr.h" +#include "nsEscape.h" +#include "nsIFileSpec.h" // stuff for temporary root folder hack #include "nsIMsgAccountManager.h" diff --git a/mozilla/mailnews/local/src/nsMailboxService.cpp b/mozilla/mailnews/local/src/nsMailboxService.cpp index e354cce255c..7d4093ab2d2 100644 --- a/mozilla/mailnews/local/src/nsMailboxService.cpp +++ b/mozilla/mailnews/local/src/nsMailboxService.cpp @@ -42,6 +42,7 @@ #include "nsNetUtil.h" #include "nsIDocShellLoadInfo.h" #include "nsIWebNavigation.h" +#include "prprf.h" static NS_DEFINE_CID(kIStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID); diff --git a/mozilla/mailnews/local/src/nsMailboxUrl.cpp b/mozilla/mailnews/local/src/nsMailboxUrl.cpp index f293acf1c17..75411c78a5b 100644 --- a/mozilla/mailnews/local/src/nsMailboxUrl.cpp +++ b/mozilla/mailnews/local/src/nsMailboxUrl.cpp @@ -40,6 +40,7 @@ #include "nsIRDFService.h" #include "rdf.h" #include "nsIMsgFolder.h" +#include "prprf.h" // we need this because of an egcs 1.0 (and possibly gcc) compiler bug // that doesn't allow you to call ::nsISupports::GetIID() inside of a class diff --git a/mozilla/mailnews/local/src/nsMovemailService.cpp b/mozilla/mailnews/local/src/nsMovemailService.cpp index 8a06298cdb2..20b6771e209 100644 --- a/mozilla/mailnews/local/src/nsMovemailService.cpp +++ b/mozilla/mailnews/local/src/nsMovemailService.cpp @@ -44,6 +44,7 @@ #include "nsILocalFile.h" #include "nsFileStream.h" +#include "nsIFileSpec.h" #include "nsAppDirectoryServiceDefs.h" #include "nsIPref.h" diff --git a/mozilla/mailnews/local/src/nsNoneService.cpp b/mozilla/mailnews/local/src/nsNoneService.cpp index fa204c4d136..502220cee33 100644 --- a/mozilla/mailnews/local/src/nsNoneService.cpp +++ b/mozilla/mailnews/local/src/nsNoneService.cpp @@ -35,6 +35,7 @@ #include "nsMsgBaseCID.h" #include "nsXPIDLString.h" #include "nsCOMPtr.h" +#include "nsIFileSpec.h" #include "nsIDirectoryService.h" #include "nsAppDirectoryServiceDefs.h" diff --git a/mozilla/mailnews/local/src/nsParseMailbox.cpp b/mozilla/mailnews/local/src/nsParseMailbox.cpp index 793688ce04a..35a27842223 100644 --- a/mozilla/mailnews/local/src/nsParseMailbox.cpp +++ b/mozilla/mailnews/local/src/nsParseMailbox.cpp @@ -52,6 +52,7 @@ #include "nsAppDirectoryServiceDefs.h" #include "nsIMsgLocalMailFolder.h" #include "nsMsgUtils.h" +#include "prprf.h" static NS_DEFINE_CID(kCMailDB, NS_MAILDB_CID); static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); diff --git a/mozilla/mailnews/local/src/nsParseMailbox.h b/mozilla/mailnews/local/src/nsParseMailbox.h index 4c624051f54..066f0e89ba4 100644 --- a/mozilla/mailnews/local/src/nsParseMailbox.h +++ b/mozilla/mailnews/local/src/nsParseMailbox.h @@ -37,6 +37,7 @@ #include "nsLocalStringBundle.h" #include "nsCOMPtr.h" #include "nsTime.h" +#include "nsFileSpec.h" #include "nsIMsgFilterList.h" diff --git a/mozilla/mailnews/local/src/nsPop3Service.cpp b/mozilla/mailnews/local/src/nsPop3Service.cpp index f82056ef13c..66d61d43416 100644 --- a/mozilla/mailnews/local/src/nsPop3Service.cpp +++ b/mozilla/mailnews/local/src/nsPop3Service.cpp @@ -44,6 +44,8 @@ #include "nsRDFCID.h" #include "nsIDirectoryService.h" #include "nsAppDirectoryServiceDefs.h" +#include "prprf.h" +#include "nsEscape.h" #define POP3_PORT 110 // The IANA port for Pop3 diff --git a/mozilla/mailnews/local/src/nsPop3Sink.cpp b/mozilla/mailnews/local/src/nsPop3Sink.cpp index c66c7b6a961..f3a5ba11a17 100644 --- a/mozilla/mailnews/local/src/nsPop3Sink.cpp +++ b/mozilla/mailnews/local/src/nsPop3Sink.cpp @@ -28,6 +28,7 @@ #include "nscore.h" #include #include +#include "nsIFileSpec.h" #include "nsParseMailbox.h" #include "nsIFolder.h" #include "nsIMsgIncomingServer.h" diff --git a/mozilla/mailnews/mime/cthandlers/vcard/mimevcrd.cpp b/mozilla/mailnews/mime/cthandlers/vcard/mimevcrd.cpp index 50c2fe33f9d..cb0b82c14f7 100644 --- a/mozilla/mailnews/mime/cthandlers/vcard/mimevcrd.cpp +++ b/mozilla/mailnews/mime/cthandlers/vcard/mimevcrd.cpp @@ -45,9 +45,8 @@ #include "nsIPref.h" #include "nsVCardStringResources.h" -#include "nsVCard.h" -#include "nsVCardObj.h" #include "nsCRT.h" +#include "prprf.h" // String bundles... #ifndef XP_MAC diff --git a/mozilla/mailnews/mime/cthandlers/vcard/nsVCardObj.h b/mozilla/mailnews/mime/cthandlers/vcard/nsVCardObj.h index 2b8709a44ec..abbd806976a 100644 --- a/mozilla/mailnews/mime/cthandlers/vcard/nsVCardObj.h +++ b/mozilla/mailnews/mime/cthandlers/vcard/nsVCardObj.h @@ -115,6 +115,11 @@ they will use an appropriately defined local type |vwchar_t|. typedef wchar_t vwchar_t; #endif +#include "nsFileSpec.h" +#include "xp_core.h" + +class nsOutputFileStream; + XP_BEGIN_PROTOS #define VC7bitProp "7bit" diff --git a/mozilla/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp b/mozilla/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp index 6a984715dd9..49725870c93 100644 --- a/mozilla/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp +++ b/mozilla/mailnews/mime/emitters/src/nsMimeBaseEmitter.cpp @@ -45,6 +45,7 @@ #include "nsIMimeConverter.h" #include "nsMsgMimeCID.h" #include "prlog.h" +#include "prprf.h" static PRLogModuleInfo * gMimeEmitterLogModule = nsnull; diff --git a/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp b/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp index 19c3ca9d298..d8ea615941a 100644 --- a/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp +++ b/mozilla/mailnews/mime/emitters/src/nsMimeXULEmitter.cpp @@ -46,6 +46,7 @@ #include "nsSpecialSystemDirectory.h" #include "plbase64.h" #include "nsIMimeStreamConverter.h" +#include "prprf.h" static NS_DEFINE_CID(kMsgHeaderParserCID, NS_MSGHEADERPARSER_CID); static NS_DEFINE_CID(kCAddressCollecter, NS_ABADDRESSCOLLECTER_CID); diff --git a/mozilla/mailnews/mime/src/mimedrft.cpp b/mozilla/mailnews/mime/src/mimedrft.cpp index 228bd309f13..c39b44d9049 100644 --- a/mozilla/mailnews/mime/src/mimedrft.cpp +++ b/mozilla/mailnews/mime/src/mimedrft.cpp @@ -38,10 +38,13 @@ #include "prmem.h" #include "plstr.h" +#include "prprf.h" #include "prio.h" #include "nsIPref.h" #include "msgCore.h" #include "nsCRT.h" +#include "nsEscape.h" +#include "nsIFileSpec.h" #include "nsIMsgSend.h" #include "nsFileStream.h" #include "nsMimeStringResources.h" diff --git a/mozilla/mailnews/mime/src/mimehdrs.cpp b/mozilla/mailnews/mime/src/mimehdrs.cpp index 1d45bf6f29d..b48790ecad8 100644 --- a/mozilla/mailnews/mime/src/mimehdrs.cpp +++ b/mozilla/mailnews/mime/src/mimehdrs.cpp @@ -23,6 +23,7 @@ #include "msgCore.h" #include "mimei.h" #include "prmem.h" +#include "prlog.h" #include "plstr.h" #include "mimebuf.h" #include "mimemoz2.h" diff --git a/mozilla/mailnews/mime/src/mimemoz2.h b/mozilla/mailnews/mime/src/mimemoz2.h index 6991983d3a7..9f0aaba1268 100644 --- a/mozilla/mailnews/mime/src/mimemoz2.h +++ b/mozilla/mailnews/mime/src/mimemoz2.h @@ -31,6 +31,8 @@ #include "nsIMsgSend.h" #include "nsIMimeConverter.h" +class nsOutputFileStream; + // SHERRY - Need to get these out of here eventually #ifdef XP_UNIX diff --git a/mozilla/mailnews/mime/src/mimemsg.cpp b/mozilla/mailnews/mime/src/mimemsg.cpp index 54f854072bb..7e3955ef2e6 100644 --- a/mozilla/mailnews/mime/src/mimemsg.cpp +++ b/mozilla/mailnews/mime/src/mimemsg.cpp @@ -29,6 +29,7 @@ #include "plstr.h" #include "msgCore.h" #include "prlog.h" +#include "prprf.h" #include "nsCRT.h" #include "nsMimeStringResources.h" #include "nsMimeTypes.h" diff --git a/mozilla/mailnews/mime/src/mimemult.cpp b/mozilla/mailnews/mime/src/mimemult.cpp index f0c045dc467..0044b2b0ff4 100644 --- a/mozilla/mailnews/mime/src/mimemult.cpp +++ b/mozilla/mailnews/mime/src/mimemult.cpp @@ -24,6 +24,7 @@ #include "mimemult.h" #include "mimemoz2.h" +#include "prlog.h" #include "prmem.h" #include "plstr.h" #include "prio.h" diff --git a/mozilla/mailnews/mime/src/mimethtm.cpp b/mozilla/mailnews/mime/src/mimethtm.cpp index 57aec16a657..10039eab85f 100644 --- a/mozilla/mailnews/mime/src/mimethtm.cpp +++ b/mozilla/mailnews/mime/src/mimethtm.cpp @@ -19,11 +19,11 @@ * * Contributor(s): */ -#include "plstr.h" #include "mimethtm.h" #include "prmem.h" #include "plstr.h" #include "prlog.h" +#include "prprf.h" #include "msgCore.h" #include "nsMimeStringResources.h" #include "mimemoz2.h" diff --git a/mozilla/mailnews/news/public/nsINNTPNewsgroupPost.idl b/mozilla/mailnews/news/public/nsINNTPNewsgroupPost.idl index 539f4789dce..170d0067e92 100644 --- a/mozilla/mailnews/news/public/nsINNTPNewsgroupPost.idl +++ b/mozilla/mailnews/news/public/nsINNTPNewsgroupPost.idl @@ -26,7 +26,8 @@ */ #include "nsISupports.idl" -#include "nsIFileSpec.idl" + +interface nsIFileSpec; [scriptable, uuid(c4164a20-bc74-11d2-b7f2-00805f05ffa5)] interface nsINNTPNewsgroupPost : nsISupports { diff --git a/mozilla/mailnews/news/public/nsINntpIncomingServer.idl b/mozilla/mailnews/news/public/nsINntpIncomingServer.idl index 1b7175bb683..f2e791e5ed0 100644 --- a/mozilla/mailnews/news/public/nsINntpIncomingServer.idl +++ b/mozilla/mailnews/news/public/nsINntpIncomingServer.idl @@ -21,8 +21,8 @@ */ #include "nsISupports.idl" -#include "nsIFileSpec.idl" +interface nsIFileSpec; interface nsIMsgNewsFolder; interface nsINNTPProtocol; interface nsIURI; diff --git a/mozilla/mailnews/news/src/nsNNTPNewsgroupPost.h b/mozilla/mailnews/news/src/nsNNTPNewsgroupPost.h index d6a9159e48a..743f60fb601 100644 --- a/mozilla/mailnews/news/src/nsNNTPNewsgroupPost.h +++ b/mozilla/mailnews/news/src/nsNNTPNewsgroupPost.h @@ -27,6 +27,7 @@ #include "nsINNTPNewsgroupPost.h" #include "nsCOMPtr.h" #include "nsIFileSpec.h" +#include "prmem.h" #define HEADER_FROM 0 diff --git a/mozilla/mailnews/news/src/nsNNTPProtocol.cpp b/mozilla/mailnews/news/src/nsNNTPProtocol.cpp index 4e771e6f53f..3e1b4b06957 100644 --- a/mozilla/mailnews/news/src/nsNNTPProtocol.cpp +++ b/mozilla/mailnews/news/src/nsNNTPProtocol.cpp @@ -55,6 +55,7 @@ #include "prlog.h" #include "prerror.h" #include "nsEscape.h" +#include "xp_core.h" #include "prprf.h" diff --git a/mozilla/mailnews/news/src/nsNewsUtils.cpp b/mozilla/mailnews/news/src/nsNewsUtils.cpp index 80bbad456b8..2b8453976a0 100644 --- a/mozilla/mailnews/news/src/nsNewsUtils.cpp +++ b/mozilla/mailnews/news/src/nsNewsUtils.cpp @@ -35,6 +35,7 @@ #include "nsIRDFResource.h" #include "nsRDFCID.h" #include "nsIMsgNewsFolder.h" +#include "nsIFileSpec.h" static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); diff --git a/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp b/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp index 709a1c50da5..0e365064813 100644 --- a/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp +++ b/mozilla/mailnews/news/src/nsNntpIncomingServer.cpp @@ -25,6 +25,7 @@ #include "nsNntpIncomingServer.h" #include "nsXPIDLString.h" +#include "nsEscape.h" #include "nsIPref.h" #include "nsIMsgNewsFolder.h" #include "nsIFolder.h" @@ -36,6 +37,7 @@ #include "nsNNTPProtocol.h" #include "nsIDirectoryService.h" #include "nsAppDirectoryServiceDefs.h" +#include "nsInt64.h" #include "nsMsgUtils.h" #define INVALID_VERSION 0 diff --git a/mozilla/mailnews/news/src/nsNntpService.cpp b/mozilla/mailnews/news/src/nsNntpService.cpp index 6ceb2dd0b8a..9dc71219421 100644 --- a/mozilla/mailnews/news/src/nsNntpService.cpp +++ b/mozilla/mailnews/news/src/nsNntpService.cpp @@ -59,6 +59,7 @@ #include "nsIPrompt.h" #include "nsIRDFService.h" #include "nsNewsDownloader.h" +#include "prprf.h" #include "nsICacheService.h" #include "nsNetCID.h" diff --git a/mozilla/modules/libpref/public/nsIPref.idl b/mozilla/modules/libpref/public/nsIPref.idl index a33d603976b..a4fecc8efa7 100644 --- a/mozilla/modules/libpref/public/nsIPref.idl +++ b/mozilla/modules/libpref/public/nsIPref.idl @@ -20,13 +20,14 @@ * Contributor(s): */ +#include "nsISupports.idl" + +interface nsILocalFile; +interface nsIObserver; +interface nsIFileSpec; + #include "nsIPrefService.idl" -#include "nsIFile.idl" -#include "nsIFileSpec.idl" -#include "nsILocalFile.idl" -#include "nsIObserver.idl" #include "nsIPrefBranch.idl" -#include "nsIPrefBranchInternal.idl" /* * This entire interface is depricated and should not be used. diff --git a/mozilla/modules/libpref/public/nsIPrefService.idl b/mozilla/modules/libpref/public/nsIPrefService.idl index 6e29436010d..f089c292e63 100644 --- a/mozilla/modules/libpref/public/nsIPrefService.idl +++ b/mozilla/modules/libpref/public/nsIPrefService.idl @@ -24,7 +24,8 @@ #include "nsISupports.idl" #include "nsIPrefBranch.idl" -#include "nsIFile.idl" + +interface nsIFile; [scriptable, uuid(decb9cc7-c08f-4ea5-be91-a8fc637ce2d2)] interface nsIPrefService : nsISupports diff --git a/mozilla/modules/libpref/src/nsPref.cpp b/mozilla/modules/libpref/src/nsPref.cpp index f82dd8945f0..7b324418440 100644 --- a/mozilla/modules/libpref/src/nsPref.cpp +++ b/mozilla/modules/libpref/src/nsPref.cpp @@ -34,9 +34,10 @@ */ #include "nsIPref.h" +#include "nsIPrefBranch.h" +#include "nsIPrefBranchInternal.h" #include "nsIFactory.h" #include "nsIComponentManager.h" -#include "nsComponentManagerUtils.h" #include "nsCOMPtr.h" #include "nsMemory.h" #include "prefapi.h" diff --git a/mozilla/modules/mpfilelocprovider/src/nsMPFileLocProvider.cpp b/mozilla/modules/mpfilelocprovider/src/nsMPFileLocProvider.cpp index c1a3fcfbcca..3906fff0b94 100755 --- a/mozilla/modules/mpfilelocprovider/src/nsMPFileLocProvider.cpp +++ b/mozilla/modules/mpfilelocprovider/src/nsMPFileLocProvider.cpp @@ -28,6 +28,7 @@ #include "nsAppDirectoryServiceDefs.h" #include "nsISupportsUtils.h" #include "nsXPIDLString.h" +#include "nsISimpleEnumerator.h" // Static Variables diff --git a/mozilla/modules/oji/src/lcglue.cpp b/mozilla/modules/oji/src/lcglue.cpp index 84e8805330b..8735dd4a226 100644 --- a/mozilla/modules/oji/src/lcglue.cpp +++ b/mozilla/modules/oji/src/lcglue.cpp @@ -27,6 +27,7 @@ #include "ProxyJNI.h" #include "lcglue.h" #include "nscore.h" +#include "nsIScriptContext.h" #include "nsISecurityContext.h" #include "nsCSecurityContext.h" #include "nsCRT.h" diff --git a/mozilla/modules/oji/src/nsCSecurityContext.cpp b/mozilla/modules/oji/src/nsCSecurityContext.cpp index 82fc03d2ded..5233eaa0bce 100644 --- a/mozilla/modules/oji/src/nsCSecurityContext.cpp +++ b/mozilla/modules/oji/src/nsCSecurityContext.cpp @@ -33,6 +33,7 @@ #include "jscntxt.h" #include "jsdbgapi.h" #include "nsCSecurityContext.h" +#include "nsIScriptContext.h" #include "jvmmgr.h" // For GetOrigin() @@ -44,6 +45,7 @@ #include "nsCertificatePrincipal.h" #include "nsScriptSecurityManager.h" #include "nsIScriptGlobalObject.h" +#include "nsIServiceManager.h" #include "nsIScriptObjectPrincipal.h" #include "nsTraceRefcnt.h" diff --git a/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp b/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp index b91aa7df0a5..fd229e6edea 100644 --- a/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginInstancePeer.cpp @@ -37,6 +37,7 @@ #include "nsIDocument.h" #include "nsIScriptGlobalObject.h" +#include "nsIScriptContext.h" #if defined(XP_PC) && !defined(XP_OS2) #include "windows.h" diff --git a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp index b667c3be9a7..9f6a176ea04 100644 --- a/mozilla/modules/plugin/base/src/nsPluginViewer.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginViewer.cpp @@ -45,6 +45,7 @@ #include "nsIWebBrowserChrome.h" #include "nsIDOMDocument.h" #include "nsPluginViewer.h" +#include "nsGUIEvent.h" #include "nsIPluginViewer.h" diff --git a/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp b/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp index b91aa7df0a5..fd229e6edea 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginInstancePeer.cpp @@ -37,6 +37,7 @@ #include "nsIDocument.h" #include "nsIScriptGlobalObject.h" +#include "nsIScriptContext.h" #if defined(XP_PC) && !defined(XP_OS2) #include "windows.h" diff --git a/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp b/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp index b667c3be9a7..9f6a176ea04 100644 --- a/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp +++ b/mozilla/modules/plugin/nglsrc/nsPluginViewer.cpp @@ -45,6 +45,7 @@ #include "nsIWebBrowserChrome.h" #include "nsIDOMDocument.h" #include "nsPluginViewer.h" +#include "nsGUIEvent.h" #include "nsIPluginViewer.h" diff --git a/mozilla/netwerk/base/public/nsIFileStreams.idl b/mozilla/netwerk/base/public/nsIFileStreams.idl index 92d5339a4cc..4a186d51bd4 100644 --- a/mozilla/netwerk/base/public/nsIFileStreams.idl +++ b/mozilla/netwerk/base/public/nsIFileStreams.idl @@ -22,7 +22,8 @@ #include "nsIInputStream.idl" #include "nsIOutputStream.idl" -#include "nsILocalFile.idl" + +interface nsIFile; [scriptable, uuid(e3d56a20-c7ec-11d3-8cda-0060b0fc14a3)] interface nsIFileInputStream : nsIInputStream @@ -115,12 +116,9 @@ interface nsIBufferedOutputStream : nsIOutputStream //////////////////////////////////////////////////////////////////////////////// // move to nsNetUtil.h later... -#include "nsILoadGroup.h" -#include "nsIInterfaceRequestor.h" #include "nsCOMPtr.h" -#include "nsIServiceManager.h" +#include "nsIComponentManager.h" #include "nsIFileChannel.h" -#include "nsILocalFile.h" #include "nsIInputStream.h" #include "nsIOutputStream.h" #include "prio.h" // for read/write flags, permissions, etc. diff --git a/mozilla/netwerk/base/src/nsDirectoryIndexStream.h b/mozilla/netwerk/base/src/nsDirectoryIndexStream.h index 53f2a00ad2c..b090892dc22 100644 --- a/mozilla/netwerk/base/src/nsDirectoryIndexStream.h +++ b/mozilla/netwerk/base/src/nsDirectoryIndexStream.h @@ -27,6 +27,7 @@ #include "nsString.h" #include "nsIInputStream.h" #include "nsCOMPtr.h" +#include "nsISimpleEnumerator.h" class nsDirectoryIndexStream : public nsIInputStream { diff --git a/mozilla/netwerk/cache/src/nsANSIFileStreams.h b/mozilla/netwerk/cache/src/nsANSIFileStreams.h index 5e5470a3bf3..1eb169d5f94 100644 --- a/mozilla/netwerk/cache/src/nsANSIFileStreams.h +++ b/mozilla/netwerk/cache/src/nsANSIFileStreams.h @@ -27,6 +27,7 @@ #include #include "nsIFileStreams.h" +#include "nsILocalFile.h" class nsANSIInputStream : public nsIInputStream, public nsISeekableStream { FILE* mFile; diff --git a/mozilla/netwerk/cache/src/nsMemoryCacheDevice.cpp b/mozilla/netwerk/cache/src/nsMemoryCacheDevice.cpp index ea1b7b5ba41..0c9f58f6b2f 100644 --- a/mozilla/netwerk/cache/src/nsMemoryCacheDevice.cpp +++ b/mozilla/netwerk/cache/src/nsMemoryCacheDevice.cpp @@ -26,6 +26,7 @@ #include "nsCacheService.h" #include "nsICacheService.h" #include "nsIComponentManager.h" +#include "nsIServiceManager.h" #include "nsNetCID.h" #include "nsIObserverService.h" #include "nsIPref.h" diff --git a/mozilla/netwerk/mime/public/nsIMIMEDataSource.idl b/mozilla/netwerk/mime/public/nsIMIMEDataSource.idl index 22c262f8399..5c69b7ffe3d 100644 --- a/mozilla/netwerk/mime/public/nsIMIMEDataSource.idl +++ b/mozilla/netwerk/mime/public/nsIMIMEDataSource.idl @@ -22,9 +22,11 @@ */ #include "nsISupports.idl" -#include "nsIMIMEInfo.idl" -#include "nsIEnumerator.idl" -#include "nsIFile.idl" + +interface nsIMIMEInfo; +interface nsIFile; +interface nsISimpleEnumerator; + %{C++ #define NS_XMLMIMEDATASOURCE_CID \ { /* {41654483-fa5b-11d3-a12b-a7aef7a2f2fc} */ \ diff --git a/mozilla/netwerk/mime/public/nsIMIMEInfo.idl b/mozilla/netwerk/mime/public/nsIMIMEInfo.idl index 374ef20155d..128b7364018 100644 --- a/mozilla/netwerk/mime/public/nsIMIMEInfo.idl +++ b/mozilla/netwerk/mime/public/nsIMIMEInfo.idl @@ -29,8 +29,8 @@ */ #include "nsISupports.idl" -#include "nsIURI.idl" +interface nsIURI; interface nsIFile; typedef long nsMIMEInfoHandleAction; diff --git a/mozilla/netwerk/mime/src/nsMIMEInfoImpl.h b/mozilla/netwerk/mime/src/nsMIMEInfoImpl.h index 08c2159d345..89c941d93a0 100644 --- a/mozilla/netwerk/mime/src/nsMIMEInfoImpl.h +++ b/mozilla/netwerk/mime/src/nsMIMEInfoImpl.h @@ -28,6 +28,7 @@ #include "nsVoidArray.h" #include "nsIFile.h" #include "nsCOMPtr.h" +#include "nsIURI.h" class nsMIMEInfoImpl : public nsIMIMEInfo { public: diff --git a/mozilla/netwerk/protocol/about/src/nsAboutBloat.cpp b/mozilla/netwerk/protocol/about/src/nsAboutBloat.cpp index a9dfea978de..6ef46438d62 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutBloat.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutBloat.cpp @@ -31,6 +31,7 @@ #include "nsIFileStreams.h" #include "nsNetUtil.h" #include "nsDirectoryServiceDefs.h" +#include "nsILocalFile.h" #ifdef XP_MAC extern "C" void GC_gcollect(void); diff --git a/mozilla/netwerk/protocol/res/public/nsIResProtocolHandler.idl b/mozilla/netwerk/protocol/res/public/nsIResProtocolHandler.idl index 3bebd6d4518..cf3a309a68c 100644 --- a/mozilla/netwerk/protocol/res/public/nsIResProtocolHandler.idl +++ b/mozilla/netwerk/protocol/res/public/nsIResProtocolHandler.idl @@ -26,7 +26,6 @@ interface nsISimpleEnumerator; interface nsISupportsArray; %{C++ -#include "nsVoidArray.h" #define NS_RESPROTOCOLHANDLER_CID \ { /* e64f152a-9f07-11d3-8cda-0060b0fc14a3 */ \ diff --git a/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp b/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp index 990744964b0..2bf7c61d97e 100644 --- a/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp +++ b/mozilla/profile/pref-migrator/src/nsPrefMigration.cpp @@ -32,6 +32,7 @@ #include "nsIServiceManager.h" #include "nsIWindowMediator.h" #include "nsIScriptGlobalObject.h" +#include "nsIScriptContext.h" #include "nsSpecialSystemDirectory.h" #include "nsFileStream.h" #include "nsIFileSpec.h" diff --git a/mozilla/profile/src/nsProfile.cpp b/mozilla/profile/src/nsProfile.cpp index eb00e198468..ab2271485b3 100644 --- a/mozilla/profile/src/nsProfile.cpp +++ b/mozilla/profile/src/nsProfile.cpp @@ -71,6 +71,7 @@ #include "nsIWebBrowserChrome.h" #include "nsIScriptGlobalObject.h" +#include "nsIScriptContext.h" #include "nsIBaseWindow.h" #include "nsIDialogParamBlock.h" #include "nsIDOMWindowInternal.h" diff --git a/mozilla/rdf/datasource/public/nsIRDFFTP.h b/mozilla/rdf/datasource/public/nsIRDFFTP.h index bd65bdebecd..1b8741beb57 100644 --- a/mozilla/rdf/datasource/public/nsIRDFFTP.h +++ b/mozilla/rdf/datasource/public/nsIRDFFTP.h @@ -25,7 +25,6 @@ #include "nscore.h" #include "nsISupports.h" -#include "nsVoidArray.h" #include "nsIRDFNode.h" diff --git a/mozilla/rdf/datasource/public/nsIRDFFileSystem.h b/mozilla/rdf/datasource/public/nsIRDFFileSystem.h index 95c955e3e02..05ff9d7393a 100644 --- a/mozilla/rdf/datasource/public/nsIRDFFileSystem.h +++ b/mozilla/rdf/datasource/public/nsIRDFFileSystem.h @@ -25,9 +25,9 @@ #include "nscore.h" #include "nsISupports.h" -#include "nsVoidArray.h" #include "nsIRDFNode.h" +class nsVoidArray; #define NS_IRDFFILESYSTEMDATAOURCE_IID \ diff --git a/mozilla/uriloader/exthandler/mac/nsInternetConfigService.cpp b/mozilla/uriloader/exthandler/mac/nsInternetConfigService.cpp index 401cee3d3fc..53cd48e0cc0 100644 --- a/mozilla/uriloader/exthandler/mac/nsInternetConfigService.cpp +++ b/mozilla/uriloader/exthandler/mac/nsInternetConfigService.cpp @@ -25,7 +25,6 @@ #include "nsIMIMEInfo.h" #include "nsIFactory.h" #include "nsIComponentManager.h" -#include "nsComponentManagerUtils.h" #include "nsLocalFileMac.h" #include "nsIURL.h" #include "nsXPIDLString.h" diff --git a/mozilla/uriloader/exthandler/mac/nsMacMIMEDataSource.cpp b/mozilla/uriloader/exthandler/mac/nsMacMIMEDataSource.cpp index 4d264f99f85..7f3b9b76fa4 100644 --- a/mozilla/uriloader/exthandler/mac/nsMacMIMEDataSource.cpp +++ b/mozilla/uriloader/exthandler/mac/nsMacMIMEDataSource.cpp @@ -22,6 +22,8 @@ #include "nsMacMIMEDataSource.h" #include "nsString.h" +#include "nsIComponentManager.h" +#include "nsIMIMEInfo.h" #include diff --git a/mozilla/uriloader/exthandler/nsExternalHelperAppService.h b/mozilla/uriloader/exthandler/nsExternalHelperAppService.h index 65c457b2119..c04aa9e8cb3 100644 --- a/mozilla/uriloader/exthandler/nsExternalHelperAppService.h +++ b/mozilla/uriloader/exthandler/nsExternalHelperAppService.h @@ -36,6 +36,8 @@ #include "nsIFileStreams.h" #include "nsIOutputStream.h" #include "nsString.h" +#include "nsIInterfaceRequestor.h" +#include "nsILocalFile.h" #include "nsIRDFDataSource.h" #include "nsIRDFResource.h" diff --git a/mozilla/uriloader/exthandler/nsMIMEInfoImpl.h b/mozilla/uriloader/exthandler/nsMIMEInfoImpl.h index 08c2159d345..89c941d93a0 100644 --- a/mozilla/uriloader/exthandler/nsMIMEInfoImpl.h +++ b/mozilla/uriloader/exthandler/nsMIMEInfoImpl.h @@ -28,6 +28,7 @@ #include "nsVoidArray.h" #include "nsIFile.h" #include "nsCOMPtr.h" +#include "nsIURI.h" class nsMIMEInfoImpl : public nsIMIMEInfo { public: diff --git a/mozilla/view/public/nsIScrollableView.h b/mozilla/view/public/nsIScrollableView.h index 23170d89cfc..75cbae9e919 100644 --- a/mozilla/view/public/nsIScrollableView.h +++ b/mozilla/view/public/nsIScrollableView.h @@ -29,6 +29,7 @@ class nsIView; class nsIScrollPositionListener; +struct nsMargin; typedef enum { nsScrollPreference_kAuto = 0, diff --git a/mozilla/view/public/nsIView.h b/mozilla/view/public/nsIView.h index 0386355f814..0eb84367807 100644 --- a/mozilla/view/public/nsIView.h +++ b/mozilla/view/public/nsIView.h @@ -26,8 +26,12 @@ #include #include "nsISupports.h" #include "nsCoord.h" -#include "nsIWidget.h" -#include "nsGUIEvent.h" +#include "nsEvent.h" + +struct nsGUIEvent; +class nsIWidget; +struct nsWidgetInitData; +typedef void* nsNativeWidget; class nsIViewManager; class nsIRegion; diff --git a/mozilla/view/public/nsIViewManager.h b/mozilla/view/public/nsIViewManager.h index 91b33fcec38..6a691195550 100644 --- a/mozilla/view/public/nsIViewManager.h +++ b/mozilla/view/public/nsIViewManager.h @@ -27,6 +27,7 @@ #include "nsISupports.h" #include "nsCoord.h" #include "nsIView.h" +#include "nsColor.h" class nsIRegion; class nsIEvent; @@ -36,6 +37,7 @@ class nsIScrollableView; class nsIWidget; class nsICompositeListener; struct nsRect; +class nsIDeviceContext; enum nsContentQuality { nsContentQuality_kGood = 0, diff --git a/mozilla/view/public/nsIViewObserver.h b/mozilla/view/public/nsIViewObserver.h index 4d2e7d1b1b5..df411870442 100644 --- a/mozilla/view/public/nsIViewObserver.h +++ b/mozilla/view/public/nsIViewObserver.h @@ -24,10 +24,11 @@ #define nsIViewObserver_h___ #include "nsISupports.h" -#include "nsGUIEvent.h" +#include "nsEvent.h" class nsIRenderingContext; struct nsRect; +struct nsGUIEvent; #define NS_IVIEWOBSERVER_IID \ { 0x6a1529e0, 0x3d2c, 0x11d2, \ diff --git a/mozilla/view/src/nsViewManager.cpp b/mozilla/view/src/nsViewManager.cpp index 3f2a39ccca1..dd6b2a0dc38 100644 --- a/mozilla/view/src/nsViewManager.cpp +++ b/mozilla/view/src/nsViewManager.cpp @@ -37,6 +37,7 @@ #include "nsIEventQueue.h" #include "nsIEventQueueService.h" #include "nsIServiceManager.h" +#include "nsGUIEvent.h" static NS_DEFINE_IID(kBlenderCID, NS_BLENDER_CID); static NS_DEFINE_IID(kRegionCID, NS_REGION_CID); diff --git a/mozilla/view/src/nsViewManager2.cpp b/mozilla/view/src/nsViewManager2.cpp index 2303dbdda87..4a2f9e10161 100755 --- a/mozilla/view/src/nsViewManager2.cpp +++ b/mozilla/view/src/nsViewManager2.cpp @@ -36,6 +36,7 @@ #include "nsIEventQueue.h" #include "nsIEventQueueService.h" #include "nsIServiceManager.h" +#include "nsGUIEvent.h" static NS_DEFINE_IID(kBlenderCID, NS_BLENDER_CID); static NS_DEFINE_IID(kRegionCID, NS_REGION_CID); diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp index ee918cfab0f..ca70eebc4a7 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.cpp @@ -76,6 +76,7 @@ #include "nsIBaseWindow.h" #include "nsXPIDLString.h" #include "nsIViewManager.h" +#include "nsGUIEvent.h" #include "nsIWebProgress.h" #include "nsIWebBrowserSetup.h" @@ -101,6 +102,7 @@ // For Copy #include "nsISelection.h" +#include "nsISelectionController.h" // XXX For font setting below #include "nsFont.h" diff --git a/mozilla/webshell/tests/viewer/nsBrowserWindow.h b/mozilla/webshell/tests/viewer/nsBrowserWindow.h index c89304e1128..f821948904c 100644 --- a/mozilla/webshell/tests/viewer/nsBrowserWindow.h +++ b/mozilla/webshell/tests/viewer/nsBrowserWindow.h @@ -59,6 +59,7 @@ class nsIPresContext; class nsIPresShell; class nsIContentConnector; class nsWebCrawler; +class nsIContent; #define SAMPLES_BASE_URL "resource:/res/samples" diff --git a/mozilla/webshell/tests/viewer/nsThrobber.cpp b/mozilla/webshell/tests/viewer/nsThrobber.cpp index 24b60524a2b..96974830c00 100644 --- a/mozilla/webshell/tests/viewer/nsThrobber.cpp +++ b/mozilla/webshell/tests/viewer/nsThrobber.cpp @@ -35,6 +35,8 @@ #include "nsCRT.h" #include "prprf.h" #include "nsIDeviceContext.h" +#include "nsGUIEvent.h" +#include "nsIImage.h" static NS_DEFINE_IID(kChildCID, NS_CHILD_CID); diff --git a/mozilla/webshell/tests/viewer/nsViewerApp.cpp b/mozilla/webshell/tests/viewer/nsViewerApp.cpp index 8d99b31832c..c26237b9633 100644 --- a/mozilla/webshell/tests/viewer/nsViewerApp.cpp +++ b/mozilla/webshell/tests/viewer/nsViewerApp.cpp @@ -46,6 +46,8 @@ #include "plstr.h" #include "prenv.h" #include "nsIScriptGlobalObject.h" +#include "nsIScriptContext.h" +#include "nsGUIEvent.h" // Needed for Dialog GUI #include "nsICheckButton.h" diff --git a/mozilla/webshell/tests/viewer/nsWebCrawler.h b/mozilla/webshell/tests/viewer/nsWebCrawler.h index 6c2aeb1efa0..acc2ea9bb34 100644 --- a/mozilla/webshell/tests/viewer/nsWebCrawler.h +++ b/mozilla/webshell/tests/viewer/nsWebCrawler.h @@ -29,6 +29,7 @@ #include "nsString.h" #include "nsIAtom.h" #include "nsWeakReference.h" +#include "nsIURI.h" class nsIContent; diff --git a/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp b/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp index 0b8572ecda6..ebc324ede42 100644 --- a/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp +++ b/mozilla/webshell/tests/viewer/nsXPBaseWindow.cpp @@ -58,6 +58,7 @@ #include "nsIBaseWindow.h" #include "nsIWebNavigation.h" #include "nsIViewManager.h" +#include "nsGUIEvent.h" #include "nsIDocShell.h" #include "nsIDocShellTreeItem.h" diff --git a/mozilla/webshell/tests/viewer/nsXPBaseWindow.h b/mozilla/webshell/tests/viewer/nsXPBaseWindow.h index eb219a83e04..c66e0001790 100644 --- a/mozilla/webshell/tests/viewer/nsXPBaseWindow.h +++ b/mozilla/webshell/tests/viewer/nsXPBaseWindow.h @@ -33,6 +33,7 @@ #include "nsIDOMNode.h" #include "nsIDOMElement.h" #include "nsIDOMMouseListener.h" +#include "nsIWidget.h" class nsViewerApp; class nsIPresShell; diff --git a/mozilla/widget/public/nsGUIEvent.h b/mozilla/widget/public/nsGUIEvent.h index 6a9065b9909..3d19abb7a4e 100644 --- a/mozilla/widget/public/nsGUIEvent.h +++ b/mozilla/widget/public/nsGUIEvent.h @@ -25,6 +25,7 @@ #include "nsPoint.h" #include "nsRect.h" +#include "nsEvent.h" #include "nsHashtable.h" // nsIDOMEvent contains a long enum which includes a member called ERROR, @@ -43,18 +44,10 @@ class nsIAccessible; class nsIContent; /** - * Return status for event processors. + * Return status for event processors, nsEventStatus, is defined in + * nsEvent.h. */ -enum nsEventStatus { - /// The event is ignored, do default processing - nsEventStatus_eIgnore, - /// The event is consumed, don't do default processing - nsEventStatus_eConsumeNoDefault, - /// The event is consumed, but do default processing - nsEventStatus_eConsumeDoDefault -}; - /** * sizemode is an adjunct to widget size */ diff --git a/mozilla/widget/public/nsIAppShell.idl b/mozilla/widget/public/nsIAppShell.idl index 064351a467c..e6bd6a00ca7 100644 --- a/mozilla/widget/public/nsIAppShell.idl +++ b/mozilla/widget/public/nsIAppShell.idl @@ -32,7 +32,7 @@ native int(int); [ref] native voidPtrRef(void *); %{ C++ -#include "nsIEventQueue.h" +class nsIEventQueue; /** * Flags for the getNativeData function. diff --git a/mozilla/widget/public/nsIBaseWindow.idl b/mozilla/widget/public/nsIBaseWindow.idl index 0fc77e7cf44..d4a04b94a89 100644 --- a/mozilla/widget/public/nsIBaseWindow.idl +++ b/mozilla/widget/public/nsIBaseWindow.idl @@ -26,7 +26,7 @@ [ptr] native nsIWidget(nsIWidget); %{ C++ -#include "nsIWidget.h" +class nsIWidget; %} typedef voidPtr nativeWindow; diff --git a/mozilla/widget/public/nsIEventListener.h b/mozilla/widget/public/nsIEventListener.h index 427e3097e66..3cd40008c87 100644 --- a/mozilla/widget/public/nsIEventListener.h +++ b/mozilla/widget/public/nsIEventListener.h @@ -24,7 +24,8 @@ #define nsIEventListener_h__ #include "nsISupports.h" -#include "nsGUIEvent.h" + +struct nsGUIEvent; /** * Event listener interface. diff --git a/mozilla/widget/public/nsIFilePicker.idl b/mozilla/widget/public/nsIFilePicker.idl index 8b738dec5b2..d7187cab194 100644 --- a/mozilla/widget/public/nsIFilePicker.idl +++ b/mozilla/widget/public/nsIFilePicker.idl @@ -22,10 +22,9 @@ */ #include "nsISupports.idl" -#include "nsIURL.idl" -#include "nsIFileChannel.idl" -#include "nsILocalFile.idl" +interface nsILocalFile; +interface nsIFileURL; interface nsIDOMWindowInternal; [scriptable, uuid(c47de916-1dd1-11b2-8141-82507fa02b21)] diff --git a/mozilla/widget/public/nsIKeyBindMgr.h b/mozilla/widget/public/nsIKeyBindMgr.h index 117a6c295b2..f641638cbea 100644 --- a/mozilla/widget/public/nsIKeyBindMgr.h +++ b/mozilla/widget/public/nsIKeyBindMgr.h @@ -25,7 +25,7 @@ #include "nsISupports.h" #include "nsIDOMNode.h" -#include "nsGUIEvent.h" +#include "nsEvent.h" #include "nsIWebShell.h" #include "nsIContent.h" diff --git a/mozilla/widget/public/nsIMenuListener.h b/mozilla/widget/public/nsIMenuListener.h index b506e528886..915321e4d07 100644 --- a/mozilla/widget/public/nsIMenuListener.h +++ b/mozilla/widget/public/nsIMenuListener.h @@ -23,8 +23,10 @@ #ifndef nsIMenuListener_h__ #define nsIMenuListener_h__ -#include "nsGUIEvent.h" #include "nsISupports.h" +#include "nsEvent.h" + +class nsIWidget; // {f2e79602-1700-11d5-bb6f-90f240fe493c} #define NS_IMENULISTENER_IID \ diff --git a/mozilla/widget/public/nsIMouseListener.h b/mozilla/widget/public/nsIMouseListener.h index f4e012c6577..8d9c97783cd 100644 --- a/mozilla/widget/public/nsIMouseListener.h +++ b/mozilla/widget/public/nsIMouseListener.h @@ -24,7 +24,7 @@ #ifndef nsIMouseListener_h__ #define nsIMouseListener_h__ -#include "nsGUIEvent.h" +#include "nsEvent.h" #include "nsISupports.h" /** diff --git a/mozilla/widget/public/nsISound.idl b/mozilla/widget/public/nsISound.idl index 10b2d1d9aec..aac7b752d8e 100644 --- a/mozilla/widget/public/nsISound.idl +++ b/mozilla/widget/public/nsISound.idl @@ -22,7 +22,8 @@ */ #include "nsISupports.idl" -#include "nsIURL.idl" + +interface nsIURL; [scriptable, uuid(B148EED1-236D-11d3-B35C-00A0CC3C1CDE)] interface nsISound : nsISupports diff --git a/mozilla/widget/public/nsIWidget.h b/mozilla/widget/public/nsIWidget.h index efb6be96bbc..b81ee59606f 100644 --- a/mozilla/widget/public/nsIWidget.h +++ b/mozilla/widget/public/nsIWidget.h @@ -27,10 +27,11 @@ #include "nsColor.h" #include "nsIMouseListener.h" #include "nsIMenuListener.h" -#include "nsIImage.h" +#include "nsCoord.h" #include "prthread.h" -#include "nsGUIEvent.h" +#include "nsEvent.h" +#include "nsAReadableString.h" // forward declarations class nsIAppShell; @@ -40,11 +41,14 @@ class nsIToolkit; class nsIRenderingContext; class nsIEnumerator; class nsIDeviceContext; +class nsIRegion; struct nsRect; struct nsFont; class nsIMenuBar; class nsIEventListener; class nsIRollupListener; +struct nsGUIEvent; +struct nsColorMap; /** * Callback function that processes events. diff --git a/mozilla/widget/public/nsIWidget.idl b/mozilla/widget/public/nsIWidget.idl index 5d4e7d174f0..6f5919012b8 100644 --- a/mozilla/widget/public/nsIWidget.idl +++ b/mozilla/widget/public/nsIWidget.idl @@ -40,7 +40,7 @@ #include "nsIImage.h" #include "prthread.h" -#include "nsGUIEvent.h" +#include "nsEvent.h" // forward declarations class nsIAppShell; @@ -52,6 +52,7 @@ struct nsRect; struct nsFont; class nsIEventListener; class nsIRollupListener; +struct nsGUIEvent; %} [ptr] native nsGUIEvent(nsGUIEvent); diff --git a/mozilla/widget/src/mac/nsDynamicMDEF.cpp b/mozilla/widget/src/mac/nsDynamicMDEF.cpp index eda203e0a6e..49824931f18 100644 --- a/mozilla/widget/src/mac/nsDynamicMDEF.cpp +++ b/mozilla/widget/src/mac/nsDynamicMDEF.cpp @@ -30,6 +30,7 @@ #include "nsMenuBar.h" #include "nsIMenuBar.h" #include "DefProcFakery.h" +#include "nsGUIEvent.h" #include #include diff --git a/mozilla/widget/src/mac/nsLookAndFeel.cpp b/mozilla/widget/src/mac/nsLookAndFeel.cpp index c07e4ce5695..963ea5e432d 100644 --- a/mozilla/widget/src/mac/nsLookAndFeel.cpp +++ b/mozilla/widget/src/mac/nsLookAndFeel.cpp @@ -24,6 +24,7 @@ #include "nsXPLookAndFeel.h" #include "nsCarbonHelpers.h" #include "nsIInternetConfigService.h" +#include "nsIServiceManager.h" //------------------------------------------------------------------------- diff --git a/mozilla/widget/src/mac/nsMenu.cpp b/mozilla/widget/src/mac/nsMenu.cpp index 175e5ffcaae..5c692722b85 100644 --- a/mozilla/widget/src/mac/nsMenu.cpp +++ b/mozilla/widget/src/mac/nsMenu.cpp @@ -36,6 +36,7 @@ #include "nsIMenuItem.h" #include "nsIMenuListener.h" #include "nsIPresContext.h" +#include "nsGUIEvent.h" #include "nsString.h" #include "nsStringUtil.h" diff --git a/mozilla/widget/src/mac/nsMenuBar.cpp b/mozilla/widget/src/mac/nsMenuBar.cpp index 9e10d6e5794..309f421a957 100644 --- a/mozilla/widget/src/mac/nsMenuBar.cpp +++ b/mozilla/widget/src/mac/nsMenuBar.cpp @@ -33,6 +33,7 @@ #include "nsISupports.h" #include "nsIWidget.h" +#include "nsGUIEvent.h" #include "nsString.h" #include "nsStringUtil.h" #include "nsIDocument.h" diff --git a/mozilla/widget/src/mac/nsMenuItem.cpp b/mozilla/widget/src/mac/nsMenuItem.cpp index ab398e8a957..f4c55d837b9 100644 --- a/mozilla/widget/src/mac/nsMenuItem.cpp +++ b/mozilla/widget/src/mac/nsMenuItem.cpp @@ -32,6 +32,7 @@ #include "nsIWidget.h" #include "nsIMenuListener.h" #include "nsDynamicMDEF.h" +#include "nsGUIEvent.h" #include "nsStringUtil.h" diff --git a/mozilla/widget/src/mac/nsTextWidget.cpp b/mozilla/widget/src/mac/nsTextWidget.cpp index 4ad1378d433..6cb13c01665 100644 --- a/mozilla/widget/src/mac/nsTextWidget.cpp +++ b/mozilla/widget/src/mac/nsTextWidget.cpp @@ -21,6 +21,7 @@ */ #include "nsTextWidget.h" +#include "nsIRenderingContext.h" #include #include #include diff --git a/mozilla/widget/src/windows/nsFilePicker.h b/mozilla/widget/src/windows/nsFilePicker.h index db7d42f3b5b..7dc17efa900 100644 --- a/mozilla/widget/src/windows/nsFilePicker.h +++ b/mozilla/widget/src/windows/nsFilePicker.h @@ -25,6 +25,7 @@ #define nsFilePicker_h__ #include "nsIFileChannel.h" +#include "nsILocalFile.h" #define NS_IMPL_IDS #include "nsICharsetConverterManager.h" diff --git a/mozilla/widget/src/windows/nsWindow.cpp b/mozilla/widget/src/windows/nsWindow.cpp index b203dc834a2..650365a2b38 100644 --- a/mozilla/widget/src/windows/nsWindow.cpp +++ b/mozilla/widget/src/windows/nsWindow.cpp @@ -55,6 +55,7 @@ #include #include "prtime.h" #include "nsIRenderingContextWin.h" +#include "nsIImage.h" #include "nsIAccessible.h" #include "Accessible.h" diff --git a/mozilla/widget/src/xlib/nsWidget.cpp b/mozilla/widget/src/xlib/nsWidget.cpp index 734d578b850..670ae75ab8e 100644 --- a/mozilla/widget/src/xlib/nsWidget.cpp +++ b/mozilla/widget/src/xlib/nsWidget.cpp @@ -45,6 +45,7 @@ #include "nsIRollupListener.h" #include "nsGfxCIID.h" #include "nsIMenuRollup.h" +#include "nsIRenderingContext.h" #include "nsToolkit.h" #include "xlibrgb.h" diff --git a/mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp b/mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp index 7cb3d6e28a1..b75a53313c1 100644 --- a/mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp +++ b/mozilla/widget/src/xpwidgets/nsBaseFilePicker.cpp @@ -35,6 +35,7 @@ #include "nsIStringBundle.h" #include "nsXPIDLString.h" +#include "nsIServiceManager.h" #include "nsBaseFilePicker.h" diff --git a/mozilla/widget/src/xpwidgets/nsBaseWidget.h b/mozilla/widget/src/xpwidgets/nsBaseWidget.h index 12873163c04..60b71234209 100644 --- a/mozilla/widget/src/xpwidgets/nsBaseWidget.h +++ b/mozilla/widget/src/xpwidgets/nsBaseWidget.h @@ -35,6 +35,7 @@ #include "nsVoidArray.h" #include "nsISupportsArray.h" #include "nsCOMPtr.h" +#include "nsGUIEvent.h" /** * Common widget implementation used as base class for native diff --git a/mozilla/widget/src/xpwidgets/nsFileSpecWithUIImpl.cpp b/mozilla/widget/src/xpwidgets/nsFileSpecWithUIImpl.cpp index d2f838bfa9e..886308667c9 100644 --- a/mozilla/widget/src/xpwidgets/nsFileSpecWithUIImpl.cpp +++ b/mozilla/widget/src/xpwidgets/nsFileSpecWithUIImpl.cpp @@ -24,6 +24,7 @@ #include "nsFileSpecWithUIImpl.h" #include "nsWidgetsCID.h" +#include "nsIWidget.h" #include "nsIComponentManager.h" #include "nsIDOMWindowInternal.h" #include "nsIScriptGlobalObject.h" diff --git a/mozilla/xpcom/components/nsComponentManagerUtils.h b/mozilla/xpcom/components/nsComponentManagerUtils.h index 4dcf88f622f..049d7d05670 100644 --- a/mozilla/xpcom/components/nsComponentManagerUtils.h +++ b/mozilla/xpcom/components/nsComponentManagerUtils.h @@ -19,6 +19,11 @@ #ifndef nsComponentManagerUtils_h__ #define nsComponentManagerUtils_h__ +/* + * Do not include this file directly. Instead, + * |#include "nsIComponentManager.h"|. + */ + #ifndef nsCOMPtr_h__ #include "nsCOMPtr.h" #endif diff --git a/mozilla/xpcom/components/nsGenericFactory.cpp b/mozilla/xpcom/components/nsGenericFactory.cpp index d26f9cc8edb..7006d6ae2a2 100644 --- a/mozilla/xpcom/components/nsGenericFactory.cpp +++ b/mozilla/xpcom/components/nsGenericFactory.cpp @@ -26,6 +26,9 @@ #include "nsGenericFactory.h" #include "nsCRT.h" +#include "nsCOMPtr.h" +#include "nsIComponentManager.h" + nsGenericFactory::nsGenericFactory(nsModuleComponentInfo *info) : mInfo(info) { diff --git a/mozilla/xpcom/components/nsIComponentManager.idl b/mozilla/xpcom/components/nsIComponentManager.idl index 37dc305bcc0..ea430748185 100644 --- a/mozilla/xpcom/components/nsIComponentManager.idl +++ b/mozilla/xpcom/components/nsIComponentManager.idl @@ -18,9 +18,9 @@ #include "nsISupports.idl" #include "nsIFactory.idl" -#include "nsIEnumerator.idl" interface nsIFile; +interface nsIEnumerator; /* should this be in nsroot.idl? */ native nsCID(nsCID); diff --git a/mozilla/xpcom/components/nsIModule.idl b/mozilla/xpcom/components/nsIModule.idl index 4b7010b75ba..21da6720546 100644 --- a/mozilla/xpcom/components/nsIModule.idl +++ b/mozilla/xpcom/components/nsIModule.idl @@ -22,8 +22,9 @@ #include "nsISupports.idl" #include "nsIFactory.idl" -#include "nsIFile.idl" -#include "nsIComponentManager.idl" + +interface nsIFile; +interface nsIComponentManager; [scriptable, uuid(7392D032-5371-11d3-994E-00805FD26FEE)] interface nsIModule : nsISupports diff --git a/mozilla/xpcom/glue/nsComponentManagerUtils.h b/mozilla/xpcom/glue/nsComponentManagerUtils.h index 4dcf88f622f..049d7d05670 100644 --- a/mozilla/xpcom/glue/nsComponentManagerUtils.h +++ b/mozilla/xpcom/glue/nsComponentManagerUtils.h @@ -19,6 +19,11 @@ #ifndef nsComponentManagerUtils_h__ #define nsComponentManagerUtils_h__ +/* + * Do not include this file directly. Instead, + * |#include "nsIComponentManager.h"|. + */ + #ifndef nsCOMPtr_h__ #include "nsCOMPtr.h" #endif diff --git a/mozilla/xpcom/glue/nsGenericFactory.cpp b/mozilla/xpcom/glue/nsGenericFactory.cpp index d26f9cc8edb..7006d6ae2a2 100644 --- a/mozilla/xpcom/glue/nsGenericFactory.cpp +++ b/mozilla/xpcom/glue/nsGenericFactory.cpp @@ -26,6 +26,9 @@ #include "nsGenericFactory.h" #include "nsCRT.h" +#include "nsCOMPtr.h" +#include "nsIComponentManager.h" + nsGenericFactory::nsGenericFactory(nsModuleComponentInfo *info) : mInfo(info) { diff --git a/mozilla/xpcom/io/nsLocalFileUnix.cpp b/mozilla/xpcom/io/nsLocalFileUnix.cpp index eebf831d54e..98e2c602504 100644 --- a/mozilla/xpcom/io/nsLocalFileUnix.cpp +++ b/mozilla/xpcom/io/nsLocalFileUnix.cpp @@ -59,6 +59,7 @@ #include "nsIComponentManager.h" #include "nsXPIDLString.h" #include "prproces.h" +#include "nsISimpleEnumerator.h" // we need these for statfs() diff --git a/mozilla/xpcom/tests/nsIFileEnumerator.cpp b/mozilla/xpcom/tests/nsIFileEnumerator.cpp index ff4b82e14e6..6461b313093 100644 --- a/mozilla/xpcom/tests/nsIFileEnumerator.cpp +++ b/mozilla/xpcom/tests/nsIFileEnumerator.cpp @@ -5,6 +5,7 @@ #include "nsIServiceManager.h" #include "nsMemory.h" #include "nsXPIDLString.h" +#include "nsISimpleEnumerator.h" PRBool LoopInDir(nsILocalFile* file) diff --git a/mozilla/xpfe/appshell/src/nsAppShellService.cpp b/mozilla/xpfe/appshell/src/nsAppShellService.cpp index ea4ee99c975..0d9865e1dbb 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellService.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellService.cpp @@ -57,6 +57,7 @@ /* For implementing GetHiddenWindowAndJSContext */ #include "nsIScriptGlobalObject.h" +#include "nsIScriptContext.h" #include "jsapi.h" #include "nsAppShellService.h" diff --git a/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp b/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp index 0bf8835bd08..11033e469e8 100644 --- a/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp +++ b/mozilla/xpfe/appshell/src/nsContentTreeOwner.cpp @@ -26,6 +26,7 @@ // Helper Classes #include "nsIGenericFactory.h" +#include "nsIServiceManager.h" // Interfaces needed to be included #include "nsIDOMNode.h" diff --git a/mozilla/xpfe/appshell/src/nsInternetConfigService.cpp b/mozilla/xpfe/appshell/src/nsInternetConfigService.cpp index 401cee3d3fc..53cd48e0cc0 100644 --- a/mozilla/xpfe/appshell/src/nsInternetConfigService.cpp +++ b/mozilla/xpfe/appshell/src/nsInternetConfigService.cpp @@ -25,7 +25,6 @@ #include "nsIMIMEInfo.h" #include "nsIFactory.h" #include "nsIComponentManager.h" -#include "nsComponentManagerUtils.h" #include "nsLocalFileMac.h" #include "nsIURL.h" #include "nsXPIDLString.h" diff --git a/mozilla/xpfe/appshell/src/nsMacMIMEDataSource.cpp b/mozilla/xpfe/appshell/src/nsMacMIMEDataSource.cpp index 4d264f99f85..7f3b9b76fa4 100644 --- a/mozilla/xpfe/appshell/src/nsMacMIMEDataSource.cpp +++ b/mozilla/xpfe/appshell/src/nsMacMIMEDataSource.cpp @@ -22,6 +22,8 @@ #include "nsMacMIMEDataSource.h" #include "nsString.h" +#include "nsIComponentManager.h" +#include "nsIMIMEInfo.h" #include diff --git a/mozilla/xpfe/appshell/src/nsWindowMediator.cpp b/mozilla/xpfe/appshell/src/nsWindowMediator.cpp index 2817ae76ae1..2a0223c0fb2 100644 --- a/mozilla/xpfe/appshell/src/nsWindowMediator.cpp +++ b/mozilla/xpfe/appshell/src/nsWindowMediator.cpp @@ -27,6 +27,7 @@ #include "nsVoidArray.h" #include "rdf.h" #include "nsIBaseWindow.h" +#include "nsIWidget.h" #include "nsIDOMWindow.h" #include "nsIDOMWindowInternal.h" #include "nsIDOMElement.h" diff --git a/mozilla/xpfe/appshell/src/nsXULWindow.cpp b/mozilla/xpfe/appshell/src/nsXULWindow.cpp index 623bb637cb5..53c0f6bee4a 100644 --- a/mozilla/xpfe/appshell/src/nsXULWindow.cpp +++ b/mozilla/xpfe/appshell/src/nsXULWindow.cpp @@ -55,6 +55,7 @@ #include "nsIPref.h" #include "nsIScriptGlobalObject.h" #include "nsIWindowWatcher.h" +#include "nsIURI.h" #include "nsIDOMDocumentView.h" #include "nsIDOMViewCSS.h" #include "nsIDOMCSSStyleDeclaration.h" diff --git a/mozilla/xpfe/appshell/src/nsXULWindow.h b/mozilla/xpfe/appshell/src/nsXULWindow.h index 37f4eef307f..0504048bafa 100644 --- a/mozilla/xpfe/appshell/src/nsXULWindow.h +++ b/mozilla/xpfe/appshell/src/nsXULWindow.h @@ -44,6 +44,7 @@ #include "nsIXULWindow.h" #include "nsIPrompt.h" #include "nsIAuthPrompt.h" +#include "nsGUIEvent.h" // nsXULWindow diff --git a/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp b/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp index ddd0a418145..17fa86107ad 100644 --- a/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp +++ b/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp @@ -40,6 +40,7 @@ #include "nsIScriptGlobalObject.h" #include "nsIDocShell.h" #include "nsIBaseWindow.h" +#include "nsIWidget.h" #include "nsIAppShellService.h" #include "nsIProfileInternal.h" #include "rdf.h" diff --git a/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.h b/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.h index 27a462314e3..3c46ab68ce7 100644 --- a/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.h +++ b/mozilla/xpfe/components/autocomplete/src/nsAutoComplete.h @@ -25,6 +25,7 @@ #ifndef nsAutoComplete_h___ #define nsAutoComplete_h___ +#include "nsCOMPtr.h" #include "nslayout.h" #include "nsString.h" #include "nsIDOMHTMLInputElement.h" diff --git a/mozilla/xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp b/mozilla/xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp index 658be4dbd03..39f2aa99b76 100644 --- a/mozilla/xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp +++ b/mozilla/xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp @@ -36,6 +36,7 @@ #include "nsIStringBundle.h" #include "nsIFilePicker.h" #include "nsIPref.h" +#include "nsILocalFile.h" #include "nsISupportsArray.h" #include "nsISupportsPrimitives.h"