diff --git a/mozilla/content/base/src/nsContentAreaDragDrop.cpp b/mozilla/content/base/src/nsContentAreaDragDrop.cpp index f80dfd95738..464fc3b38ff 100644 --- a/mozilla/content/base/src/nsContentAreaDragDrop.cpp +++ b/mozilla/content/base/src/nsContentAreaDragDrop.cpp @@ -70,6 +70,7 @@ #include "nsIDragService.h" #include "nsIDragSession.h" #include "nsComponentManagerUtils.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIServiceManagerUtils.h" #include "nsPromiseFlatString.h" diff --git a/mozilla/content/base/src/nsContentPolicy.cpp b/mozilla/content/base/src/nsContentPolicy.cpp index ea906cb371f..2cac5692069 100644 --- a/mozilla/content/base/src/nsContentPolicy.cpp +++ b/mozilla/content/base/src/nsContentPolicy.cpp @@ -20,6 +20,7 @@ */ #include "nsISupports.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsXPIDLString.h" #include "nsContentPolicyUtils.h" diff --git a/mozilla/content/base/src/nsCopySupport.cpp b/mozilla/content/base/src/nsCopySupport.cpp index 3b65972e125..5041ed52941 100644 --- a/mozilla/content/base/src/nsCopySupport.cpp +++ b/mozilla/content/base/src/nsCopySupport.cpp @@ -48,6 +48,7 @@ #include "nsIPresContext.h" #include "nsIDOMNSHTMLInputElement.h" #include "nsIDOMNSHTMLTextAreaElement.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIDOMRange.h" diff --git a/mozilla/content/base/src/nsDocumentViewer.cpp b/mozilla/content/base/src/nsDocumentViewer.cpp index 3fa6cbfd5dd..34b25bbdb01 100644 --- a/mozilla/content/base/src/nsDocumentViewer.cpp +++ b/mozilla/content/base/src/nsDocumentViewer.cpp @@ -141,6 +141,7 @@ #include "nsIServiceManager.h" #include "nsHTMLAtoms.h" // XXX until atoms get factored into nsLayoutAtoms #include "nsISimpleEnumerator.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID); diff --git a/mozilla/content/base/src/nsPrintEngine.cpp b/mozilla/content/base/src/nsPrintEngine.cpp index 6a448a44788..6d6b9ca1cb7 100644 --- a/mozilla/content/base/src/nsPrintEngine.cpp +++ b/mozilla/content/base/src/nsPrintEngine.cpp @@ -56,6 +56,7 @@ #include "nsIServiceManager.h" #include "nsHTMLAtoms.h" // XXX until atoms get factored into nsLayoutAtoms #include "nsISimpleEnumerator.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID); diff --git a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp index b7a53a71c62..c28950a48d7 100644 --- a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp @@ -69,6 +69,7 @@ // PresState #include "nsVoidArray.h" #include "nsISupportsArray.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIPresState.h" #include "nsIComponentManager.h" diff --git a/mozilla/dom/src/base/nsDOMClassInfo.cpp b/mozilla/dom/src/base/nsDOMClassInfo.cpp index b55b04becd7..d0c25f4361f 100644 --- a/mozilla/dom/src/base/nsDOMClassInfo.cpp +++ b/mozilla/dom/src/base/nsDOMClassInfo.cpp @@ -43,6 +43,7 @@ #include "nsIServiceManager.h" #include "nsICategoryManager.h" #include "nsIComponentRegistrar.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIXPConnect.h" #include "nsIJSContextStack.h" diff --git a/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp b/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp index bbc3cf97aff..3235b18cfca 100644 --- a/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp +++ b/mozilla/dom/src/base/nsScriptNameSpaceManager.cpp @@ -41,6 +41,7 @@ #include "nsIComponentManager.h" #include "nsICategoryManager.h" #include "nsIServiceManager.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIScriptExternalNameSet.h" #include "nsIScriptNameSpaceManager.h" diff --git a/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp b/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp index bbc3cf97aff..3235b18cfca 100644 --- a/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp +++ b/mozilla/dom/src/build/nsScriptNameSpaceManager.cpp @@ -41,6 +41,7 @@ #include "nsIComponentManager.h" #include "nsICategoryManager.h" #include "nsIServiceManager.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIScriptExternalNameSet.h" #include "nsIScriptNameSpaceManager.h" diff --git a/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp b/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp index d8e94b27c1f..804212727eb 100644 --- a/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLDataTransfer.cpp @@ -100,6 +100,7 @@ #include "nsIImage.h" #include "nsAOLCiter.h" #include "nsInternetCiter.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" // netwerk diff --git a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp index 4979c2706aa..e5669848e92 100644 --- a/mozilla/editor/libeditor/html/nsHTMLEditor.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLEditor.cpp @@ -108,6 +108,7 @@ #include "nsIImage.h" #include "nsAOLCiter.h" #include "nsInternetCiter.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "SetDocTitleTxn.h" #include "nsGUIEvent.h" diff --git a/mozilla/editor/libeditor/html/nsHTMLEditorStyle.cpp b/mozilla/editor/libeditor/html/nsHTMLEditorStyle.cpp index d8de90868d4..d6cd0712c58 100644 --- a/mozilla/editor/libeditor/html/nsHTMLEditorStyle.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLEditorStyle.cpp @@ -96,6 +96,7 @@ #include "nsIImage.h" #include "nsAOLCiter.h" #include "nsInternetCiter.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "InsertTextTxn.h" #include "ChangeCSSInlineStyleTxn.h" diff --git a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp index fd1e18fecd0..098b788c190 100644 --- a/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp +++ b/mozilla/editor/libeditor/text/nsEditorEventListeners.cpp @@ -78,6 +78,7 @@ #include "nsIFormatConverter.h" #include "nsIContentIterator.h" #include "nsIContent.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsLayoutCID.h" #include "nsIDOMNSRange.h" diff --git a/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp b/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp index f2a5a51b1bf..9d89622d7a7 100644 --- a/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp +++ b/mozilla/editor/libeditor/text/nsPlaintextDataTransfer.cpp @@ -94,6 +94,7 @@ #include "nsIImage.h" #include "nsAOLCiter.h" #include "nsInternetCiter.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" // netwerk diff --git a/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp b/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp index e267287418c..ecd3247552a 100644 --- a/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp +++ b/mozilla/editor/libeditor/text/nsPlaintextEditor.cpp @@ -88,6 +88,7 @@ #include "nsIParser.h" #include "nsParserCIID.h" #include "nsIImage.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" // netwerk diff --git a/mozilla/embedding/components/appstartup/src/nsAppStartupNotifier.cpp b/mozilla/embedding/components/appstartup/src/nsAppStartupNotifier.cpp index 5195011787e..6a7d113d834 100644 --- a/mozilla/embedding/components/appstartup/src/nsAppStartupNotifier.cpp +++ b/mozilla/embedding/components/appstartup/src/nsAppStartupNotifier.cpp @@ -41,6 +41,7 @@ #include "nsXPIDLString.h" #include "nsIServiceManager.h" #include "nsICategoryManager.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsAppStartupNotifier.h" diff --git a/mozilla/embedding/components/commandhandler/src/nsCommandGroup.cpp b/mozilla/embedding/components/commandhandler/src/nsCommandGroup.cpp index 0d097f5b290..0200ad43425 100644 --- a/mozilla/embedding/components/commandhandler/src/nsCommandGroup.cpp +++ b/mozilla/embedding/components/commandhandler/src/nsCommandGroup.cpp @@ -40,6 +40,7 @@ #include "nsReadableUtils.h" #include "nsVoidArray.h" #include "nsISimpleEnumerator.h" +#include "nsXPCOM.h" #include "nsSupportsPrimitives.h" #include "nsIComponentManager.h" diff --git a/mozilla/embedding/components/printingui/src/mac/nsPrintProgress.cpp b/mozilla/embedding/components/printingui/src/mac/nsPrintProgress.cpp index 5d0f6829b30..e85517c01b4 100644 --- a/mozilla/embedding/components/printingui/src/mac/nsPrintProgress.cpp +++ b/mozilla/embedding/components/printingui/src/mac/nsPrintProgress.cpp @@ -41,6 +41,7 @@ #include "nsIBaseWindow.h" #include "nsISupportsArray.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" diff --git a/mozilla/embedding/components/printingui/src/os2/nsPrintProgress.cpp b/mozilla/embedding/components/printingui/src/os2/nsPrintProgress.cpp index 0910c6c4079..adb5ebc15ec 100644 --- a/mozilla/embedding/components/printingui/src/os2/nsPrintProgress.cpp +++ b/mozilla/embedding/components/printingui/src/os2/nsPrintProgress.cpp @@ -41,6 +41,7 @@ #include "nsIBaseWindow.h" #include "nsISupportsArray.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" diff --git a/mozilla/embedding/components/printingui/src/unixshared/nsPrintProgress.cpp b/mozilla/embedding/components/printingui/src/unixshared/nsPrintProgress.cpp index 17cb096e8f5..91b4b79d88c 100644 --- a/mozilla/embedding/components/printingui/src/unixshared/nsPrintProgress.cpp +++ b/mozilla/embedding/components/printingui/src/unixshared/nsPrintProgress.cpp @@ -41,6 +41,7 @@ #include "nsIBaseWindow.h" #include "nsISupportsArray.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" diff --git a/mozilla/embedding/components/printingui/src/win/nsPrintProgress.cpp b/mozilla/embedding/components/printingui/src/win/nsPrintProgress.cpp index b7c0c9eb1c8..939ebf8e6e7 100644 --- a/mozilla/embedding/components/printingui/src/win/nsPrintProgress.cpp +++ b/mozilla/embedding/components/printingui/src/win/nsPrintProgress.cpp @@ -41,6 +41,7 @@ #include "nsIBaseWindow.h" #include "nsISupportsArray.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" #include "nsIServiceManager.h" diff --git a/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp b/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp index 6f6277ecfb8..61de8c84642 100644 --- a/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp +++ b/mozilla/embedding/components/windowwatcher/src/nsWindowWatcher.cpp @@ -67,6 +67,7 @@ #include "nsIScriptGlobalObject.h" #include "nsIScriptSecurityManager.h" #include "nsISupportsArray.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIURI.h" #include "nsIWebBrowser.h" diff --git a/mozilla/extensions/python/xpcom/src/TypeObject.cpp b/mozilla/extensions/python/xpcom/src/TypeObject.cpp index a710e788950..b8e2d871bf9 100644 --- a/mozilla/extensions/python/xpcom/src/TypeObject.cpp +++ b/mozilla/extensions/python/xpcom/src/TypeObject.cpp @@ -29,6 +29,7 @@ #include "PyXPCOM_std.h" #include +#include #include diff --git a/mozilla/extensions/python/xpcom/src/xpcom.cpp b/mozilla/extensions/python/xpcom/src/xpcom.cpp index 244fc42f7e3..0ee569e534d 100644 --- a/mozilla/extensions/python/xpcom/src/xpcom.cpp +++ b/mozilla/extensions/python/xpcom/src/xpcom.cpp @@ -31,6 +31,7 @@ #include "nsIFileSpec.h" #include "nsSpecialSystemDirectory.h" #include "nsIThread.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIModule.h" diff --git a/mozilla/extensions/webservices/soap/src/nsDefaultSOAPEncoder.cpp b/mozilla/extensions/webservices/soap/src/nsDefaultSOAPEncoder.cpp index 2590bebad9c..d36a29b333b 100644 --- a/mozilla/extensions/webservices/soap/src/nsDefaultSOAPEncoder.cpp +++ b/mozilla/extensions/webservices/soap/src/nsDefaultSOAPEncoder.cpp @@ -47,6 +47,7 @@ #include "nsISchema.h" #include "nsIComponentManager.h" #include "nsIServiceManager.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIDOMParser.h" #include "nsSOAPUtils.h" diff --git a/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp b/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp index b5c41530b10..704003ad268 100644 --- a/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp +++ b/mozilla/extensions/xmlextras/base/src/nsXMLHttpRequest.cpp @@ -55,6 +55,7 @@ #include "nsNetUtil.h" #include "nsIUploadChannel.h" #include "nsIDOMSerializer.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIDOMEventReceiver.h" #include "nsIEventListenerManager.h" diff --git a/mozilla/extensions/xmlextras/soap/src/nsDefaultSOAPEncoder.cpp b/mozilla/extensions/xmlextras/soap/src/nsDefaultSOAPEncoder.cpp index 2590bebad9c..d36a29b333b 100644 --- a/mozilla/extensions/xmlextras/soap/src/nsDefaultSOAPEncoder.cpp +++ b/mozilla/extensions/xmlextras/soap/src/nsDefaultSOAPEncoder.cpp @@ -47,6 +47,7 @@ #include "nsISchema.h" #include "nsIComponentManager.h" #include "nsIServiceManager.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIDOMParser.h" #include "nsSOAPUtils.h" diff --git a/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp b/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp index 66685712a6f..2a0f99c0423 100644 --- a/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp +++ b/mozilla/extensions/xmlterm/base/mozXMLTerminal.cpp @@ -47,6 +47,7 @@ #include "nsIDOMEventListener.h" #include "nsIServiceManager.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsWidgetsCID.h" diff --git a/mozilla/gfx/src/nsFontList.cpp b/mozilla/gfx/src/nsFontList.cpp index feb26f80673..6b4f9d99a71 100644 --- a/mozilla/gfx/src/nsFontList.cpp +++ b/mozilla/gfx/src/nsFontList.cpp @@ -27,6 +27,7 @@ */ #include "nsCOMPtr.h" +#include "nsXPCOM.h" #include "nsFontList.h" #include "nsGfxCIID.h" #include "nsDependentString.h" diff --git a/mozilla/gfx/src/nsPrintOptionsImpl.cpp b/mozilla/gfx/src/nsPrintOptionsImpl.cpp index fbc85e2b2c4..465b94cc8d4 100644 --- a/mozilla/gfx/src/nsPrintOptionsImpl.cpp +++ b/mozilla/gfx/src/nsPrintOptionsImpl.cpp @@ -46,6 +46,7 @@ #include "nsIDOMWindow.h" #include "nsIServiceManager.h" #include "nsIDialogParamBlock.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIWindowWatcher.h" #include "nsIDOMWindowInternal.h" diff --git a/mozilla/intl/strres/src/nsStringBundle.cpp b/mozilla/intl/strres/src/nsStringBundle.cpp index 1cd8d6c1c25..478231567ed 100644 --- a/mozilla/intl/strres/src/nsStringBundle.cpp +++ b/mozilla/intl/strres/src/nsStringBundle.cpp @@ -42,6 +42,7 @@ #include "nsReadableUtils.h" #include "nsIPersistentProperties2.h" #include "nsIStringBundle.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nscore.h" #include "nsMemory.h" diff --git a/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp b/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp index e8aa496f20b..554b9e85171 100644 --- a/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp +++ b/mozilla/intl/uconv/src/nsCharsetConverterManager.cpp @@ -52,6 +52,7 @@ #include "prmem.h" #include "nsCRT.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsICharsetDetector.h" diff --git a/mozilla/js/src/xpconnect/src/xpcprivate.h b/mozilla/js/src/xpconnect/src/xpcprivate.h index ec73dcb7587..92957ac2f89 100644 --- a/mozilla/js/src/xpconnect/src/xpcprivate.h +++ b/mozilla/js/src/xpconnect/src/xpcprivate.h @@ -51,6 +51,7 @@ #include "nsIClassInfo.h" #include "nsIComponentManager.h" #include "nsIComponentRegistrar.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIGenericFactory.h" #include "nsMemory.h" diff --git a/mozilla/layout/base/nsDocumentViewer.cpp b/mozilla/layout/base/nsDocumentViewer.cpp index 3fa6cbfd5dd..34b25bbdb01 100644 --- a/mozilla/layout/base/nsDocumentViewer.cpp +++ b/mozilla/layout/base/nsDocumentViewer.cpp @@ -141,6 +141,7 @@ #include "nsIServiceManager.h" #include "nsHTMLAtoms.h" // XXX until atoms get factored into nsLayoutAtoms #include "nsISimpleEnumerator.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID); diff --git a/mozilla/layout/base/nsPresShell.cpp b/mozilla/layout/base/nsPresShell.cpp index ec4d2d48abc..7c3959918f9 100644 --- a/mozilla/layout/base/nsPresShell.cpp +++ b/mozilla/layout/base/nsPresShell.cpp @@ -93,6 +93,7 @@ #include "nsIDOMNSHTMLTextAreaElement.h" #include "nsViewsCID.h" #include "nsIFrameManager.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsILayoutHistoryState.h" #include "nsIScrollPositionListener.h" diff --git a/mozilla/layout/base/nsPresState.cpp b/mozilla/layout/base/nsPresState.cpp index 0f6c9bd595f..177f269551f 100644 --- a/mozilla/layout/base/nsPresState.cpp +++ b/mozilla/layout/base/nsPresState.cpp @@ -1,6 +1,7 @@ #include "nsCOMPtr.h" #include "nsIPresState.h" #include "nsHashtable.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" #include "nsXPIDLString.h" diff --git a/mozilla/layout/base/src/nsCopySupport.cpp b/mozilla/layout/base/src/nsCopySupport.cpp index 3b65972e125..5041ed52941 100644 --- a/mozilla/layout/base/src/nsCopySupport.cpp +++ b/mozilla/layout/base/src/nsCopySupport.cpp @@ -48,6 +48,7 @@ #include "nsIPresContext.h" #include "nsIDOMNSHTMLInputElement.h" #include "nsIDOMNSHTMLTextAreaElement.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIDOMRange.h" diff --git a/mozilla/layout/base/src/nsPresState.cpp b/mozilla/layout/base/src/nsPresState.cpp index 0f6c9bd595f..177f269551f 100644 --- a/mozilla/layout/base/src/nsPresState.cpp +++ b/mozilla/layout/base/src/nsPresState.cpp @@ -1,6 +1,7 @@ #include "nsCOMPtr.h" #include "nsIPresState.h" #include "nsHashtable.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" #include "nsXPIDLString.h" diff --git a/mozilla/layout/forms/nsComboboxControlFrame.cpp b/mozilla/layout/forms/nsComboboxControlFrame.cpp index 6fe9e10f7ea..fecb2b6a37b 100644 --- a/mozilla/layout/forms/nsComboboxControlFrame.cpp +++ b/mozilla/layout/forms/nsComboboxControlFrame.cpp @@ -63,6 +63,7 @@ #include "nsIPrivateDOMEvent.h" #include "nsISupportsArray.h" #include "nsISelectControlFrame.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" #include "nsITextContent.h" diff --git a/mozilla/layout/forms/nsFileControlFrame.cpp b/mozilla/layout/forms/nsFileControlFrame.cpp index fdb12d44ca4..b437c4f4bce 100644 --- a/mozilla/layout/forms/nsFileControlFrame.cpp +++ b/mozilla/layout/forms/nsFileControlFrame.cpp @@ -61,6 +61,7 @@ #include "nsIDOMMouseListener.h" #include "nsIPresShell.h" #include "nsIDOMHTMLInputElement.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" #include "nsIDOMWindowInternal.h" diff --git a/mozilla/layout/forms/nsIsIndexFrame.cpp b/mozilla/layout/forms/nsIsIndexFrame.cpp index a193371a7ce..c9a7af24fa4 100644 --- a/mozilla/layout/forms/nsIsIndexFrame.cpp +++ b/mozilla/layout/forms/nsIsIndexFrame.cpp @@ -58,6 +58,7 @@ #include "nsIPresShell.h" #include "nsIDOMHTMLInputElement.h" #include "nsIStatefulFrame.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" #include "nsITextContent.h" diff --git a/mozilla/layout/forms/nsListControlFrame.cpp b/mozilla/layout/forms/nsListControlFrame.cpp index ed121951bd8..8abd4ea3a90 100644 --- a/mozilla/layout/forms/nsListControlFrame.cpp +++ b/mozilla/layout/forms/nsListControlFrame.cpp @@ -66,6 +66,7 @@ #include "nsIDOMKeyEvent.h" #include "nsIDOMMouseEvent.h" #include "nsIPrivateDOMEvent.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" #include "nsILookAndFeel.h" diff --git a/mozilla/layout/html/base/src/nsPresShell.cpp b/mozilla/layout/html/base/src/nsPresShell.cpp index ec4d2d48abc..7c3959918f9 100644 --- a/mozilla/layout/html/base/src/nsPresShell.cpp +++ b/mozilla/layout/html/base/src/nsPresShell.cpp @@ -93,6 +93,7 @@ #include "nsIDOMNSHTMLTextAreaElement.h" #include "nsViewsCID.h" #include "nsIFrameManager.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsILayoutHistoryState.h" #include "nsIScrollPositionListener.h" diff --git a/mozilla/layout/html/base/src/nsScrollFrame.cpp b/mozilla/layout/html/base/src/nsScrollFrame.cpp index d5e4d94e3d8..49c553a4444 100644 --- a/mozilla/layout/html/base/src/nsScrollFrame.cpp +++ b/mozilla/layout/html/base/src/nsScrollFrame.cpp @@ -56,6 +56,7 @@ #include "nsIScrollable.h" #include "nsIStatefulFrame.h" #include "nsBoxLayoutState.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIPresState.h" diff --git a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp index 6fe9e10f7ea..fecb2b6a37b 100644 --- a/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsComboboxControlFrame.cpp @@ -63,6 +63,7 @@ #include "nsIPrivateDOMEvent.h" #include "nsISupportsArray.h" #include "nsISelectControlFrame.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" #include "nsITextContent.h" diff --git a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp index fdb12d44ca4..b437c4f4bce 100644 --- a/mozilla/layout/html/forms/src/nsFileControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsFileControlFrame.cpp @@ -61,6 +61,7 @@ #include "nsIDOMMouseListener.h" #include "nsIPresShell.h" #include "nsIDOMHTMLInputElement.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" #include "nsIDOMWindowInternal.h" diff --git a/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp b/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp index a193371a7ce..c9a7af24fa4 100644 --- a/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp +++ b/mozilla/layout/html/forms/src/nsIsIndexFrame.cpp @@ -58,6 +58,7 @@ #include "nsIPresShell.h" #include "nsIDOMHTMLInputElement.h" #include "nsIStatefulFrame.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" #include "nsITextContent.h" diff --git a/mozilla/layout/html/forms/src/nsListControlFrame.cpp b/mozilla/layout/html/forms/src/nsListControlFrame.cpp index ed121951bd8..8abd4ea3a90 100644 --- a/mozilla/layout/html/forms/src/nsListControlFrame.cpp +++ b/mozilla/layout/html/forms/src/nsListControlFrame.cpp @@ -66,6 +66,7 @@ #include "nsIDOMKeyEvent.h" #include "nsIDOMMouseEvent.h" #include "nsIPrivateDOMEvent.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" #include "nsILookAndFeel.h" diff --git a/mozilla/layout/printing/nsPrintEngine.cpp b/mozilla/layout/printing/nsPrintEngine.cpp index 6a448a44788..6d6b9ca1cb7 100644 --- a/mozilla/layout/printing/nsPrintEngine.cpp +++ b/mozilla/layout/printing/nsPrintEngine.cpp @@ -56,6 +56,7 @@ #include "nsIServiceManager.h" #include "nsHTMLAtoms.h" // XXX until atoms get factored into nsLayoutAtoms #include "nsISimpleEnumerator.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID); diff --git a/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp b/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp index 3d5e94a4abb..19651b4cefe 100644 --- a/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp +++ b/mozilla/layout/xul/base/src/nsScrollBoxFrame.cpp @@ -56,6 +56,7 @@ #include "nsBoxLayoutState.h" #include "nsIBoxToBlockAdaptor.h" #include "nsIScrollbarMediator.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIPresState.h" #include "nsButtonBoxFrame.h" diff --git a/mozilla/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp b/mozilla/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp index b3b83b242e9..aa3090daf23 100644 --- a/mozilla/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbLDAPAutoCompFormatter.cpp @@ -37,6 +37,7 @@ #include "nsLDAP.h" #include "nsReadableUtils.h" #include "nsIStringBundle.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIDNSService.h" diff --git a/mozilla/mailnews/addrbook/src/nsAbLDAPDirectory.cpp b/mozilla/mailnews/addrbook/src/nsAbLDAPDirectory.cpp index 56e3558ea7a..d3cf84401c0 100644 --- a/mozilla/mailnews/addrbook/src/nsAbLDAPDirectory.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbLDAPDirectory.cpp @@ -53,6 +53,7 @@ #include "nsNetCID.h" #include "nsIIOService.h" #include "nsIPref.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" nsAbLDAPDirectory::nsAbLDAPDirectory() : diff --git a/mozilla/mailnews/addrbook/src/nsAbView.cpp b/mozilla/mailnews/addrbook/src/nsAbView.cpp index f7cd574b25a..22c43b9a0a5 100644 --- a/mozilla/mailnews/addrbook/src/nsAbView.cpp +++ b/mozilla/mailnews/addrbook/src/nsAbView.cpp @@ -48,6 +48,7 @@ #include "nsCollationCID.h" #include "nsIAddrBookSession.h" #include "nsAbBaseCID.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIPrefService.h" diff --git a/mozilla/mailnews/base/src/nsMessengerBootstrap.cpp b/mozilla/mailnews/base/src/nsMessengerBootstrap.cpp index 6b085193f75..700a4b82b0a 100644 --- a/mozilla/mailnews/base/src/nsMessengerBootstrap.cpp +++ b/mozilla/mailnews/base/src/nsMessengerBootstrap.cpp @@ -48,6 +48,7 @@ #include "nsIMsgFolderCache.h" #include "nsIPref.h" #include "nsIDOMWindow.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIWindowWatcher.h" #include "nsString.h" diff --git a/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp b/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp index c387d246c93..bbdb7bb3357 100644 --- a/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp +++ b/mozilla/mailnews/base/src/nsMsgAccountManagerDS.cpp @@ -58,6 +58,7 @@ #include "nsMsgIncomingServer.h" #include "nsICategoryManager.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIPrefService.h" #include "nsIPrefBranchInternal.h" diff --git a/mozilla/mailnews/base/src/nsMsgProgress.cpp b/mozilla/mailnews/base/src/nsMsgProgress.cpp index d0ac3b27d6d..46b647ccf78 100644 --- a/mozilla/mailnews/base/src/nsMsgProgress.cpp +++ b/mozilla/mailnews/base/src/nsMsgProgress.cpp @@ -40,6 +40,7 @@ #include "nsIBaseWindow.h" #include "nsISupportsArray.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" diff --git a/mozilla/mailnews/compose/src/nsMsgComposeProgress.cpp b/mozilla/mailnews/compose/src/nsMsgComposeProgress.cpp index 6a100d9c139..e37c428a27a 100644 --- a/mozilla/mailnews/compose/src/nsMsgComposeProgress.cpp +++ b/mozilla/mailnews/compose/src/nsMsgComposeProgress.cpp @@ -44,6 +44,7 @@ #include "nsIDocShellTreeItem.h" #include "nsIDocShellTreeOwner.h" #include "nsISupportsArray.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" diff --git a/mozilla/mailnews/compose/src/nsMsgComposeService.cpp b/mozilla/mailnews/compose/src/nsMsgComposeService.cpp index 8ffe09d4d28..5859785801d 100644 --- a/mozilla/mailnews/compose/src/nsMsgComposeService.cpp +++ b/mozilla/mailnews/compose/src/nsMsgComposeService.cpp @@ -54,6 +54,7 @@ #include "nsMsgI18N.h" #include "nsIMsgDraft.h" #include "nsIMsgComposeParams.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIWindowWatcher.h" #include "nsIDOMWindow.h" diff --git a/mozilla/mailnews/import/comm4x/src/nsComm4xMailImport.cpp b/mozilla/mailnews/import/comm4x/src/nsComm4xMailImport.cpp index 0fde4e229db..6ed65ecc904 100644 --- a/mozilla/mailnews/import/comm4x/src/nsComm4xMailImport.cpp +++ b/mozilla/mailnews/import/comm4x/src/nsComm4xMailImport.cpp @@ -51,6 +51,7 @@ #include "nsIComponentManager.h" #include "nsComm4xMailImport.h" #include "nsIMemory.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIImportService.h" #include "nsIImportMailboxDescriptor.h" diff --git a/mozilla/mailnews/import/eudora/src/nsEudoraImport.cpp b/mozilla/mailnews/import/eudora/src/nsEudoraImport.cpp index 87f0f12ecce..9b55b17e68a 100644 --- a/mozilla/mailnews/import/eudora/src/nsEudoraImport.cpp +++ b/mozilla/mailnews/import/eudora/src/nsEudoraImport.cpp @@ -41,6 +41,7 @@ #include "nsIImportABDescriptor.h" #include "nsIImportSettings.h" #include "nsIImportFieldMap.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIOutputStream.h" #include "nsIAddrDatabase.h" diff --git a/mozilla/mailnews/import/oexpress/nsOEImport.cpp b/mozilla/mailnews/import/oexpress/nsOEImport.cpp index 746e6eddf09..cfec7f65401 100644 --- a/mozilla/mailnews/import/oexpress/nsOEImport.cpp +++ b/mozilla/mailnews/import/oexpress/nsOEImport.cpp @@ -59,6 +59,7 @@ #include "nsIImportAddressBooks.h" #include "nsIImportABDescriptor.h" #include "nsIImportFieldMap.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "WabObject.h" #include "nsOEAddressIterator.h" diff --git a/mozilla/mailnews/import/outlook/src/nsOutlookImport.cpp b/mozilla/mailnews/import/outlook/src/nsOutlookImport.cpp index 4489ab247c2..a82e0aad11f 100644 --- a/mozilla/mailnews/import/outlook/src/nsOutlookImport.cpp +++ b/mozilla/mailnews/import/outlook/src/nsOutlookImport.cpp @@ -58,6 +58,7 @@ #include "nsIImportAddressBooks.h" #include "nsIImportABDescriptor.h" #include "nsIImportFieldMap.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIOutputStream.h" #include "nsIAddrDatabase.h" diff --git a/mozilla/mailnews/import/src/nsImportAddressBooks.cpp b/mozilla/mailnews/import/src/nsImportAddressBooks.cpp index a245b7b6bb5..7f4fe792037 100644 --- a/mozilla/mailnews/import/src/nsImportAddressBooks.cpp +++ b/mozilla/mailnews/import/src/nsImportAddressBooks.cpp @@ -44,6 +44,7 @@ #include "nsISupportsArray.h" #include "nsIImportAddressBooks.h" #include "nsIImportGeneric.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIImportABDescriptor.h" #include "nsIImportFieldMap.h" diff --git a/mozilla/mailnews/import/src/nsImportMail.cpp b/mozilla/mailnews/import/src/nsImportMail.cpp index b5667bf8f8b..3bc198774e8 100644 --- a/mozilla/mailnews/import/src/nsImportMail.cpp +++ b/mozilla/mailnews/import/src/nsImportMail.cpp @@ -48,6 +48,7 @@ #include "nsIImportMail.h" #include "nsIImportGeneric.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIImportMailboxDescriptor.h" #include "nsCRT.h" diff --git a/mozilla/mailnews/import/src/nsImportService.cpp b/mozilla/mailnews/import/src/nsImportService.cpp index fef968d81da..c4b00be4489 100644 --- a/mozilla/mailnews/import/src/nsImportService.cpp +++ b/mozilla/mailnews/import/src/nsImportService.cpp @@ -56,6 +56,7 @@ #include "nsImportFieldMap.h" #include "nsICategoryManager.h" #include "nsXPIDLString.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsImportStringBundle.h" #include "plstr.h" diff --git a/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp b/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp index 684239c7ae9..c7eb52b8a24 100644 --- a/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp +++ b/mozilla/mailnews/news/src/nsNNTPNewsgroupList.cpp @@ -86,6 +86,7 @@ #include "nsIPref.h" #include "nsINewsDownloadDialogArgs.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIInterfaceRequestor.h" #include "nsIInterfaceRequestorUtils.h" diff --git a/mozilla/modules/libpr0n/src/imgLoader.cpp b/mozilla/modules/libpr0n/src/imgLoader.cpp index b518b5f4900..fad934115db 100644 --- a/mozilla/modules/libpr0n/src/imgLoader.cpp +++ b/mozilla/modules/libpr0n/src/imgLoader.cpp @@ -50,6 +50,7 @@ #ifdef DEBUG_pavlov #include "nsIEnumerator.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsXPIDLString.h" #include "nsComponentManagerUtils.h" diff --git a/mozilla/modules/libpref/src/nsPrefBranch.cpp b/mozilla/modules/libpref/src/nsPrefBranch.cpp index 01f98736d63..ed77bd643f2 100644 --- a/mozilla/modules/libpref/src/nsPrefBranch.cpp +++ b/mozilla/modules/libpref/src/nsPrefBranch.cpp @@ -40,6 +40,7 @@ #include "nsPrefBranch.h" #include "nsILocalFile.h" #include "nsIObserverService.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIDirectoryService.h" #include "nsString.h" diff --git a/mozilla/modules/libpref/src/nsPrefBranch.h b/mozilla/modules/libpref/src/nsPrefBranch.h index 3d60e0356e2..dfae55d3fea 100644 --- a/mozilla/modules/libpref/src/nsPrefBranch.h +++ b/mozilla/modules/libpref/src/nsPrefBranch.h @@ -44,6 +44,7 @@ #include "nsIPrefLocalizedString.h" #include "nsISecurityPref.h" #include "nsISupportsArray.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIRelativeFilePref.h" #include "nsILocalFile.h" diff --git a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp index 8a5c3954f07..a1131b4fe6f 100644 --- a/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -95,6 +95,7 @@ //#include "nsIRegistry.h" #include "nsEnumeratorUtils.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" // for the dialog #include "nsIStringBundle.h" diff --git a/mozilla/netwerk/base/src/nsIOService.cpp b/mozilla/netwerk/base/src/nsIOService.cpp index 39cb155b9ba..3267220e601 100644 --- a/mozilla/netwerk/base/src/nsIOService.cpp +++ b/mozilla/netwerk/base/src/nsIOService.cpp @@ -59,6 +59,7 @@ #include "nsIPrefLocalizedString.h" #include "nsICategoryManager.h" #include "nsIURLParser.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIProxiedProtocolHandler.h" #include "nsIProxyInfo.h" diff --git a/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp b/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp index f6f34b5d00d..9d36e380f47 100644 --- a/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp @@ -31,6 +31,7 @@ #include "nsIHttpAuthenticator.h" #include "nsIAuthPrompt.h" #include "nsIStringBundle.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIURL.h" #include "nsIMIMEService.h" diff --git a/mozilla/netwerk/protocol/http/src/nsHttpDigestAuth.cpp b/mozilla/netwerk/protocol/http/src/nsHttpDigestAuth.cpp index bf1c2e1b0c0..58d6b159c55 100644 --- a/mozilla/netwerk/protocol/http/src/nsHttpDigestAuth.cpp +++ b/mozilla/netwerk/protocol/http/src/nsHttpDigestAuth.cpp @@ -28,6 +28,7 @@ #include "nsHttpDigestAuth.h" #include "nsIHttpChannel.h" #include "nsIServiceManager.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIURI.h" #include "nsString.h" diff --git a/mozilla/netwerk/streamconv/converters/nsHTTPChunkConv.h b/mozilla/netwerk/streamconv/converters/nsHTTPChunkConv.h index ff20df06998..097ccef053d 100644 --- a/mozilla/netwerk/streamconv/converters/nsHTTPChunkConv.h +++ b/mozilla/netwerk/streamconv/converters/nsHTTPChunkConv.h @@ -45,6 +45,7 @@ #include "nsHashtable.h" #include "nsString.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #define NS_HTTPCHUNKCONVERTER_CID \ diff --git a/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp b/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp index 9d4bd33d8de..cf66eaefdcb 100644 --- a/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp +++ b/mozilla/netwerk/streamconv/src/nsStreamConverterService.cpp @@ -44,6 +44,7 @@ #include "nsIOutputStream.h" #include "nsIStreamConverter.h" #include "nsICategoryManager.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsXPIDLString.h" diff --git a/mozilla/netwerk/test/TestCacheService.cpp b/mozilla/netwerk/test/TestCacheService.cpp index c99c2f689d7..f28cdb1e2fd 100644 --- a/mozilla/netwerk/test/TestCacheService.cpp +++ b/mozilla/netwerk/test/TestCacheService.cpp @@ -33,6 +33,7 @@ #include "nsICacheEntryDescriptor.h" #include "nsICacheListener.h" #include "nsIDNSService.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsSupportsPrimitives.h" #include "nsIEventQueueService.h" diff --git a/mozilla/netwerk/test/TestPageLoad.cpp b/mozilla/netwerk/test/TestPageLoad.cpp index 575092e5eb1..b789cca27cc 100644 --- a/mozilla/netwerk/test/TestPageLoad.cpp +++ b/mozilla/netwerk/test/TestPageLoad.cpp @@ -43,6 +43,7 @@ #include "nsIProgressEventSink.h" #include "nsIComponentManager.h" #include "prprf.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsTimer.h" #include "prlong.h" diff --git a/mozilla/profile/src/nsProfile.cpp b/mozilla/profile/src/nsProfile.cpp index a14e37cd4b8..fa3d937153c 100644 --- a/mozilla/profile/src/nsProfile.cpp +++ b/mozilla/profile/src/nsProfile.cpp @@ -70,6 +70,7 @@ #include "nsIGenericFactory.h" #include "nsICookieService.h" #include "nsICategoryManager.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIDirectoryService.h" #include "nsDirectoryServiceDefs.h" diff --git a/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp index 76b097a6d06..1c167f65a00 100644 --- a/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp +++ b/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp @@ -34,6 +34,7 @@ #include "nsIProcess.h" #include "nsIPrefService.h" #include "nsIPrefBranch.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsHashtable.h" #include "nsCRT.h" diff --git a/mozilla/widget/src/beos/nsClipboard.cpp b/mozilla/widget/src/beos/nsClipboard.cpp index 682451a92e5..599e4b7e274 100644 --- a/mozilla/widget/src/beos/nsClipboard.cpp +++ b/mozilla/widget/src/beos/nsClipboard.cpp @@ -43,6 +43,7 @@ #include "nsWidgetsCID.h" #include "nsXPIDLString.h" #include "nsPrimitiveHelpers.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsString.h" diff --git a/mozilla/widget/src/cocoa/nsClipboard.cpp b/mozilla/widget/src/cocoa/nsClipboard.cpp index 0f76daa03ee..c82c77ed9a4 100644 --- a/mozilla/widget/src/cocoa/nsClipboard.cpp +++ b/mozilla/widget/src/cocoa/nsClipboard.cpp @@ -56,6 +56,7 @@ #include "nsMimeMapper.h" #include "nsIComponentManager.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsXPIDLString.h" #include "nsPrimitiveHelpers.h" diff --git a/mozilla/widget/src/cocoa/nsDragService.cpp b/mozilla/widget/src/cocoa/nsDragService.cpp index 7ecf74273b9..72f43db570b 100644 --- a/mozilla/widget/src/cocoa/nsDragService.cpp +++ b/mozilla/widget/src/cocoa/nsDragService.cpp @@ -52,6 +52,7 @@ #include "nsClipboard.h" #include "nsIRegion.h" #include "nsVoidArray.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsCOMPtr.h" #include "nsXPIDLString.h" diff --git a/mozilla/widget/src/gtk/nsClipboard.cpp b/mozilla/widget/src/gtk/nsClipboard.cpp index 6b9436d2530..42aec70e749 100644 --- a/mozilla/widget/src/gtk/nsClipboard.cpp +++ b/mozilla/widget/src/gtk/nsClipboard.cpp @@ -32,6 +32,7 @@ #include "nsFileSpec.h" #include "nsCRT.h" #include "nsISupportsArray.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsReadableUtils.h" diff --git a/mozilla/widget/src/gtk/nsDragService.cpp b/mozilla/widget/src/gtk/nsDragService.cpp index 56150252e10..ce8c455ddb6 100644 --- a/mozilla/widget/src/gtk/nsDragService.cpp +++ b/mozilla/widget/src/gtk/nsDragService.cpp @@ -23,6 +23,7 @@ #include "nsDragService.h" #include "nsWidgetsCID.h" #include "nsIServiceManager.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "prlog.h" #include "nsVoidArray.h" diff --git a/mozilla/widget/src/gtk2/nsDragService.cpp b/mozilla/widget/src/gtk2/nsDragService.cpp index b2a3fe892a8..e7cde284855 100644 --- a/mozilla/widget/src/gtk2/nsDragService.cpp +++ b/mozilla/widget/src/gtk2/nsDragService.cpp @@ -28,6 +28,7 @@ #include "nsDragService.h" #include "nsWidgetsCID.h" #include "nsIServiceManager.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "prlog.h" #include "nsVoidArray.h" diff --git a/mozilla/widget/src/mac/nsClipboard.cpp b/mozilla/widget/src/mac/nsClipboard.cpp index caabd2dc72d..04e868ab4a9 100644 --- a/mozilla/widget/src/mac/nsClipboard.cpp +++ b/mozilla/widget/src/mac/nsClipboard.cpp @@ -55,6 +55,7 @@ #include "nsMimeMapper.h" #include "nsIComponentManager.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsXPIDLString.h" #include "nsPrimitiveHelpers.h" diff --git a/mozilla/widget/src/mac/nsDragService.cpp b/mozilla/widget/src/mac/nsDragService.cpp index 98581792aa4..9cdc2080b55 100644 --- a/mozilla/widget/src/mac/nsDragService.cpp +++ b/mozilla/widget/src/mac/nsDragService.cpp @@ -52,6 +52,7 @@ #include "nsClipboard.h" #include "nsIRegion.h" #include "nsVoidArray.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsCOMPtr.h" #include "nsXPIDLString.h" diff --git a/mozilla/widget/src/os2/nsClipboard.cpp b/mozilla/widget/src/os2/nsClipboard.cpp index a1d862177ec..0e4d33f6b1e 100644 --- a/mozilla/widget/src/os2/nsClipboard.cpp +++ b/mozilla/widget/src/os2/nsClipboard.cpp @@ -24,6 +24,7 @@ #include "nsClipboard.h" #include "nsVoidArray.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsCOMPtr.h" #include "nsPrimitiveHelpers.h" diff --git a/mozilla/widget/src/os2/nsDragService.cpp b/mozilla/widget/src/os2/nsDragService.cpp index 8de0bd2bec2..0e441d40e26 100644 --- a/mozilla/widget/src/os2/nsDragService.cpp +++ b/mozilla/widget/src/os2/nsDragService.cpp @@ -35,6 +35,7 @@ * ***** END LICENSE BLOCK ***** */ #include "nsDragService.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsString.h" #include "nsXPIDLString.h" diff --git a/mozilla/widget/src/photon/nsClipboard.cpp b/mozilla/widget/src/photon/nsClipboard.cpp index f6a65410aff..6760e898e98 100644 --- a/mozilla/widget/src/photon/nsClipboard.cpp +++ b/mozilla/widget/src/photon/nsClipboard.cpp @@ -31,6 +31,7 @@ #include "nsFileSpec.h" #include "nsCRT.h" #include "nsISupportsArray.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsReadableUtils.h" diff --git a/mozilla/widget/src/photon/nsDragService.cpp b/mozilla/widget/src/photon/nsDragService.cpp index 38f45e8bc68..ff2d89af4b8 100644 --- a/mozilla/widget/src/photon/nsDragService.cpp +++ b/mozilla/widget/src/photon/nsDragService.cpp @@ -41,6 +41,7 @@ #include "nsClipboard.h" #include "nsIRegion.h" #include "nsVoidArray.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsPrimitiveHelpers.h" #include "nsCOMPtr.h" diff --git a/mozilla/widget/src/qt/nsClipboard.cpp b/mozilla/widget/src/qt/nsClipboard.cpp index 2c9796ca2df..e9c00bfe5a0 100644 --- a/mozilla/widget/src/qt/nsClipboard.cpp +++ b/mozilla/widget/src/qt/nsClipboard.cpp @@ -48,6 +48,7 @@ #include "nsCRT.h" #include "nsString.h" #include "nsISupportsArray.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsXPIDLString.h" #include "nsPrimitiveHelpers.h" diff --git a/mozilla/widget/src/qt/nsDragService.cpp b/mozilla/widget/src/qt/nsDragService.cpp index fc6dd32fdf4..e82c764b1b5 100644 --- a/mozilla/widget/src/qt/nsDragService.cpp +++ b/mozilla/widget/src/qt/nsDragService.cpp @@ -43,6 +43,7 @@ #include "nsDragService.h" #include "nsIServiceManager.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsCOMPtr.h" #include "nsXPIDLString.h" diff --git a/mozilla/widget/src/qt/nsMime.cpp b/mozilla/widget/src/qt/nsMime.cpp index f6e860c2ce2..766dcbf8ea3 100644 --- a/mozilla/widget/src/qt/nsMime.cpp +++ b/mozilla/widget/src/qt/nsMime.cpp @@ -39,6 +39,7 @@ #include "nsDragService.h" #include "nsIServiceManager.h" #include "nsWidget.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsXPIDLString.h" #include "nsPrimitiveHelpers.h" diff --git a/mozilla/widget/src/windows/nsClipboard.cpp b/mozilla/widget/src/windows/nsClipboard.cpp index a7ffa2778e4..c5ced677503 100644 --- a/mozilla/widget/src/windows/nsClipboard.cpp +++ b/mozilla/widget/src/windows/nsClipboard.cpp @@ -49,6 +49,7 @@ #include "nsIFormatConverter.h" #include "nsITransferable.h" #include "nsCOMPtr.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsXPIDLString.h" #include "nsReadableUtils.h" diff --git a/mozilla/widget/src/windows/nsDataObj.cpp b/mozilla/widget/src/windows/nsDataObj.cpp index f805706cda3..5238e2d2574 100644 --- a/mozilla/widget/src/windows/nsDataObj.cpp +++ b/mozilla/widget/src/windows/nsDataObj.cpp @@ -43,6 +43,7 @@ #include "nsReadableUtils.h" #include "nsVoidArray.h" #include "nsITransferable.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "IENUMFE.h" #include "nsCOMPtr.h" diff --git a/mozilla/widget/src/xlib/nsClipboard.cpp b/mozilla/widget/src/xlib/nsClipboard.cpp index 3193a0271ea..4de5f6fabe0 100644 --- a/mozilla/widget/src/xlib/nsClipboard.cpp +++ b/mozilla/widget/src/xlib/nsClipboard.cpp @@ -49,6 +49,7 @@ #include "nsFileSpec.h" #include "nsCRT.h" #include "nsISupportsArray.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIComponentManager.h" diff --git a/mozilla/widget/src/xlib/nsDragService.cpp b/mozilla/widget/src/xlib/nsDragService.cpp index 6dcaaf3f6d6..d5a80769cfb 100644 --- a/mozilla/widget/src/xlib/nsDragService.cpp +++ b/mozilla/widget/src/xlib/nsDragService.cpp @@ -29,6 +29,7 @@ #include "nsIServiceManager.h" #include "nsVoidArray.h" #include "nsXPIDLString.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsPrimitiveHelpers.h" #include "nsString.h" diff --git a/mozilla/widget/src/xpwidgets/nsBaseClipboard.cpp b/mozilla/widget/src/xpwidgets/nsBaseClipboard.cpp index 2f4ea1118cb..0d6df9481e5 100644 --- a/mozilla/widget/src/xpwidgets/nsBaseClipboard.cpp +++ b/mozilla/widget/src/xpwidgets/nsBaseClipboard.cpp @@ -43,6 +43,7 @@ #include "nsIWidget.h" #include "nsIComponentManager.h" #include "nsCOMPtr.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" diff --git a/mozilla/widget/src/xpwidgets/nsBaseDragService.cpp b/mozilla/widget/src/xpwidgets/nsBaseDragService.cpp index d7a40f438b8..583223445be 100644 --- a/mozilla/widget/src/xpwidgets/nsBaseDragService.cpp +++ b/mozilla/widget/src/xpwidgets/nsBaseDragService.cpp @@ -43,6 +43,7 @@ #include "nsISupportsArray.h" #include "nsSize.h" #include "nsIRegion.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsCOMPtr.h" #include "nsIFrame.h" diff --git a/mozilla/widget/src/xpwidgets/nsClipboardHelper.cpp b/mozilla/widget/src/xpwidgets/nsClipboardHelper.cpp index 3b556b57cfa..f9cd6633300 100644 --- a/mozilla/widget/src/xpwidgets/nsClipboardHelper.cpp +++ b/mozilla/widget/src/xpwidgets/nsClipboardHelper.cpp @@ -27,6 +27,7 @@ // basics #include "nsCOMPtr.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIServiceManager.h" diff --git a/mozilla/widget/src/xpwidgets/nsHTMLFormatConverter.cpp b/mozilla/widget/src/xpwidgets/nsHTMLFormatConverter.cpp index 1cb3397b8b9..eab978a22af 100644 --- a/mozilla/widget/src/xpwidgets/nsHTMLFormatConverter.cpp +++ b/mozilla/widget/src/xpwidgets/nsHTMLFormatConverter.cpp @@ -41,6 +41,7 @@ #include "nsISupportsArray.h" #include "nsIComponentManager.h" #include "nsCOMPtr.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsXPIDLString.h" diff --git a/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp b/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp index cf50563d69a..d386be6a8e8 100644 --- a/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp +++ b/mozilla/widget/src/xpwidgets/nsPrimitiveHelpers.cpp @@ -38,6 +38,7 @@ #include "nsPrimitiveHelpers.h" #include "nsCOMPtr.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsITransferable.h" #include "nsIComponentManager.h" diff --git a/mozilla/widget/src/xpwidgets/nsTransferable.cpp b/mozilla/widget/src/xpwidgets/nsTransferable.cpp index d879a8ad43f..08275b390e6 100644 --- a/mozilla/widget/src/xpwidgets/nsTransferable.cpp +++ b/mozilla/widget/src/xpwidgets/nsTransferable.cpp @@ -55,6 +55,7 @@ Notes to self: #include "nsVoidArray.h" #include "nsIComponentManager.h" #include "nsCOMPtr.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsMemory.h" #include "nsPrimitiveHelpers.h" diff --git a/mozilla/xpcom/build/nsXPCOM.h b/mozilla/xpcom/build/nsXPCOM.h index b4fbff671bd..7d506b9e281 100644 --- a/mozilla/xpcom/build/nsXPCOM.h +++ b/mozilla/xpcom/build/nsXPCOM.h @@ -39,6 +39,7 @@ #define nsXPCOM_h__ #include "nscore.h" +#incldue "nsXPCOMCID.h" class nsAString; class nsACString; @@ -50,6 +51,8 @@ class nsIFile; class nsILocalFile; class nsIDirectoryServiceProvider; class nsIMemory; + + /** * Initialises XPCOM. You must call this method before proceeding * to use xpcom. The one exception is that you may call @@ -174,7 +177,7 @@ NS_GetMemoryManager(nsIMemory* *result); * resolve symbolic links. By default, this value will be false * on all non unix systems. On unix, this attribute is effectively * a noop. - * @param result Interface pointer to a new instance of an nsILocalFile + * @param result Interface pointer to a new instance of an nsILocalFile * * @return NS_OK for success; * other error codes indicate a failure. diff --git a/mozilla/xpcom/build/nsXPComInit.cpp b/mozilla/xpcom/build/nsXPComInit.cpp index d5905c2e265..173ef606909 100644 --- a/mozilla/xpcom/build/nsXPComInit.cpp +++ b/mozilla/xpcom/build/nsXPComInit.cpp @@ -126,7 +126,26 @@ static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); NS_GENERIC_FACTORY_CONSTRUCTOR(nsProcess); +#include "nsXPCOM.h" // ds/nsISupportsPrimitives +#define NS_SUPPORTS_ID_CLASSNAME "Supports ID" +#define NS_SUPPORTS_CSTRING_CLASSNAME "Supports String" +#define NS_SUPPORTS_STRING_CLASSNAME "Supports WString" +#define NS_SUPPORTS_PRBOOL_CLASSNAME "Supports PRBool" +#define NS_SUPPORTS_PRUINT8_CLASSNAME "Supports PRUint8" +#define NS_SUPPORTS_PRUINT16_CLASSNAME "Supports PRUint16" +#define NS_SUPPORTS_PRUINT32_CLASSNAME "Supports PRUint32" +#define NS_SUPPORTS_PRUINT64_CLASSNAME "Supports PRUint64" +#define NS_SUPPORTS_PRTIME_CLASSNAME "Supports PRTime" +#define NS_SUPPORTS_CHAR_CLASSNAME "Supports Char" +#define NS_SUPPORTS_PRINT16_CLASSNAME "Supports PRInt16" +#define NS_SUPPORTS_PRINT32_CLASSNAME "Supports PRInt32" +#define NS_SUPPORTS_PRINT64_CLASSNAME "Supports PRInt64" +#define NS_SUPPORTS_FLOAT_CLASSNAME "Supports float" +#define NS_SUPPORTS_DOUBLE_CLASSNAME "Supports double" +#define NS_SUPPORTS_VOID_CLASSNAME "Supports void" +#define NS_SUPPORTS_INTERFACE_POINTER_CLASSNAME "Supports interface pointer" + NS_GENERIC_FACTORY_CONSTRUCTOR(nsSupportsIDImpl) NS_GENERIC_FACTORY_CONSTRUCTOR(nsSupportsStringImpl) NS_GENERIC_FACTORY_CONSTRUCTOR(nsSupportsCStringImpl) @@ -268,6 +287,7 @@ static const nsModuleComponentInfo components[] = { COMPONENT(BYTEBUFFER, ByteBufferImpl::Create), COMPONENT(SCRIPTABLEINPUTSTREAM, nsScriptableInputStream::Create), +#define NS_PROPERTIES_CLASSNAME "Properties" COMPONENT(PROPERTIES, nsProperties::Create), #define NS_PERSISTENTPROPERTIES_CID NS_IPERSISTENTPROPERTIES_CID /* sigh */ @@ -318,6 +338,7 @@ static const nsModuleComponentInfo components[] = { #undef COMPONENT_SUPPORTS COMPONENT(LOCAL_FILE, nsLocalFile::nsLocalFileConstructor), +#define NS_DIRECTORY_SERVICE_CLASSNAME "nsIFile Directory Service" COMPONENT(DIRECTORY_SERVICE, nsDirectoryService::Create), COMPONENT(PROCESS, nsProcessConstructor), COMPONENT(FILESPEC, nsFileSpecImpl::Create), diff --git a/mozilla/xpcom/components/nsComponentManager.cpp b/mozilla/xpcom/components/nsComponentManager.cpp index ecef714b822..3ecf84c4c87 100644 --- a/mozilla/xpcom/components/nsComponentManager.cpp +++ b/mozilla/xpcom/components/nsComponentManager.cpp @@ -56,6 +56,7 @@ #include "nsIModule.h" #include "nsIObserverService.h" #include "nsISimpleEnumerator.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsLocalFile.h" #include "nsNativeComponentLoader.h" diff --git a/mozilla/xpcom/components/nsICategoryManager.idl b/mozilla/xpcom/components/nsICategoryManager.idl index 4a669794e66..e1aefcef95c 100644 --- a/mozilla/xpcom/components/nsICategoryManager.idl +++ b/mozilla/xpcom/components/nsICategoryManager.idl @@ -96,7 +96,3 @@ interface nsICategoryManager : nsISupports nsISimpleEnumerator enumerateCategories(); }; - -%{C++ -#define NS_CATEGORYMANAGER_CONTRACTID "@mozilla.org/categorymanager;1" -%} diff --git a/mozilla/xpcom/ds/nsIProperties.idl b/mozilla/xpcom/ds/nsIProperties.idl index fb7a065a264..085c44ccfb5 100644 --- a/mozilla/xpcom/ds/nsIProperties.idl +++ b/mozilla/xpcom/ds/nsIProperties.idl @@ -77,8 +77,3 @@ interface nsIProperties : nsISupports */ void getKeys(out PRUint32 count, [array, size_is(count), retval] out string keys); }; - -%{C++ -#define NS_PROPERTIES_CONTRACTID "@mozilla.org/properties;1" -#define NS_PROPERTIES_CLASSNAME "Properties" -%} diff --git a/mozilla/xpcom/ds/nsISupportsPrimitives.idl b/mozilla/xpcom/ds/nsISupportsPrimitives.idl index d1cabc4d9ff..93f39edd98d 100644 --- a/mozilla/xpcom/ds/nsISupportsPrimitives.idl +++ b/mozilla/xpcom/ds/nsISupportsPrimitives.idl @@ -41,9 +41,13 @@ #include "nsISupports.idl" /** + * Primitive base interface. + * * These first three are pointer types and do data copying - * using the nsIAllocator. Be careful! - */ + * using the nsIMemory. Be careful! + * + * @status FROZEN + */ [scriptable, uuid(d0d4b136-1dd1-11b2-9371-f0727ef827c0)] interface nsISupportsPrimitive : nsISupports @@ -71,6 +75,8 @@ interface nsISupportsPrimitive : nsISupports /** * Scriptable storage for nsID structures + * + * @status FROZEN */ [scriptable, uuid(d18290a0-4a1c-11d3-9890-006008962422)] @@ -83,7 +89,7 @@ interface nsISupportsID : nsISupportsPrimitive /** * Scriptable storage for ASCII strings * - * @status UNDER_REVIEW + * @status FROZEN */ [scriptable, uuid(d65ff270-4a1c-11d3-9890-006008962422)] @@ -96,7 +102,7 @@ interface nsISupportsCString : nsISupportsPrimitive /** * Scriptable storage for Unicode strings * - * @status UNDER_REVIEW + * @status FROZEN */ [scriptable, uuid(d79dc970-4a1c-11d3-9890-006008962422)] @@ -113,7 +119,7 @@ interface nsISupportsString : nsISupportsPrimitive /** * Scriptable storage for booleans * - * @status UNDER_REVIEW + * @status FROZEN */ [scriptable, uuid(ddc3b490-4a1c-11d3-9890-006008962422)] @@ -126,7 +132,7 @@ interface nsISupportsPRBool : nsISupportsPrimitive /** * Scriptable storage for 8-bit integers * - * @status UNDER_REVIEW + * @status FROZEN */ [scriptable, uuid(dec2e4e0-4a1c-11d3-9890-006008962422)] @@ -139,7 +145,7 @@ interface nsISupportsPRUint8 : nsISupportsPrimitive /** * Scriptable storage for unsigned 16-bit integers * - * @status UNDER_REVIEW + * @status FROZEN */ [scriptable, uuid(dfacb090-4a1c-11d3-9890-006008962422)] @@ -152,7 +158,7 @@ interface nsISupportsPRUint16 : nsISupportsPrimitive /** * Scriptable storage for unsigned 32-bit integers * - * @status UNDER_REVIEW + * @status FROZEN */ [scriptable, uuid(e01dc470-4a1c-11d3-9890-006008962422)] @@ -165,7 +171,7 @@ interface nsISupportsPRUint32 : nsISupportsPrimitive /** * Scriptable storage for 64-bit integers * - * @status UNDER_REVIEW + * @status FROZEN */ [scriptable, uuid(e13567c0-4a1c-11d3-9890-006008962422)] @@ -178,7 +184,7 @@ interface nsISupportsPRUint64 : nsISupportsPrimitive /** * Scriptable storage for NSPR date/time values * - * @status UNDER_REVIEW + * @status FROZEN */ [scriptable, uuid(e2563630-4a1c-11d3-9890-006008962422)] @@ -192,7 +198,7 @@ interface nsISupportsPRTime : nsISupportsPrimitive * Scriptable storage for single character values * (often used to store an ASCII character) * - * @status UNDER_REVIEW + * @status FROZEN */ [scriptable, uuid(e2b05e40-4a1c-11d3-9890-006008962422)] @@ -205,7 +211,7 @@ interface nsISupportsChar : nsISupportsPrimitive /** * Scriptable storage for 16-bit integers * - * @status UNDER_REVIEW + * @status FROZEN */ [scriptable, uuid(e30d94b0-4a1c-11d3-9890-006008962422)] @@ -218,7 +224,7 @@ interface nsISupportsPRInt16 : nsISupportsPrimitive /** * Scriptable storage for 32-bit integers * - * @status UNDER_REVIEW + * @status FROZEN */ [scriptable, uuid(e36c5250-4a1c-11d3-9890-006008962422)] @@ -231,7 +237,7 @@ interface nsISupportsPRInt32 : nsISupportsPrimitive /** * Scriptable storage for 64-bit integers * - * @status UNDER_REVIEW + * @status FROZEN */ [scriptable, uuid(e3cb0ff0-4a1c-11d3-9890-006008962422)] @@ -244,7 +250,7 @@ interface nsISupportsPRInt64 : nsISupportsPrimitive /** * Scriptable storage for floating point numbers * - * @status UNDER_REVIEW + * @status FROZEN */ [scriptable, uuid(abeaa390-4ac0-11d3-baea-00805f8a5dd7)] @@ -257,7 +263,7 @@ interface nsISupportsFloat : nsISupportsPrimitive /** * Scriptable storage for doubles * - * @status UNDER_REVIEW + * @status FROZEN */ [scriptable, uuid(b32523a0-4ac0-11d3-baea-00805f8a5dd7)] @@ -270,7 +276,7 @@ interface nsISupportsDouble : nsISupportsPrimitive /** * Scriptable storage for generic pointers * - * @status UNDER_REVIEW + * @status FROZEN */ [scriptable, uuid(464484f0-568d-11d3-baf8-00805f8a5dd7)] @@ -283,7 +289,7 @@ interface nsISupportsVoid : nsISupportsPrimitive /** * Scriptable storage for other XPCOM objects * - * @status UNDER_REVIEW + * @status FROZEN */ [scriptable, uuid(995ea724-1dd1-11b2-9211-c21bdd3e7ed0)] @@ -295,129 +301,4 @@ interface nsISupportsInterfacePointer : nsISupportsPrimitive string toString(); }; -///////////////////////////////////////////////////////////////////////// -%{C++ -// {ACF8DC40-4A25-11d3-9890-006008962422} -#define NS_SUPPORTS_ID_CID \ -{ 0xacf8dc40, 0x4a25, 0x11d3, \ - { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } } -#define NS_SUPPORTS_ID_CONTRACTID "@mozilla.org/supports-id;1" -#define NS_SUPPORTS_ID_CLASSNAME "Supports ID" - -// {ACF8DC41-4A25-11d3-9890-006008962422} -#define NS_SUPPORTS_CSTRING_CID \ -{ 0xacf8dc41, 0x4a25, 0x11d3, \ - { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } } -#define NS_SUPPORTS_CSTRING_CONTRACTID "@mozilla.org/supports-cstring;1" -#define NS_SUPPORTS_CSTRING_CLASSNAME "Supports String" - -// {ACF8DC42-4A25-11d3-9890-006008962422} -#define NS_SUPPORTS_STRING_CID \ -{ 0xacf8dc42, 0x4a25, 0x11d3, \ - { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } } -#define NS_SUPPORTS_STRING_CONTRACTID "@mozilla.org/supports-string;1" -#define NS_SUPPORTS_STRING_CLASSNAME "Supports WString" - -// {ACF8DC43-4A25-11d3-9890-006008962422} -#define NS_SUPPORTS_PRBOOL_CID \ -{ 0xacf8dc43, 0x4a25, 0x11d3, \ - { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } } -#define NS_SUPPORTS_PRBOOL_CONTRACTID "@mozilla.org/supports-PRBool;1" -#define NS_SUPPORTS_PRBOOL_CLASSNAME "Supports PRBool" - -// {ACF8DC44-4A25-11d3-9890-006008962422} -#define NS_SUPPORTS_PRUINT8_CID \ -{ 0xacf8dc44, 0x4a25, 0x11d3, \ - { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } } -#define NS_SUPPORTS_PRUINT8_CONTRACTID "@mozilla.org/supports-PRUint8;1" -#define NS_SUPPORTS_PRUINT8_CLASSNAME "Supports PRUint8" - -// {ACF8DC46-4A25-11d3-9890-006008962422} -#define NS_SUPPORTS_PRUINT16_CID \ -{ 0xacf8dc46, 0x4a25, 0x11d3, \ - { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } } -#define NS_SUPPORTS_PRUINT16_CONTRACTID "@mozilla.org/supports-PRUint16;1" -#define NS_SUPPORTS_PRUINT16_CLASSNAME "Supports PRUint16" - -// {ACF8DC47-4A25-11d3-9890-006008962422} -#define NS_SUPPORTS_PRUINT32_CID \ -{ 0xacf8dc47, 0x4a25, 0x11d3, \ - { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } } -#define NS_SUPPORTS_PRUINT32_CONTRACTID "@mozilla.org/supports-PRUint32;1" -#define NS_SUPPORTS_PRUINT32_CLASSNAME "Supports PRUint32" - -// {ACF8DC48-4A25-11d3-9890-006008962422} -#define NS_SUPPORTS_PRUINT64_CID \ -{ 0xacf8dc48, 0x4a25, 0x11d3, \ - { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } } -#define NS_SUPPORTS_PRUINT64_CONTRACTID "@mozilla.org/supports-PRUint64;1" -#define NS_SUPPORTS_PRUINT64_CLASSNAME "Supports PRUint64" - -// {ACF8DC49-4A25-11d3-9890-006008962422} -#define NS_SUPPORTS_PRTIME_CID \ -{ 0xacf8dc49, 0x4a25, 0x11d3, \ - { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } } -#define NS_SUPPORTS_PRTIME_CONTRACTID "@mozilla.org/supports-PRTime;1" -#define NS_SUPPORTS_PRTIME_CLASSNAME "Supports PRTime" - -// {ACF8DC4A-4A25-11d3-9890-006008962422} -#define NS_SUPPORTS_CHAR_CID \ -{ 0xacf8dc4a, 0x4a25, 0x11d3, \ - { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } } -#define NS_SUPPORTS_CHAR_CONTRACTID "@mozilla.org/supports-char;1" -#define NS_SUPPORTS_CHAR_CLASSNAME "Supports Char" - -// {ACF8DC4B-4A25-11d3-9890-006008962422} -#define NS_SUPPORTS_PRINT16_CID \ -{ 0xacf8dc4b, 0x4a25, 0x11d3, \ - { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } } -#define NS_SUPPORTS_PRINT16_CONTRACTID "@mozilla.org/supports-PRInt16;1" -#define NS_SUPPORTS_PRINT16_CLASSNAME "Supports PRInt16" - -// {ACF8DC4C-4A25-11d3-9890-006008962422} -#define NS_SUPPORTS_PRINT32_CID \ -{ 0xacf8dc4c, 0x4a25, 0x11d3, \ - { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } } -#define NS_SUPPORTS_PRINT32_CONTRACTID "@mozilla.org/supports-PRInt32;1" -#define NS_SUPPORTS_PRINT32_CLASSNAME "Supports PRInt32" - -// {ACF8DC4D-4A25-11d3-9890-006008962422} -#define NS_SUPPORTS_PRINT64_CID \ -{ 0xacf8dc4d, 0x4a25, 0x11d3, \ - { 0x98, 0x90, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } } -#define NS_SUPPORTS_PRINT64_CONTRACTID "@mozilla.org/supports-PRInt64;1" -#define NS_SUPPORTS_PRINT64_CLASSNAME "Supports PRInt64" - -// {CBF86870-4AC0-11d3-BAEA-00805F8A5DD7} -#define NS_SUPPORTS_FLOAT_CID \ -{ 0xcbf86870, 0x4ac0, 0x11d3, \ - { 0xba, 0xea, 0x0, 0x80, 0x5f, 0x8a, 0x5d, 0xd7 } } -#define NS_SUPPORTS_FLOAT_CONTRACTID "@mozilla.org/supports-float;1" -#define NS_SUPPORTS_FLOAT_CLASSNAME "Supports float" - -// {CBF86871-4AC0-11d3-BAEA-00805F8A5DD7} -#define NS_SUPPORTS_DOUBLE_CID \ -{ 0xcbf86871, 0x4ac0, 0x11d3, \ - { 0xba, 0xea, 0x0, 0x80, 0x5f, 0x8a, 0x5d, 0xd7 } } -#define NS_SUPPORTS_DOUBLE_CONTRACTID "@mozilla.org/supports-double;1" -#define NS_SUPPORTS_DOUBLE_CLASSNAME "Supports double" - -// {AF10F3E0-568D-11d3-BAF8-00805F8A5DD7} -#define NS_SUPPORTS_VOID_CID \ -{ 0xaf10f3e0, 0x568d, 0x11d3, \ - { 0xba, 0xf8, 0x0, 0x80, 0x5f, 0x8a, 0x5d, 0xd7 } } -#define NS_SUPPORTS_VOID_CONTRACTID "@mozilla.org/supports-void;1" -#define NS_SUPPORTS_VOID_CLASSNAME "Supports void" - -// {A99FEBBA-1DD1-11B2-A943-B02334A6D083} -#define NS_SUPPORTS_INTERFACE_POINTER_CID \ -{ 0xA99FEBBA, 0x1DD1, 0x11B2, \ - { 0xA9, 0x43, 0xB0, 0x23, 0x34, 0xA6, 0xD0, 0x83 } } -#define NS_SUPPORTS_INTERFACE_POINTER_CONTRACTID \ - "@mozilla.org/supports-interface-pointer;1" -#define NS_SUPPORTS_INTERFACE_POINTER_CLASSNAME "Supports interface pointer" - -extern NS_COM nsresult NS_NewISupportsPRBool (nsISupportsPRBool ** aResult); - -%} diff --git a/mozilla/xpcom/io/nsIDirectoryService.idl b/mozilla/xpcom/io/nsIDirectoryService.idl index 65d3ae0aa15..bd76b034385 100644 --- a/mozilla/xpcom/io/nsIDirectoryService.idl +++ b/mozilla/xpcom/io/nsIDirectoryService.idl @@ -135,9 +135,4 @@ interface nsIDirectoryService: nsISupports void unregisterProvider(in nsIDirectoryServiceProvider prov); }; -%{C++ -#define NS_DIRECTORY_SERVICE_CONTRACTID "@mozilla.org/file/directory_service;1" -#define NS_DIRECTORY_SERVICE_CLASSNAME "nsIFile Directory Service" -%} - diff --git a/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp b/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp index 97e18eba0ef..39aa17be5b8 100644 --- a/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp +++ b/mozilla/xpfe/appshell/src/nsCommandLineServiceMac.cpp @@ -55,6 +55,7 @@ #include "nsIWebShellWindow.h" #include "nsIWebShell.h" #include "nsIDOMWindow.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIWindowWatcher.h" #include "jsapi.h" diff --git a/mozilla/xpfe/bootstrap/nsAppRunner.cpp b/mozilla/xpfe/bootstrap/nsAppRunner.cpp index 3c4f594f067..6e4b4125b76 100644 --- a/mozilla/xpfe/bootstrap/nsAppRunner.cpp +++ b/mozilla/xpfe/bootstrap/nsAppRunner.cpp @@ -66,6 +66,7 @@ #include "nsIWindowMediator.h" #include "nsIDOMWindowInternal.h" #include "nsIClipboard.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsICmdLineHandler.h" #include "nsICategoryManager.h" diff --git a/mozilla/xpfe/bootstrap/nsNativeAppSupportOS2.cpp b/mozilla/xpfe/bootstrap/nsNativeAppSupportOS2.cpp index 3b24e068188..cebbf4a5ee1 100644 --- a/mozilla/xpfe/bootstrap/nsNativeAppSupportOS2.cpp +++ b/mozilla/xpfe/bootstrap/nsNativeAppSupportOS2.cpp @@ -38,6 +38,7 @@ #include "nsIServiceManager.h" #include "nsICmdLineHandler.h" #include "nsIDOMWindow.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsISupportsArray.h" #include "nsIWindowWatcher.h" diff --git a/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp b/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp index 9cb73c7c775..373d575e0e5 100644 --- a/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp +++ b/mozilla/xpfe/bootstrap/nsNativeAppSupportWin.cpp @@ -49,6 +49,7 @@ #include "nsIServiceManager.h" #include "nsICmdLineHandler.h" #include "nsIDOMWindow.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsISupportsArray.h" #include "nsIWindowWatcher.h" diff --git a/mozilla/xpfe/components/alerts/src/nsAlertsService.cpp b/mozilla/xpfe/components/alerts/src/nsAlertsService.cpp index 6138f669051..55a7e7b7444 100644 --- a/mozilla/xpfe/components/alerts/src/nsAlertsService.cpp +++ b/mozilla/xpfe/components/alerts/src/nsAlertsService.cpp @@ -38,6 +38,7 @@ #include "nsAlertsService.h" #include "nsISupportsArray.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIServiceManager.h" #include "nsIDOMWindowInternal.h" diff --git a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp index 5c3888ea55e..98d8430c21b 100644 --- a/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp +++ b/mozilla/xpfe/components/bookmarks/src/nsBookmarksService.cpp @@ -59,6 +59,7 @@ #include "nsSpecialSystemDirectory.h" #include "nsVoidArray.h" #include "nsXPIDLString.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "prio.h" #include "prlog.h" diff --git a/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp b/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp index 97e18eba0ef..39aa17be5b8 100644 --- a/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp +++ b/mozilla/xpfe/components/startup/src/nsCommandLineServiceMac.cpp @@ -55,6 +55,7 @@ #include "nsIWebShellWindow.h" #include "nsIWebShell.h" #include "nsIDOMWindow.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" #include "nsIWindowWatcher.h" #include "jsapi.h" diff --git a/mozilla/xpfe/components/xremote/src/XRemoteService.cpp b/mozilla/xpfe/components/xremote/src/XRemoteService.cpp index 269184bc201..40c8ebd4252 100644 --- a/mozilla/xpfe/components/xremote/src/XRemoteService.cpp +++ b/mozilla/xpfe/components/xremote/src/XRemoteService.cpp @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include diff --git a/mozilla/xpinstall/src/nsXPInstallManager.cpp b/mozilla/xpinstall/src/nsXPInstallManager.cpp index 5fc9b5e0646..b1562a550dd 100644 --- a/mozilla/xpinstall/src/nsXPInstallManager.cpp +++ b/mozilla/xpinstall/src/nsXPInstallManager.cpp @@ -62,6 +62,7 @@ #include "nsProxiedService.h" #include "nsIPromptService.h" #include "nsIScriptGlobalObject.h" +#include "nsXPCOM.h" #include "nsISupportsPrimitives.h" static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);