From 67a35c1a08bc85204c20bd2b9defb26c8c1722e9 Mon Sep 17 00:00:00 2001 From: "sfraser%netscape.com" Date: Wed, 30 Jan 2002 21:14:20 +0000 Subject: [PATCH] Making the nsModuleComponentInfo data const; bug 74803. r=dp, sr=waterson git-svn-id: svn://10.0.0.236/trunk@113225 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/accessible/build/nsAccessibilityFactory.cpp | 2 +- mozilla/caps/src/nsSecurityManagerFactory.cpp | 2 +- mozilla/chrome/src/nsChromeFactory.cpp | 2 +- mozilla/content/build/nsContentModule.cpp | 2 +- mozilla/db/mork/build/nsMorkFactory.cpp | 2 +- mozilla/directory/xpcom/base/src/nsLDAPProtocolModule.cpp | 2 +- mozilla/docshell/build/nsDocShellModule.cpp | 2 +- mozilla/dom/src/build/nsDOMFactory.cpp | 2 +- mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp | 2 +- mozilla/editor/composer/src/nsComposerRegistration.cpp | 2 +- mozilla/editor/libeditor/build/nsEditorRegistration.cpp | 2 +- mozilla/editor/libeditor/build/nsTextEditorReg.cpp | 2 +- mozilla/editor/libeditor/txtsvc/nsTextServicesFactory.cpp | 2 +- mozilla/editor/txmgr/src/nsTransactionManagerFactory.cpp | 2 +- mozilla/editor/txtsvc/src/nsTextServicesFactory.cpp | 2 +- mozilla/embedding/browser/build/nsWebBrowserModule.cpp | 2 +- .../browser/photon/src/nsUnknownContentTypeHandler.cpp | 2 +- mozilla/embedding/components/build/nsModule.cpp | 2 +- .../access-builtin/accessproxy/nsAccessProxyRegistration.cpp | 2 +- mozilla/extensions/cookie/nsModuleFactory.cpp | 2 +- mozilla/extensions/ctl/src/nsCtlLEModule.cpp | 2 +- mozilla/extensions/datetime/nsDateTimeModule.cpp | 2 +- mozilla/extensions/finger/nsFingerModule.cpp | 2 +- mozilla/extensions/inspector/build/src/nsInspectorModule.cpp | 2 +- mozilla/extensions/interfaceinfo/src/iixmodule.cpp | 2 +- mozilla/extensions/pics/src/nsPICS.cpp | 2 +- mozilla/extensions/pref/autoconfig/src/nsConfigFactory.cpp | 2 +- mozilla/extensions/transformiix/build/XSLTProcessorModule.cpp | 2 +- .../universalchardet/src/nsUniversalCharDetModule.cpp | 2 +- mozilla/extensions/wallet/build/nsWalletViewerFactory.cpp | 2 +- mozilla/extensions/wallet/src/nsWalletFactory.cpp | 2 +- .../extensions/webservices/proxy/tests/wspproxytestmodule.cpp | 2 +- mozilla/extensions/xmlextras/build/src/nsXMLExtrasModule.cpp | 2 +- mozilla/extensions/xmlextras/interfaceinfo/src/iixmodule.cpp | 2 +- .../xmlextras/proxy/src/tests/wspproxytestmodule.cpp | 2 +- mozilla/extensions/xmlterm/build/mozXMLTermModule.cpp | 2 +- mozilla/gfx/src/beos/nsGfxFactoryBeOS.cpp | 2 +- mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp | 2 +- mozilla/gfx/src/mac/nsGfxFactoryMac.cpp | 2 +- mozilla/gfx/src/os2/nsGfxFactoryOS2.cpp | 2 +- mozilla/gfx/src/photon/nsGfxFactoryPh.cpp | 2 +- mozilla/gfx/src/ps/nsGfxFactoryPS.cpp | 2 +- mozilla/gfx/src/qt/nsGfxFactoryQT.cpp | 2 +- mozilla/gfx/src/windows/nsGfxFactoryWin.cpp | 2 +- mozilla/gfx/src/xlib/nsGfxFactoryXlib.cpp | 2 +- mozilla/gfx/src/xprint/nsGfxFactoryXP.cpp | 2 +- mozilla/gfx2/src/nsGfxFactory.cpp | 2 +- mozilla/gfx2/src/windows/nsGfxFactory.cpp | 2 +- mozilla/htmlparser/src/nsParserModule.cpp | 2 +- mozilla/intl/chardet/src/classic/nsClassicCharDetDll.cpp | 2 +- mozilla/intl/chardet/src/nsCharDetModule.cpp | 2 +- mozilla/intl/compatibility/src/nsI18nCompatibility.cpp | 2 +- mozilla/intl/locale/src/mac/nsLocaleSHLIB.cpp | 2 +- mozilla/intl/locale/src/os2/nsLocaleModule.cpp | 2 +- mozilla/intl/locale/src/unix/nsLocaleModule.cpp | 2 +- mozilla/intl/locale/src/windows/nsLocaleDLL.cpp | 2 +- mozilla/intl/lwbrk/src/nsLWBrkModule.cpp | 2 +- mozilla/intl/strres/src/nsStringBundle.cpp | 2 +- mozilla/intl/uconv/src/nsUConvModule.cpp | 2 +- mozilla/intl/uconv/ucvcn/nsUCvCnModule.cpp | 2 +- mozilla/intl/uconv/ucvibm/nsUCvIBMModule.cpp | 2 +- mozilla/intl/uconv/ucvja/nsUCvJaModule.cpp | 2 +- mozilla/intl/uconv/ucvko/nsUCvKoModule.cpp | 2 +- mozilla/intl/uconv/ucvlatin/nsUCvLatinModule.cpp | 2 +- mozilla/intl/uconv/ucvmath/nsUCvMathModule.cpp | 2 +- mozilla/intl/uconv/ucvtw/nsUCvTwModule.cpp | 2 +- mozilla/intl/uconv/ucvtw2/nsUCvTw2Module.cpp | 2 +- mozilla/intl/unicharutil/src/nsUcharUtilModule.cpp | 2 +- mozilla/js/jsd/jsd_xpc.cpp | 2 +- mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp | 2 +- mozilla/js/src/xpconnect/sample/xpcsample1.cpp | 2 +- mozilla/js/src/xpconnect/src/xpcjsid.cpp | 4 ++-- mozilla/js/src/xpconnect/src/xpcmodule.cpp | 2 +- mozilla/js/src/xpconnect/tests/components/xpctest_module.cpp | 2 +- mozilla/js/src/xpconnect/tools/src/nsXPCToolsModule.cpp | 2 +- mozilla/layout/build/nsLayoutModule.cpp | 2 +- mozilla/mailnews/absync/build/nsAbSyncFactory.cpp | 2 +- mozilla/mailnews/addrbook/build/nsAbFactory.cpp | 2 +- mozilla/mailnews/base/build/nsMsgFactory.cpp | 2 +- mozilla/mailnews/compose/build/nsMsgCompFactory.cpp | 2 +- mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp | 2 +- mozilla/mailnews/extensions/smime/build/nsMsgSMIMEFactory.cpp | 2 +- mozilla/mailnews/imap/build/nsImapFactory.cpp | 2 +- mozilla/mailnews/import/eudora/src/nsEudoraFactory.cpp | 2 +- mozilla/mailnews/import/oexpress/nsOEFactory.cpp | 2 +- mozilla/mailnews/import/outlook/src/nsOutlookFactory.cpp | 2 +- mozilla/mailnews/import/src/nsImportFactory.cpp | 2 +- mozilla/mailnews/import/text/src/nsTextFactory.cpp | 2 +- mozilla/mailnews/local/build/nsMsgLocalFactory.cpp | 2 +- mozilla/mailnews/mapi/mapihook/src/msgMapiSupport.cpp | 2 +- mozilla/mailnews/mime/build/nsMimeModule.cpp | 2 +- .../mailnews/mime/cthandlers/calendar/nsCalendarFactory.cpp | 2 +- .../mailnews/mime/cthandlers/smimestub/nsSMIMEStubFactory.cpp | 2 +- mozilla/mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp | 2 +- mozilla/mailnews/mime/emitters/build/nsEmitterFactory.cpp | 2 +- mozilla/mailnews/news/build/nsMsgNewsFactory.cpp | 2 +- mozilla/modules/libimg/gifcom/nsGIFModule.cpp | 2 +- mozilla/modules/libjar/nsJARFactory.cpp | 2 +- mozilla/modules/libjar/nsJARProtocolModule.cpp | 2 +- mozilla/modules/libpr0n/decoders/bmp/nsBMPModule.cpp | 2 +- mozilla/modules/libpr0n/decoders/gif/nsGIFModule.cpp | 2 +- mozilla/modules/libpr0n/decoders/icon/nsIconModule.cpp | 2 +- mozilla/modules/libpr0n/decoders/jpeg/nsJPEGFactory.cpp | 2 +- mozilla/modules/libpr0n/decoders/mng/nsMNGFactory.cpp | 2 +- mozilla/modules/libpr0n/decoders/png/nsPNGFactory.cpp | 2 +- mozilla/modules/libpr0n/decoders/ppm/nsPPMFactory.cpp | 2 +- mozilla/modules/libpr0n/src/ImageFactory.cpp | 2 +- mozilla/modules/libpref/src/nsPrefsFactory.cpp | 2 +- mozilla/modules/oji/src/nsCJVMManagerFactory.cpp | 2 +- .../modules/oji/tests/src/TestLoader/OJITestLoaderFactory.cpp | 2 +- mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp | 2 +- mozilla/modules/plugin/base/src/nsPluginModule.cpp | 2 +- mozilla/modules/plugin/samples/simple/npsimple.cpp | 2 +- mozilla/modules/plugin/samples/testevents/npevents.cpp | 2 +- mozilla/netwerk/build/nsNetModule.cpp | 2 +- mozilla/netwerk/build2/nsNetModule2.cpp | 2 +- mozilla/netwerk/cache/src/nsCacheModule.cpp | 2 +- mozilla/netwerk/mime/src/nsMIMEServiceModule.cpp | 2 +- mozilla/netwerk/protocol/about/src/nsAboutProtocolModule.cpp | 2 +- mozilla/netwerk/protocol/data/src/nsDataModule.cpp | 2 +- mozilla/netwerk/protocol/datetime/src/nsDateTimeModule.cpp | 2 +- mozilla/netwerk/protocol/file/src/nsFileProtocolModule.cpp | 2 +- mozilla/netwerk/protocol/finger/src/nsFingerModule.cpp | 2 +- mozilla/netwerk/protocol/jar/src/nsJARProtocolModule.cpp | 2 +- mozilla/netwerk/protocol/keyword/src/nsKeywordModule.cpp | 2 +- mozilla/netwerk/protocol/theme/src/nsThemeModule.cpp | 2 +- mozilla/netwerk/streamconv/converters/nsConvFactories.cpp | 2 +- mozilla/netwerk/streamconv/src/nsStreamConvServiceFactory.cpp | 2 +- mozilla/parser/htmlparser/src/nsParserModule.cpp | 2 +- mozilla/profile/pref-migrator/src/nsPrefMigrationFactory.cpp | 2 +- mozilla/profile/src/nsProfileFactory.cpp | 2 +- mozilla/rdf/build/nsRDFModule.cpp | 2 +- mozilla/rdf/chrome/build/nsChromeFactory.cpp | 2 +- mozilla/security/manager/boot/src/nsBOOTModule.cpp | 2 +- mozilla/security/manager/pki/src/nsPKIModule.cpp | 2 +- mozilla/security/manager/ssl/src/nsNSSModule.cpp | 2 +- mozilla/uriloader/build/nsURILoaderModule.cpp | 2 +- mozilla/view/src/nsViewFactory.cpp | 2 +- mozilla/view/src/nsViewManager.cpp | 2 +- mozilla/widget/src/beos/nsWidgetFactory.cpp | 2 +- mozilla/widget/src/build/nsWinWidgetFactory.cpp | 2 +- mozilla/widget/src/gtk/nsWidgetFactory.cpp | 2 +- mozilla/widget/src/gtk2/nsWidgetFactory.cpp | 2 +- mozilla/widget/src/mac/nsWidgetFactory.cpp | 2 +- mozilla/widget/src/os2/nsWidgetFactory.cpp | 2 +- mozilla/widget/src/photon/nsWidgetFactory.cpp | 2 +- mozilla/widget/src/qt/nsWidgetFactory.cpp | 2 +- mozilla/widget/src/xlib/nsWidgetFactory.cpp | 2 +- mozilla/widget/src/xremoteclient/XRemoteClientFactory.cpp | 2 +- mozilla/xpcom/base/nsLeakDetector.cpp | 2 +- mozilla/xpcom/build/nsXPComInit.cpp | 4 ++-- mozilla/xpcom/sample/nsSampleModule.cpp | 2 +- mozilla/xpcom/tests/dynamic/TestDynamic.cpp | 2 +- mozilla/xpcom/tests/services/MyService.cpp | 2 +- mozilla/xpfe/appshell/src/nsAppShellFactory.cpp | 2 +- mozilla/xpfe/browser/src/nsBrowserInstance.cpp | 2 +- mozilla/xpfe/components/build/nsModule.cpp | 2 +- mozilla/xpfe/components/filepicker/src/nsFileView.cpp | 2 +- mozilla/xpfe/components/find/src/nsFindModule.cpp | 2 +- mozilla/xpfe/components/regviewer/nsRegistryDataSource.cpp | 2 +- mozilla/xpfe/components/search/src/nsRegisterSearch.cpp | 2 +- mozilla/xpfe/components/shistory/src/nsSHistoryModule.cpp | 2 +- .../xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp | 2 +- .../xpfe/components/urlbarhistory/src/nsUBHistoryModule.cpp | 2 +- mozilla/xpfe/components/xfer/src/nsStreamTransfer.cpp | 2 +- mozilla/xpfe/components/xremote/src/XRemoteService.cpp | 2 +- mozilla/xpinstall/src/nsSoftwareUpdate.cpp | 2 +- 167 files changed, 169 insertions(+), 169 deletions(-) diff --git a/mozilla/accessible/build/nsAccessibilityFactory.cpp b/mozilla/accessible/build/nsAccessibilityFactory.cpp index 548bf98acd8..2d2660f24ba 100644 --- a/mozilla/accessible/build/nsAccessibilityFactory.cpp +++ b/mozilla/accessible/build/nsAccessibilityFactory.cpp @@ -63,7 +63,7 @@ NS_ConstructAccessibilityService(nsISupports *aOuter, REFNSIID aIID, void **aRes } // The list of components we register -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "AccessibilityService", NS_ACCESSIBILITY_SERVICE_CID, diff --git a/mozilla/caps/src/nsSecurityManagerFactory.cpp b/mozilla/caps/src/nsSecurityManagerFactory.cpp index 8c0cafda764..66c2ffa4fb4 100644 --- a/mozilla/caps/src/nsSecurityManagerFactory.cpp +++ b/mozilla/caps/src/nsSecurityManagerFactory.cpp @@ -368,7 +368,7 @@ RegisterSecurityNameSet(nsIComponentManager *aCompMgr, } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { NS_SCRIPTSECURITYMANAGER_CLASSNAME, NS_SCRIPTSECURITYMANAGER_CID, diff --git a/mozilla/chrome/src/nsChromeFactory.cpp b/mozilla/chrome/src/nsChromeFactory.cpp index da945c7b149..7273ea1bf8d 100644 --- a/mozilla/chrome/src/nsChromeFactory.cpp +++ b/mozilla/chrome/src/nsChromeFactory.cpp @@ -50,7 +50,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsChromeRegistry, Init) // The list of components we register -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Chrome Registry", NS_CHROMEREGISTRY_CID, diff --git a/mozilla/content/build/nsContentModule.cpp b/mozilla/content/build/nsContentModule.cpp index eee754a031d..4b723d25440 100644 --- a/mozilla/content/build/nsContentModule.cpp +++ b/mozilla/content/build/nsContentModule.cpp @@ -449,7 +449,7 @@ UnregisterHTMLOptionElement(nsIComponentManager* aCompMgr, } // The list of components we register -static nsModuleComponentInfo gComponents[] = { +static const nsModuleComponentInfo gComponents[] = { { "Namespace manager", NS_NAMESPACEMANAGER_CID, nsnull, diff --git a/mozilla/db/mork/build/nsMorkFactory.cpp b/mozilla/db/mork/build/nsMorkFactory.cpp index 404bd2c4d6f..10cb927fee2 100644 --- a/mozilla/db/mork/build/nsMorkFactory.cpp +++ b/mozilla/db/mork/build/nsMorkFactory.cpp @@ -58,7 +58,7 @@ public: NS_GENERIC_FACTORY_CONSTRUCTOR(nsMorkFactoryFactory) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Mork Factory", NS_MORK_CID, diff --git a/mozilla/directory/xpcom/base/src/nsLDAPProtocolModule.cpp b/mozilla/directory/xpcom/base/src/nsLDAPProtocolModule.cpp index 338fc592a23..8fee5ecdcb8 100644 --- a/mozilla/directory/xpcom/base/src/nsLDAPProtocolModule.cpp +++ b/mozilla/directory/xpcom/base/src/nsLDAPProtocolModule.cpp @@ -62,7 +62,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsLDAPProtocolHandler); // a table of the CIDs implemented by this module (in this case, just one) // -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "LDAP Connection", NS_LDAPCONNECTION_CID, "@mozilla.org/network/ldap-connection;1", diff --git a/mozilla/docshell/build/nsDocShellModule.cpp b/mozilla/docshell/build/nsDocShellModule.cpp index 97aba34799f..804b0ef2823 100644 --- a/mozilla/docshell/build/nsDocShellModule.cpp +++ b/mozilla/docshell/build/nsDocShellModule.cpp @@ -35,7 +35,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDefaultURIFixup); // a component //NS_GENERIC_FACTORY_CONSTRUCTOR(nsDocShell); -static nsModuleComponentInfo gDocShellModuleInfo[] = { +static const nsModuleComponentInfo gDocShellModuleInfo[] = { { "WebShell", NS_WEB_SHELL_CID, "@mozilla.org/webshell;1", diff --git a/mozilla/dom/src/build/nsDOMFactory.cpp b/mozilla/dom/src/build/nsDOMFactory.cpp index f6da15f1e73..51060148b83 100644 --- a/mozilla/dom/src/build/nsDOMFactory.cpp +++ b/mozilla/dom/src/build/nsDOMFactory.cpp @@ -203,7 +203,7 @@ nsDOMSOFactory::GetException(nsresult result, nsIException *aDefaultException, NS_GENERIC_FACTORY_CONSTRUCTOR(nsDOMSOFactory); -static nsModuleComponentInfo gDOMModuleInfo[] = { +static const nsModuleComponentInfo gDOMModuleInfo[] = { { "Script Object Factory", NS_DOM_SCRIPT_OBJECT_FACTORY_CID, nsnull, diff --git a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp index dce94804996..62906632697 100644 --- a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp +++ b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp @@ -804,7 +804,7 @@ nsJSProtocolHandler::AllowPort(PRInt32 port, const char *scheme, PRBool *_retval //////////////////////////////////////////////////////////////////////////////// -static nsModuleComponentInfo gJSModuleInfo[] = { +static const nsModuleComponentInfo gJSModuleInfo[] = { { "JavaScript Protocol Handler", NS_JSPROTOCOLHANDLER_CID, NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "javascript", diff --git a/mozilla/editor/composer/src/nsComposerRegistration.cpp b/mozilla/editor/composer/src/nsComposerRegistration.cpp index a20adb4e512..871ad66476d 100644 --- a/mozilla/editor/composer/src/nsComposerRegistration.cpp +++ b/mozilla/editor/composer/src/nsComposerRegistration.cpp @@ -55,7 +55,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsComposerController) // information like the function to create an instance, contractid, and // class name. // -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "Composer Controller", NS_COMPOSERCONTROLLER_CID, "@mozilla.org/editor/composercontroller;1", nsComposerControllerConstructor, }, diff --git a/mozilla/editor/libeditor/build/nsEditorRegistration.cpp b/mozilla/editor/libeditor/build/nsEditorRegistration.cpp index 7b62a787415..4b8e754386a 100644 --- a/mozilla/editor/libeditor/build/nsEditorRegistration.cpp +++ b/mozilla/editor/libeditor/build/nsEditorRegistration.cpp @@ -79,7 +79,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsHTMLEditor) // information like the function to create an instance, contractid, and // class name. // -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "Text Editor", NS_TEXTEDITOR_CID, "@mozilla.org/editor/texteditor;1", nsPlaintextEditorConstructor, }, #ifdef ENABLE_EDITOR_API_LOG diff --git a/mozilla/editor/libeditor/build/nsTextEditorReg.cpp b/mozilla/editor/libeditor/build/nsTextEditorReg.cpp index f9f231d7487..66a04c67f7c 100644 --- a/mozilla/editor/libeditor/build/nsTextEditorReg.cpp +++ b/mozilla/editor/libeditor/build/nsTextEditorReg.cpp @@ -60,7 +60,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsPlaintextEditor) // information like the function to create an instance, contractid, and // class name. // -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "Text Editor", NS_TEXTEDITOR_CID, "@mozilla.org/editor/texteditor;1", nsPlaintextEditorConstructor, }, { "Editor Controller", NS_EDITORCONTROLLER_CID, diff --git a/mozilla/editor/libeditor/txtsvc/nsTextServicesFactory.cpp b/mozilla/editor/libeditor/txtsvc/nsTextServicesFactory.cpp index de897e58386..d42e75d01f0 100644 --- a/mozilla/editor/libeditor/txtsvc/nsTextServicesFactory.cpp +++ b/mozilla/editor/libeditor/txtsvc/nsTextServicesFactory.cpp @@ -61,7 +61,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsFindAndReplace) // information like the function to create an instance, contractid, and // class name. // -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { NULL, NS_TEXTSERVICESDOCUMENT_CID, "@mozilla.org/textservices/textservicesdocument;1", nsTextServicesDocumentConstructor }, { NULL, NS_TEXTSERVICESFINDANDREPLACE_CID, NS_FINDANDREPLACE_CONTRACTID, nsFindAndReplaceConstructor }, }; diff --git a/mozilla/editor/txmgr/src/nsTransactionManagerFactory.cpp b/mozilla/editor/txmgr/src/nsTransactionManagerFactory.cpp index b68ff8776c4..c934e663182 100644 --- a/mozilla/editor/txmgr/src/nsTransactionManagerFactory.cpp +++ b/mozilla/editor/txmgr/src/nsTransactionManagerFactory.cpp @@ -54,7 +54,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsTransactionManager) // information like the function to create an instance, contractid, and // class name. // -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "nsTransactionManager", NS_TRANSACTIONMANAGER_CID, NS_TRANSACTIONMANAGER_CONTRACTID, nsTransactionManagerConstructor }, }; diff --git a/mozilla/editor/txtsvc/src/nsTextServicesFactory.cpp b/mozilla/editor/txtsvc/src/nsTextServicesFactory.cpp index de897e58386..d42e75d01f0 100644 --- a/mozilla/editor/txtsvc/src/nsTextServicesFactory.cpp +++ b/mozilla/editor/txtsvc/src/nsTextServicesFactory.cpp @@ -61,7 +61,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsFindAndReplace) // information like the function to create an instance, contractid, and // class name. // -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { NULL, NS_TEXTSERVICESDOCUMENT_CID, "@mozilla.org/textservices/textservicesdocument;1", nsTextServicesDocumentConstructor }, { NULL, NS_TEXTSERVICESFINDANDREPLACE_CID, NS_FINDANDREPLACE_CONTRACTID, nsFindAndReplaceConstructor }, }; diff --git a/mozilla/embedding/browser/build/nsWebBrowserModule.cpp b/mozilla/embedding/browser/build/nsWebBrowserModule.cpp index 2e92e625633..eb2514e5641 100644 --- a/mozilla/embedding/browser/build/nsWebBrowserModule.cpp +++ b/mozilla/embedding/browser/build/nsWebBrowserModule.cpp @@ -69,7 +69,7 @@ UnregisterContentPolicy(nsIComponentManager *aCompMgr, nsIFile *aPath, // Component Table -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "WebBrowser Component", NS_WEBBROWSER_CID, NS_WEBBROWSER_CONTRACTID, nsWebBrowserConstructor }, diff --git a/mozilla/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp b/mozilla/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp index aa14165fcff..ab52e62db3d 100644 --- a/mozilla/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp +++ b/mozilla/embedding/browser/photon/src/nsUnknownContentTypeHandler.cpp @@ -226,7 +226,7 @@ NS_IMETHODIMP className::QueryInterface( REFNSIID anIID, void **anInstancePtr ) NS_GENERIC_FACTORY_CONSTRUCTOR( nsUnknownContentTypeHandler ) // The list of components we register -static nsModuleComponentInfo info[] = { +static const nsModuleComponentInfo info[] = { "nsUnknownContentTypeHandler", NS_IHELPERAPPLAUNCHERDIALOG_IID, NS_IHELPERAPPLAUNCHERDLG_CONTRACTID, diff --git a/mozilla/embedding/components/build/nsModule.cpp b/mozilla/embedding/components/build/nsModule.cpp index 938a5f3c741..da44c0f0303 100644 --- a/mozilla/embedding/components/build/nsModule.cpp +++ b/mozilla/embedding/components/build/nsModule.cpp @@ -53,7 +53,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsJSConsoleService) NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowserFind) NS_GENERIC_FACTORY_CONSTRUCTOR(nsWebBrowserPersist) -static nsModuleComponentInfo gComponents[] = { +static const nsModuleComponentInfo gComponents[] = { { "Dialog ParamBlock", NS_DIALOGPARAMBLOCK_CID, NS_DIALOGPARAMBLOCK_CONTRACTID, nsDialogParamBlockConstructor }, { "Prompt Service", NS_PROMPTSERVICE_CID, NS_PROMPTSERVICE_CONTRACTID, nsPromptServiceConstructor }, diff --git a/mozilla/extensions/access-builtin/accessproxy/nsAccessProxyRegistration.cpp b/mozilla/extensions/access-builtin/accessproxy/nsAccessProxyRegistration.cpp index 5e3104bd53a..167d52c3b4d 100644 --- a/mozilla/extensions/access-builtin/accessproxy/nsAccessProxyRegistration.cpp +++ b/mozilla/extensions/access-builtin/accessproxy/nsAccessProxyRegistration.cpp @@ -69,7 +69,7 @@ static void PR_CALLBACK AccessProxyModuleDtor(nsIModule* self) nsAccessProxy::ReleaseInstance(); } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "AccessProxy Component", NS_ACCESSPROXY_CID, NS_ACCESSPROXY_CONTRACTID, nsAccessProxyConstructor, nsAccessProxyRegistrationProc, diff --git a/mozilla/extensions/cookie/nsModuleFactory.cpp b/mozilla/extensions/cookie/nsModuleFactory.cpp index b101dde9b55..9ed7ff63fb4 100644 --- a/mozilla/extensions/cookie/nsModuleFactory.cpp +++ b/mozilla/extensions/cookie/nsModuleFactory.cpp @@ -92,7 +92,7 @@ UnregisterContentPolicy(nsIComponentManager *aCompMgr, nsIFile *aPath, // The list of components we register -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "Cookie", NS_COOKIE_CID, NS_COOKIE_CONTRACTID, diff --git a/mozilla/extensions/ctl/src/nsCtlLEModule.cpp b/mozilla/extensions/ctl/src/nsCtlLEModule.cpp index 294ae6c023e..32b4683f34a 100644 --- a/mozilla/extensions/ctl/src/nsCtlLEModule.cpp +++ b/mozilla/extensions/ctl/src/nsCtlLEModule.cpp @@ -50,7 +50,7 @@ NS_UCONV_REG_UNREG(nsUnicodeToTIS620, "Unicode", "tis620-2", NS_UNICODETOTIS620_ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToTIS620); -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { ENCODER_NAME_BASE "tis620-2" , NS_UNICODETOTIS620_CID, NS_UNICODEENCODER_CONTRACTID_BASE "tis620-2", diff --git a/mozilla/extensions/datetime/nsDateTimeModule.cpp b/mozilla/extensions/datetime/nsDateTimeModule.cpp index 5ca6de07d58..0646d2905bd 100644 --- a/mozilla/extensions/datetime/nsDateTimeModule.cpp +++ b/mozilla/extensions/datetime/nsDateTimeModule.cpp @@ -38,7 +38,7 @@ #include "nsIGenericFactory.h" #include "nsDateTimeHandler.h" -static nsModuleComponentInfo gResComponents[] = { +static const nsModuleComponentInfo gResComponents[] = { { "The DateTime Protocol Handler", NS_DATETIMEHANDLER_CID, NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "datetime", diff --git a/mozilla/extensions/finger/nsFingerModule.cpp b/mozilla/extensions/finger/nsFingerModule.cpp index 97d3cdf0745..fdd01bc10d1 100644 --- a/mozilla/extensions/finger/nsFingerModule.cpp +++ b/mozilla/extensions/finger/nsFingerModule.cpp @@ -23,7 +23,7 @@ #include "nsIGenericFactory.h" #include "nsFingerHandler.h" -static nsModuleComponentInfo gResComponents[] = { +static const nsModuleComponentInfo gResComponents[] = { { "The Finger Protocol Handler", NS_FINGERHANDLER_CID, NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "finger", diff --git a/mozilla/extensions/inspector/build/src/nsInspectorModule.cpp b/mozilla/extensions/inspector/build/src/nsInspectorModule.cpp index 039920f26c7..56efa32718b 100644 --- a/mozilla/extensions/inspector/build/src/nsInspectorModule.cpp +++ b/mozilla/extensions/inspector/build/src/nsInspectorModule.cpp @@ -120,7 +120,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(inPNGEncoder) { 0xece14df2, 0xfc83, 0x469f, { 0x83, 0xac, 0x68, 0x4d, 0x5f, 0x6, 0xb6, 0xce } } #endif -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "DOM View", IN_DOMVIEW_CID, diff --git a/mozilla/extensions/interfaceinfo/src/iixmodule.cpp b/mozilla/extensions/interfaceinfo/src/iixmodule.cpp index 3df703e103e..0f126fd6002 100644 --- a/mozilla/extensions/interfaceinfo/src/iixmodule.cpp +++ b/mozilla/extensions/interfaceinfo/src/iixmodule.cpp @@ -54,7 +54,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsGenericInterfaceInfoSet) NS_GENERIC_FACTORY_CONSTRUCTOR(nsScriptableInterfaceInfo) -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { {nsnull, NS_GENERIC_INTERFACE_INFO_SET_CID, NS_GENERIC_INTERFACE_INFO_SET_CONTRACTID, diff --git a/mozilla/extensions/pics/src/nsPICS.cpp b/mozilla/extensions/pics/src/nsPICS.cpp index a1827baf264..fe1a1772300 100644 --- a/mozilla/extensions/pics/src/nsPICS.cpp +++ b/mozilla/extensions/pics/src/nsPICS.cpp @@ -1418,7 +1418,7 @@ CreateNewPICS(nsISupports* aOuter, REFNSIID aIID, void **aResult) // information like the function to create an instance, contractid, and // class name. // -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "PICS", NS_PICS_CID, NS_PICS_CONTRACTID, CreateNewPICS, }, }; diff --git a/mozilla/extensions/pref/autoconfig/src/nsConfigFactory.cpp b/mozilla/extensions/pref/autoconfig/src/nsConfigFactory.cpp index 86b8be37e4a..905d3e72ec6 100644 --- a/mozilla/extensions/pref/autoconfig/src/nsConfigFactory.cpp +++ b/mozilla/extensions/pref/autoconfig/src/nsConfigFactory.cpp @@ -91,7 +91,7 @@ UnRegisterReadConfig(nsIComponentManager *aCompMgr, // The list of components we register -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { NS_AUTOCONFIG_CLASSNAME, diff --git a/mozilla/extensions/transformiix/build/XSLTProcessorModule.cpp b/mozilla/extensions/transformiix/build/XSLTProcessorModule.cpp index c6b90ff66bf..64d7d35a148 100755 --- a/mozilla/extensions/transformiix/build/XSLTProcessorModule.cpp +++ b/mozilla/extensions/transformiix/build/XSLTProcessorModule.cpp @@ -108,7 +108,7 @@ Shutdown(nsIModule* aSelf) } // Component Table -static nsModuleComponentInfo gComponents[] = { +static const nsModuleComponentInfo gComponents[] = { { "Transformiix XSLT Processor", TRANSFORMIIX_XSLT_PROCESSOR_CID, TRANSFORMIIX_XSLT_PROCESSOR_CONTRACTID, diff --git a/mozilla/extensions/universalchardet/src/nsUniversalCharDetModule.cpp b/mozilla/extensions/universalchardet/src/nsUniversalCharDetModule.cpp index 5836b397927..ba624fd7d06 100644 --- a/mozilla/extensions/universalchardet/src/nsUniversalCharDetModule.cpp +++ b/mozilla/extensions/universalchardet/src/nsUniversalCharDetModule.cpp @@ -95,7 +95,7 @@ static NS_METHOD nsUniversalCharDetectorRegistrationProc(nsIComponentManager *aC } // Component Table -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Universal Charset Detector", NS_UNIVERSAL_DETECTOR_CID, NS_CHARSET_DETECTOR_CONTRACTID_BASE "universal_charset_detector", nsUniversalXPCOMDetectorConstructor, diff --git a/mozilla/extensions/wallet/build/nsWalletViewerFactory.cpp b/mozilla/extensions/wallet/build/nsWalletViewerFactory.cpp index 34a460f9164..4e89704538b 100644 --- a/mozilla/extensions/wallet/build/nsWalletViewerFactory.cpp +++ b/mozilla/extensions/wallet/build/nsWalletViewerFactory.cpp @@ -49,7 +49,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(SignonViewerImpl) NS_GENERIC_FACTORY_CONSTRUCTOR(WalletEditorImpl) // The list of components we register -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "WalletPreview World Component", NS_WALLETPREVIEW_CID, "@mozilla.org/walletpreview/walletpreview-world;1", WalletPreviewImplConstructor }, { "SignonViewer World Component", NS_SIGNONVIEWER_CID, diff --git a/mozilla/extensions/wallet/src/nsWalletFactory.cpp b/mozilla/extensions/wallet/src/nsWalletFactory.cpp index 2e1da6eda13..1acbb3078d0 100644 --- a/mozilla/extensions/wallet/src/nsWalletFactory.cpp +++ b/mozilla/extensions/wallet/src/nsWalletFactory.cpp @@ -49,7 +49,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPasswordManager, Init) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSingleSignOnPrompt, Init) // The list of components we register -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { NS_WALLETSERVICE_CLASSNAME, NS_WALLETSERVICE_CID, NS_WALLETSERVICE_CONTRACTID, nsWalletlibServiceConstructor, nsWalletlibService::RegisterProc, diff --git a/mozilla/extensions/webservices/proxy/tests/wspproxytestmodule.cpp b/mozilla/extensions/webservices/proxy/tests/wspproxytestmodule.cpp index eb16e0b277f..70c8de9fd68 100644 --- a/mozilla/extensions/webservices/proxy/tests/wspproxytestmodule.cpp +++ b/mozilla/extensions/webservices/proxy/tests/wspproxytestmodule.cpp @@ -70,7 +70,7 @@ RegisterWSPProxyTest(nsIComponentManager *aCompMgr, return rv; } -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "WebServiceProxyTest", NS_WSPPROXYTEST_CID, NS_WSPPROXYTEST_CONTRACTID, WSPProxyTestConstructor, RegisterWSPProxyTest, nsnull, nsnull, NS_CI_INTERFACE_GETTER_NAME(WSPProxyTest), diff --git a/mozilla/extensions/xmlextras/build/src/nsXMLExtrasModule.cpp b/mozilla/extensions/xmlextras/build/src/nsXMLExtrasModule.cpp index b406b7b1b5c..632a3b10577 100644 --- a/mozilla/extensions/xmlextras/build/src/nsXMLExtrasModule.cpp +++ b/mozilla/extensions/xmlextras/build/src/nsXMLExtrasModule.cpp @@ -305,7 +305,7 @@ RegisterXMLExtras(nsIComponentManager *aCompMgr, // information like the function to create an instance, contractid, and // class name. // -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "XMLExtras component", NS_XML_EXTRAS_CID, NS_XML_EXTRAS_CONTRACTID, nsXMLExtrasConstructor, RegisterXMLExtras }, { "XML Serializer", NS_XMLSERIALIZER_CID, NS_XMLSERIALIZER_CONTRACTID, diff --git a/mozilla/extensions/xmlextras/interfaceinfo/src/iixmodule.cpp b/mozilla/extensions/xmlextras/interfaceinfo/src/iixmodule.cpp index 3df703e103e..0f126fd6002 100644 --- a/mozilla/extensions/xmlextras/interfaceinfo/src/iixmodule.cpp +++ b/mozilla/extensions/xmlextras/interfaceinfo/src/iixmodule.cpp @@ -54,7 +54,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsGenericInterfaceInfoSet) NS_GENERIC_FACTORY_CONSTRUCTOR(nsScriptableInterfaceInfo) -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { {nsnull, NS_GENERIC_INTERFACE_INFO_SET_CID, NS_GENERIC_INTERFACE_INFO_SET_CONTRACTID, diff --git a/mozilla/extensions/xmlextras/proxy/src/tests/wspproxytestmodule.cpp b/mozilla/extensions/xmlextras/proxy/src/tests/wspproxytestmodule.cpp index eb16e0b277f..70c8de9fd68 100644 --- a/mozilla/extensions/xmlextras/proxy/src/tests/wspproxytestmodule.cpp +++ b/mozilla/extensions/xmlextras/proxy/src/tests/wspproxytestmodule.cpp @@ -70,7 +70,7 @@ RegisterWSPProxyTest(nsIComponentManager *aCompMgr, return rv; } -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "WebServiceProxyTest", NS_WSPPROXYTEST_CID, NS_WSPPROXYTEST_CONTRACTID, WSPProxyTestConstructor, RegisterWSPProxyTest, nsnull, nsnull, NS_CI_INTERFACE_GETTER_NAME(WSPProxyTest), diff --git a/mozilla/extensions/xmlterm/build/mozXMLTermModule.cpp b/mozilla/extensions/xmlterm/build/mozXMLTermModule.cpp index 7239dffe0f8..3848ceb31a4 100644 --- a/mozilla/extensions/xmlterm/build/mozXMLTermModule.cpp +++ b/mozilla/extensions/xmlterm/build/mozXMLTermModule.cpp @@ -40,7 +40,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(mozXMLTerminal) NS_GENERIC_FACTORY_CONSTRUCTOR(mozXMLTermStream) // CIDs implemented by module -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { MOZLINETERM_CLASSNAME, MOZLINETERM_CID, diff --git a/mozilla/gfx/src/beos/nsGfxFactoryBeOS.cpp b/mozilla/gfx/src/beos/nsGfxFactoryBeOS.cpp index a257437a510..c1948bbd4f9 100644 --- a/mozilla/gfx/src/beos/nsGfxFactoryBeOS.cpp +++ b/mozilla/gfx/src/beos/nsGfxFactoryBeOS.cpp @@ -114,7 +114,7 @@ static NS_IMETHODIMP nsScriptableRegionConstructor(nsISupports *aOuter, REFNSIID return rv; } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "BeOS Font Metrics", NS_FONT_METRICS_CID, diff --git a/mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp b/mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp index e6375b007bc..9cbd9ccc078 100644 --- a/mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp +++ b/mozilla/gfx/src/gtk/nsGfxFactoryGTK.cpp @@ -125,7 +125,7 @@ static NS_IMETHODIMP nsScriptableRegionConstructor(nsISupports *aOuter, REFNSIID return rv; } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Gtk Font Metrics", NS_FONT_METRICS_CID, diff --git a/mozilla/gfx/src/mac/nsGfxFactoryMac.cpp b/mozilla/gfx/src/mac/nsGfxFactoryMac.cpp index 3daa7ae9be6..221e7b2a63f 100644 --- a/mozilla/gfx/src/mac/nsGfxFactoryMac.cpp +++ b/mozilla/gfx/src/mac/nsGfxFactoryMac.cpp @@ -99,7 +99,7 @@ nsScriptableRegionConstructor(nsISupports* aOuter, REFNSIID aIID, void** aResult return result->QueryInterface(aIID, aResult); } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "nsFontMetrics", NS_FONT_METRICS_CID, diff --git a/mozilla/gfx/src/os2/nsGfxFactoryOS2.cpp b/mozilla/gfx/src/os2/nsGfxFactoryOS2.cpp index fc189a9a69a..2adb7b43062 100644 --- a/mozilla/gfx/src/os2/nsGfxFactoryOS2.cpp +++ b/mozilla/gfx/src/os2/nsGfxFactoryOS2.cpp @@ -114,7 +114,7 @@ static NS_IMETHODIMP nsScriptableRegionConstructor(nsISupports *aOuter, REFNSIID return rv; } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "OS/2 Font Metrics", NS_FONT_METRICS_CID, diff --git a/mozilla/gfx/src/photon/nsGfxFactoryPh.cpp b/mozilla/gfx/src/photon/nsGfxFactoryPh.cpp index 9524ead71f6..8dc563187ca 100644 --- a/mozilla/gfx/src/photon/nsGfxFactoryPh.cpp +++ b/mozilla/gfx/src/photon/nsGfxFactoryPh.cpp @@ -114,7 +114,7 @@ static nsresult nsScriptableRegionConstructor(nsISupports *aOuter, REFNSIID aIID return rv; } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Ph Font Metrics", NS_FONT_METRICS_CID, diff --git a/mozilla/gfx/src/ps/nsGfxFactoryPS.cpp b/mozilla/gfx/src/ps/nsGfxFactoryPS.cpp index dd4690b7456..06d358060ef 100644 --- a/mozilla/gfx/src/ps/nsGfxFactoryPS.cpp +++ b/mozilla/gfx/src/ps/nsGfxFactoryPS.cpp @@ -46,7 +46,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextPS) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "GFX Postscript Device Context", NS_DEVICECONTEXTPS_CID, diff --git a/mozilla/gfx/src/qt/nsGfxFactoryQT.cpp b/mozilla/gfx/src/qt/nsGfxFactoryQT.cpp index 278bca5d127..e173fadfbbb 100644 --- a/mozilla/gfx/src/qt/nsGfxFactoryQT.cpp +++ b/mozilla/gfx/src/qt/nsGfxFactoryQT.cpp @@ -101,7 +101,7 @@ static nsresult nsScriptableRegionConstructor(nsISupports *aOuter,REFNSIID aIID, return rv; } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Qt Font Metrics", NS_FONT_METRICS_CID, diff --git a/mozilla/gfx/src/windows/nsGfxFactoryWin.cpp b/mozilla/gfx/src/windows/nsGfxFactoryWin.cpp index 0c45c6ac024..f4cbd092f71 100644 --- a/mozilla/gfx/src/windows/nsGfxFactoryWin.cpp +++ b/mozilla/gfx/src/windows/nsGfxFactoryWin.cpp @@ -143,7 +143,7 @@ nsScriptableRegionConstructor(nsISupports* aOuter, REFNSIID aIID, void** aResult return rv; } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "nsFontMetricsWin", NS_FONT_METRICS_CID, diff --git a/mozilla/gfx/src/xlib/nsGfxFactoryXlib.cpp b/mozilla/gfx/src/xlib/nsGfxFactoryXlib.cpp index 571a2092cfb..10964313660 100644 --- a/mozilla/gfx/src/xlib/nsGfxFactoryXlib.cpp +++ b/mozilla/gfx/src/xlib/nsGfxFactoryXlib.cpp @@ -113,7 +113,7 @@ static nsresult nsScriptableRegionConstructor(nsISupports *aOuter, REFNSIID aIID return rv; } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Xlib Font Metrics", NS_FONT_METRICS_CID, diff --git a/mozilla/gfx/src/xprint/nsGfxFactoryXP.cpp b/mozilla/gfx/src/xprint/nsGfxFactoryXP.cpp index 2c6a7f2420e..6081a72aafa 100644 --- a/mozilla/gfx/src/xprint/nsGfxFactoryXP.cpp +++ b/mozilla/gfx/src/xprint/nsGfxFactoryXP.cpp @@ -50,7 +50,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextXp) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "GFX Xprint Device Context", NS_DEVICECONTEXTXP_CID, diff --git a/mozilla/gfx2/src/nsGfxFactory.cpp b/mozilla/gfx2/src/nsGfxFactory.cpp index 6852bed91ce..0a201bb4e44 100644 --- a/mozilla/gfx2/src/nsGfxFactory.cpp +++ b/mozilla/gfx2/src/nsGfxFactory.cpp @@ -30,7 +30,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(gfxImageFrame) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "windows image frame", GFX_IMAGEFRAME_CID, diff --git a/mozilla/gfx2/src/windows/nsGfxFactory.cpp b/mozilla/gfx2/src/windows/nsGfxFactory.cpp index 4592dcd8c1e..b96286b28f8 100644 --- a/mozilla/gfx2/src/windows/nsGfxFactory.cpp +++ b/mozilla/gfx2/src/windows/nsGfxFactory.cpp @@ -30,7 +30,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(gfxImageFrameWin) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "windows image frame", GFX_IMAGEFRAMEWIN_CID, diff --git a/mozilla/htmlparser/src/nsParserModule.cpp b/mozilla/htmlparser/src/nsParserModule.cpp index 9014567cb7b..83f7cecbb6d 100644 --- a/mozilla/htmlparser/src/nsParserModule.cpp +++ b/mozilla/htmlparser/src/nsParserModule.cpp @@ -73,7 +73,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(CTransitionalDTD) NS_GENERIC_FACTORY_CONSTRUCTOR(CViewSourceHTML) NS_GENERIC_FACTORY_CONSTRUCTOR(nsParserService) -static nsModuleComponentInfo gComponents[] = { +static const nsModuleComponentInfo gComponents[] = { #ifdef NS_DEBUG { "Logging sink", NS_LOGGING_SINK_CID, NULL, nsLoggingSinkConstructor }, diff --git a/mozilla/intl/chardet/src/classic/nsClassicCharDetDll.cpp b/mozilla/intl/chardet/src/classic/nsClassicCharDetDll.cpp index 9b7f314238b..33511166f9a 100644 --- a/mozilla/intl/chardet/src/classic/nsClassicCharDetDll.cpp +++ b/mozilla/intl/chardet/src/classic/nsClassicCharDetDll.cpp @@ -65,7 +65,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsJAStringCharsetClassicDetector); NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOCharsetClassicDetector); NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOStringCharsetClassicDetector); -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "Classic JA Charset Detector", NS_JA_CLASSIC_DETECTOR_CID, NS_CHARSET_DETECTOR_CONTRACTID_BASE "jaclassic", nsJACharsetClassicDetectorConstructor}, { "Classic JA String Charset Detector", NS_JA_CLASSIC_DETECTOR_CID, diff --git a/mozilla/intl/chardet/src/nsCharDetModule.cpp b/mozilla/intl/chardet/src/nsCharDetModule.cpp index f2093e83cc8..eb0c1e3b881 100644 --- a/mozilla/intl/chardet/src/nsCharDetModule.cpp +++ b/mozilla/intl/chardet/src/nsCharDetModule.cpp @@ -405,7 +405,7 @@ static NS_METHOD nsUKProbDetectorRegistrationProc(nsIComponentManager *aCompMgr, } // Component Table -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Meta Charset", NS_META_CHARSET_CID, NS_META_CHARSET_CONTRACTID, nsMetaCharsetObserverConstructor, diff --git a/mozilla/intl/compatibility/src/nsI18nCompatibility.cpp b/mozilla/intl/compatibility/src/nsI18nCompatibility.cpp index 476f1e48179..ab7fdcb471c 100644 --- a/mozilla/intl/compatibility/src/nsI18nCompatibility.cpp +++ b/mozilla/intl/compatibility/src/nsI18nCompatibility.cpp @@ -80,7 +80,7 @@ NS_IMETHODIMP nsI18nCompatibility::CSIDtoCharsetName(PRUint16 csid, PRUnichar ** } NS_GENERIC_FACTORY_CONSTRUCTOR(nsI18nCompatibility) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "I18n compatibility", NS_I18NCOMPATIBILITY_CID, NS_I18NCOMPATIBILITY_CONTRACTID, nsI18nCompatibilityConstructor} diff --git a/mozilla/intl/locale/src/mac/nsLocaleSHLIB.cpp b/mozilla/intl/locale/src/mac/nsLocaleSHLIB.cpp index 9c70bfbbcca..9396b8b6f77 100644 --- a/mozilla/intl/locale/src/mac/nsLocaleSHLIB.cpp +++ b/mozilla/intl/locale/src/mac/nsLocaleSHLIB.cpp @@ -84,7 +84,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDateTimeFormatMac) NS_GENERIC_FACTORY_CONSTRUCTOR(nsLanguageAtomService) // The list of components we register -static nsModuleComponentInfo gComponents[] = { +static const nsModuleComponentInfo gComponents[] = { { "nsLocaleService component", NS_LOCALESERVICE_CID, NS_LOCALESERVICE_CONTRACTID, diff --git a/mozilla/intl/locale/src/os2/nsLocaleModule.cpp b/mozilla/intl/locale/src/os2/nsLocaleModule.cpp index d9d78fbc164..72c8a207c43 100644 --- a/mozilla/intl/locale/src/os2/nsLocaleModule.cpp +++ b/mozilla/intl/locale/src/os2/nsLocaleModule.cpp @@ -69,7 +69,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDateTimeFormatOS2) NS_GENERIC_FACTORY_CONSTRUCTOR(nsLanguageAtomService) // The list of components we register -static nsModuleComponentInfo gComponents[] = { +static const nsModuleComponentInfo gComponents[] = { { "nsLocaleService component", NS_LOCALESERVICE_CID, NS_LOCALESERVICE_CONTRACTID, diff --git a/mozilla/intl/locale/src/unix/nsLocaleModule.cpp b/mozilla/intl/locale/src/unix/nsLocaleModule.cpp index 3ddb48a63be..9fa7280fc42 100644 --- a/mozilla/intl/locale/src/unix/nsLocaleModule.cpp +++ b/mozilla/intl/locale/src/unix/nsLocaleModule.cpp @@ -77,7 +77,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDateTimeFormatUnix) NS_GENERIC_FACTORY_CONSTRUCTOR(nsLanguageAtomService) // The list of components we register -static nsModuleComponentInfo gComponents[] = { +static const nsModuleComponentInfo gComponents[] = { { "nsLocaleService component", NS_LOCALESERVICE_CID, NS_LOCALESERVICE_CONTRACTID, diff --git a/mozilla/intl/locale/src/windows/nsLocaleDLL.cpp b/mozilla/intl/locale/src/windows/nsLocaleDLL.cpp index 08ac0f47ed6..c92b5e04970 100644 --- a/mozilla/intl/locale/src/windows/nsLocaleDLL.cpp +++ b/mozilla/intl/locale/src/windows/nsLocaleDLL.cpp @@ -77,7 +77,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsLanguageAtomService) NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontPackageService) // The list of components we register -static nsModuleComponentInfo gComponents[] = { +static const nsModuleComponentInfo gComponents[] = { { "nsLocaleService component", NS_LOCALESERVICE_CID, NS_LOCALESERVICE_CONTRACTID, diff --git a/mozilla/intl/lwbrk/src/nsLWBrkModule.cpp b/mozilla/intl/lwbrk/src/nsLWBrkModule.cpp index fa5b8b924fd..05960313345 100644 --- a/mozilla/intl/lwbrk/src/nsLWBrkModule.cpp +++ b/mozilla/intl/lwbrk/src/nsLWBrkModule.cpp @@ -45,7 +45,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsLWBreakerFImp) -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "Line and Word Breaker", NS_LWBRK_CID, NS_LWBRK_CONTRACTID, nsLWBreakerFImpConstructor} }; diff --git a/mozilla/intl/strres/src/nsStringBundle.cpp b/mozilla/intl/strres/src/nsStringBundle.cpp index a9404832940..00c52cb429e 100644 --- a/mozilla/intl/strres/src/nsStringBundle.cpp +++ b/mozilla/intl/strres/src/nsStringBundle.cpp @@ -1004,7 +1004,7 @@ done: NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsStringBundleService, Init) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "String Bundle", NS_STRINGBUNDLESERVICE_CID, NS_STRINGBUNDLE_CONTRACTID, nsStringBundleServiceConstructor}, }; diff --git a/mozilla/intl/uconv/src/nsUConvModule.cpp b/mozilla/intl/uconv/src/nsUConvModule.cpp index 95021ccdab9..328a9d16ce6 100644 --- a/mozilla/intl/uconv/src/nsUConvModule.cpp +++ b/mozilla/intl/uconv/src/nsUConvModule.cpp @@ -110,7 +110,7 @@ nsConverterManagerDataRegister(nsIComponentManager* aCompMgr, return nsCharsetConverterManager::RegisterConverterManagerData(); } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Charset Conversion Manager", NS_ICHARSETCONVERTERMANAGER_CID, diff --git a/mozilla/intl/uconv/ucvcn/nsUCvCnModule.cpp b/mozilla/intl/uconv/ucvcn/nsUCvCnModule.cpp index ad14ab7494e..aaf11fc7a9a 100644 --- a/mozilla/intl/uconv/ucvcn/nsUCvCnModule.cpp +++ b/mozilla/intl/uconv/ucvcn/nsUCvCnModule.cpp @@ -108,7 +108,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGB18030Font0); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToGB18030Font1); -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { DECODER_NAME_BASE "GB2312" , NS_GB2312TOUNICODE_CID, diff --git a/mozilla/intl/uconv/ucvibm/nsUCvIBMModule.cpp b/mozilla/intl/uconv/ucvibm/nsUCvIBMModule.cpp index 57fcb198ea6..94871a608d8 100644 --- a/mozilla/intl/uconv/ucvibm/nsUCvIBMModule.cpp +++ b/mozilla/intl/uconv/ucvibm/nsUCvIBMModule.cpp @@ -103,7 +103,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP862); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP864); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP864i); -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { DECODER_NAME_BASE "IBM850" , NS_CP850TOUNICODE_CID, diff --git a/mozilla/intl/uconv/ucvja/nsUCvJaModule.cpp b/mozilla/intl/uconv/ucvja/nsUCvJaModule.cpp index 67fd9431fd1..fef551c8ad6 100644 --- a/mozilla/intl/uconv/ucvja/nsUCvJaModule.cpp +++ b/mozilla/intl/uconv/ucvja/nsUCvJaModule.cpp @@ -107,7 +107,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToJISx0201); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToJISx0208); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToJISx0212); -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { DECODER_NAME_BASE "Shift_JIS" , NS_SJISTOUNICODE_CID, diff --git a/mozilla/intl/uconv/ucvko/nsUCvKoModule.cpp b/mozilla/intl/uconv/ucvko/nsUCvKoModule.cpp index 2ebd72b1bdb..528382ee587 100644 --- a/mozilla/intl/uconv/ucvko/nsUCvKoModule.cpp +++ b/mozilla/intl/uconv/ucvko/nsUCvKoModule.cpp @@ -111,7 +111,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsCP949ToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCP949); NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO2022KRToUnicode); -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { DECODER_NAME_BASE "EUC-KR" , NS_EUCKRTOUNICODE_CID, diff --git a/mozilla/intl/uconv/ucvlatin/nsUCvLatinModule.cpp b/mozilla/intl/uconv/ucvlatin/nsUCvLatinModule.cpp index cfc8d15cc13..bdab3a7fcf7 100644 --- a/mozilla/intl/uconv/ucvlatin/nsUCvLatinModule.cpp +++ b/mozilla/intl/uconv/ucvlatin/nsUCvLatinModule.cpp @@ -428,7 +428,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacGurmukhi); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacGujarati); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMacHebrew); -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { DECODER_NAME_BASE "us-ascii" , NS_ASCIITOUNICODE_CID, diff --git a/mozilla/intl/uconv/ucvmath/nsUCvMathModule.cpp b/mozilla/intl/uconv/ucvmath/nsUCvMathModule.cpp index bfaf711162e..f70fd957a24 100644 --- a/mozilla/intl/uconv/ucvmath/nsUCvMathModule.cpp +++ b/mozilla/intl/uconv/ucvmath/nsUCvMathModule.cpp @@ -116,7 +116,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMathematica4); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMathematica5); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToMTExtra); -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { #if defined(XP_PC) || defined(XP_MAC) { diff --git a/mozilla/intl/uconv/ucvtw/nsUCvTwModule.cpp b/mozilla/intl/uconv/ucvtw/nsUCvTwModule.cpp index dc820f1ac93..95da775b184 100644 --- a/mozilla/intl/uconv/ucvtw/nsUCvTwModule.cpp +++ b/mozilla/intl/uconv/ucvtw/nsUCvTwModule.cpp @@ -101,7 +101,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsBIG5HKSCSToUnicode); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToBIG5HKSCS); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToHKSCS); -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { ENCODER_NAME_BASE "Big5" , NS_UNICODETOBIG5_CID, diff --git a/mozilla/intl/uconv/ucvtw2/nsUCvTw2Module.cpp b/mozilla/intl/uconv/ucvtw2/nsUCvTw2Module.cpp index e53a1c23567..b9d3cd67e05 100644 --- a/mozilla/intl/uconv/ucvtw2/nsUCvTw2Module.cpp +++ b/mozilla/intl/uconv/ucvtw2/nsUCvTw2Module.cpp @@ -153,7 +153,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCNS11643p5); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCNS11643p6); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnicodeToCNS11643p7); -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { DECODER_NAME_BASE "x-euc-tw" , NS_EUCTWTOUNICODE_CID, diff --git a/mozilla/intl/unicharutil/src/nsUcharUtilModule.cpp b/mozilla/intl/unicharutil/src/nsUcharUtilModule.cpp index 676a3e419ad..b663487c1c2 100644 --- a/mozilla/intl/unicharutil/src/nsUcharUtilModule.cpp +++ b/mozilla/intl/unicharutil/src/nsUcharUtilModule.cpp @@ -96,7 +96,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidi) // Since our class still refer to this two per dll global leave it here untill // we change their code -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Unichar Utility", NS_UNICHARUTIL_CID, NS_UNICHARUTIL_CONTRACTID, nsCaseConversionImp2Constructor}, diff --git a/mozilla/js/jsd/jsd_xpc.cpp b/mozilla/js/jsd/jsd_xpc.cpp index 29254fcd311..e39de3dadcc 100644 --- a/mozilla/js/jsd/jsd_xpc.cpp +++ b/mozilla/js/jsd/jsd_xpc.cpp @@ -2837,7 +2837,7 @@ jsdASObserver::Observe (nsISupports *aSubject, const char *aTopic, NS_GENERIC_FACTORY_CONSTRUCTOR(jsdASObserver); -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { {"JSDService", JSDSERVICE_CID, jsdServiceCtrID, jsdServiceConstructor}, {"JSDASObserver", JSDASO_CID, jsdASObserverCtrID, jsdASObserverConstructor} }; diff --git a/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp b/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp index 777fd4daba9..f0d45ec2a8c 100644 --- a/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp +++ b/mozilla/js/src/xpconnect/loader/mozJSComponentLoader.cpp @@ -1347,7 +1347,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(mozJSComponentLoader); NS_GENERIC_FACTORY_CONSTRUCTOR(mozJSSubScriptLoader); #endif -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "JS component loader", MOZJSCOMPONENTLOADER_CID, mozJSComponentLoaderContractID, mozJSComponentLoaderConstructor, RegisterJSLoader, UnregisterJSLoader }, diff --git a/mozilla/js/src/xpconnect/sample/xpcsample1.cpp b/mozilla/js/src/xpconnect/sample/xpcsample1.cpp index 9df88ed91fd..ebfe83ab5e7 100644 --- a/mozilla/js/src/xpconnect/sample/xpcsample1.cpp +++ b/mozilla/js/src/xpconnect/sample/xpcsample1.cpp @@ -325,7 +325,7 @@ nsXPCSample_HookerUpper::CreateSampleObjectAtGlobalScope(const char *name, PRInt NS_GENERIC_FACTORY_CONSTRUCTOR(nsXPCSample_HookerUpper) -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "sample xpc component", { 0x97380cf0, 0xc21b, 0x11d3, { 0x98, 0xc9, 0x0, 0x60, 0x8, 0x96, 0x24, 0x22 } }, NS_NSXPCSAMPLE_HOOKERUPPER_CONTRACTID, diff --git a/mozilla/js/src/xpconnect/src/xpcjsid.cpp b/mozilla/js/src/xpconnect/src/xpcjsid.cpp index 7d39b02df83..eff1626d377 100644 --- a/mozilla/js/src/xpconnect/src/xpcjsid.cpp +++ b/mozilla/js/src/xpconnect/src/xpcjsid.cpp @@ -294,7 +294,7 @@ static JSBool gClassObjectsWereInited = JS_FALSE; NS_DECL_CI_INTERFACE_GETTER(nsJSIID) // Can't make this static. http://bugzilla.mozilla.org/show_bug.cgi?id=81436 nsIClassInfo* NS_CLASSINFO_NAME(nsJSIID); -static nsModuleComponentInfo CI_nsJSIID = +static const nsModuleComponentInfo CI_nsJSIID = {"JSIID", {0x26ecb8d0, 0x35c9, 0x11d5, { 0x90, 0xb2, 0x0, 0x10, 0xa4, 0xe7, 0x3d, 0x9a }}, nsnull, nsnull, nsnull,nsnull, nsnull, @@ -305,7 +305,7 @@ static nsModuleComponentInfo CI_nsJSIID = NS_DECL_CI_INTERFACE_GETTER(nsJSCID) // Can't make this static. http://bugzilla.mozilla.org/show_bug.cgi?id=81436 nsIClassInfo* NS_CLASSINFO_NAME(nsJSCID); -static nsModuleComponentInfo CI_nsJSCID = +static const nsModuleComponentInfo CI_nsJSCID = {"JSCID", {0x9255b5b0, 0x35cf, 0x11d5, { 0x90, 0xb2, 0x0, 0x10, 0xa4, 0xe7, 0x3d, 0x9a }}, nsnull, nsnull, nsnull,nsnull, nsnull, diff --git a/mozilla/js/src/xpconnect/src/xpcmodule.cpp b/mozilla/js/src/xpconnect/src/xpcmodule.cpp index d595e637c07..cc17f287ccd 100644 --- a/mozilla/js/src/xpconnect/src/xpcmodule.cpp +++ b/mozilla/js/src/xpconnect/src/xpcmodule.cpp @@ -48,7 +48,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsScriptError) NS_DECL_CLASSINFO(nsXPCException) -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { {nsnull, NS_JS_ID_CID, XPC_ID_CONTRACTID, nsJSIDConstructor }, {nsnull, NS_XPCONNECT_CID, XPC_XPCONNECT_CONTRACTID, nsIXPConnectConstructor }, {nsnull, NS_XPC_THREAD_JSCONTEXT_STACK_CID, XPC_CONTEXT_STACK_CONTRACTID, nsIJSContextStackConstructor }, diff --git a/mozilla/js/src/xpconnect/tests/components/xpctest_module.cpp b/mozilla/js/src/xpconnect/tests/components/xpctest_module.cpp index a698c2d30da..d9b123acb2e 100644 --- a/mozilla/js/src/xpconnect/tests/components/xpctest_module.cpp +++ b/mozilla/js/src/xpconnect/tests/components/xpctest_module.cpp @@ -45,7 +45,7 @@ NS_DECL_CLASSINFO(xpcTestCallJS) NS_DECL_CLASSINFO(xpcTestChild2) // XXX contractids need to be standardized! -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { {nsnull, NS_ECHO_CID, "@mozilla.org/js/xpc/test/Echo;1", xpctest::ConstructEcho }, {nsnull, NS_CHILD_CID, "@mozilla.org/js/xpc/test/Child;1", xpctest::ConstructChild }, {nsnull, NS_NOISY_CID, "@mozilla.org/js/xpc/test/Noisy;1", xpctest::ConstructNoisy }, diff --git a/mozilla/js/src/xpconnect/tools/src/nsXPCToolsModule.cpp b/mozilla/js/src/xpconnect/tools/src/nsXPCToolsModule.cpp index a6ad8304251..7a78632acb6 100644 --- a/mozilla/js/src/xpconnect/tools/src/nsXPCToolsModule.cpp +++ b/mozilla/js/src/xpconnect/tools/src/nsXPCToolsModule.cpp @@ -52,7 +52,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsXPCToolsProfiler) { 0x7f5d12e0, 0xe97b, 0x11d3, \ { 0x8f, 0x69, 0x0, 0x10, 0xa4, 0xe7, 0x3d, 0x9a } } -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { {nsnull, COMPILER_CID, XPCTOOLS_COMPILER_CONTRACTID, nsXPCToolsCompilerConstructor}, {nsnull, PROFILER_CID, XPCTOOLS_PROFILER_CONTRACTID, nsXPCToolsProfilerConstructor} }; diff --git a/mozilla/layout/build/nsLayoutModule.cpp b/mozilla/layout/build/nsLayoutModule.cpp index 010174ebfe3..f5dcc948d13 100644 --- a/mozilla/layout/build/nsLayoutModule.cpp +++ b/mozilla/layout/build/nsLayoutModule.cpp @@ -232,7 +232,7 @@ MAKE_CTOR(CreateNewOutlinerBoxObject, nsIBoxObject, NS_NewOutlinerBo MAKE_CTOR(CreateNewAutoCopyService, nsIAutoCopyService, NS_NewAutoCopyService) // The list of components we register -static nsModuleComponentInfo gComponents[] = { +static const nsModuleComponentInfo gComponents[] = { #ifdef DEBUG { "Frame utility", NS_FRAME_UTIL_CID, diff --git a/mozilla/mailnews/absync/build/nsAbSyncFactory.cpp b/mozilla/mailnews/absync/build/nsAbSyncFactory.cpp index bc7a57d3901..7d7b80fc9f4 100644 --- a/mozilla/mailnews/absync/build/nsAbSyncFactory.cpp +++ b/mozilla/mailnews/absync/build/nsAbSyncFactory.cpp @@ -60,7 +60,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbSyncDriver) // //////////////////////////////////////////////////////////// -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Addressbook Sync", NS_ABSYNC_SERVICE_CID, diff --git a/mozilla/mailnews/addrbook/build/nsAbFactory.cpp b/mozilla/mailnews/addrbook/build/nsAbFactory.cpp index 8282b600468..db7d67a50cf 100644 --- a/mozilla/mailnews/addrbook/build/nsAbFactory.cpp +++ b/mozilla/mailnews/addrbook/build/nsAbFactory.cpp @@ -117,7 +117,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbLDAPAutoCompFormatter) NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbDirectoryQueryProxy) NS_GENERIC_FACTORY_CONSTRUCTOR(nsAbView); -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Address Book", NS_ADDRESSBOOK_CID, diff --git a/mozilla/mailnews/base/build/nsMsgFactory.cpp b/mozilla/mailnews/base/build/nsMsgFactory.cpp index c6f3df3e355..05704fb5439 100644 --- a/mozilla/mailnews/base/build/nsMsgFactory.cpp +++ b/mozilla/mailnews/base/build/nsMsgFactory.cpp @@ -148,7 +148,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsMessengerWinIntegration, Init); #endif // The list of components we register -static nsModuleComponentInfo gComponents[] = { +static const nsModuleComponentInfo gComponents[] = { { "Netscape Messenger Bootstrapper", NS_MESSENGERBOOTSTRAP_CID, NS_MESSENGERBOOTSTRAP_CONTRACTID, nsMessengerBootstrapConstructor, diff --git a/mozilla/mailnews/compose/build/nsMsgCompFactory.cpp b/mozilla/mailnews/compose/build/nsMsgCompFactory.cpp index 7365854c76f..d5bc68a47ad 100644 --- a/mozilla/mailnews/compose/build/nsMsgCompFactory.cpp +++ b/mozilla/mailnews/compose/build/nsMsgCompFactory.cpp @@ -98,7 +98,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsURLFetcher); // //////////////////////////////////////////////////////////// -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Msg Compose", NS_MSGCOMPOSE_CID, diff --git a/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp b/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp index f43ab4514ba..7cfe1c60121 100644 --- a/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp +++ b/mozilla/mailnews/db/msgdb/build/nsMsgDBFactory.cpp @@ -61,7 +61,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgRetentionSettings) NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgDownloadSettings) // The list of components we register -static nsModuleComponentInfo msgDB_components[] = { +static const nsModuleComponentInfo msgDB_components[] = { { "Mail DB", NS_MAILDB_CID, nsnull, nsMailDatabaseConstructor }, { "News DB", NS_NEWSDB_CID, nsnull, nsNewsDatabaseConstructor }, { "Imap DB", NS_IMAPDB_CID, nsnull, nsImapMailDatabaseConstructor }, diff --git a/mozilla/mailnews/extensions/smime/build/nsMsgSMIMEFactory.cpp b/mozilla/mailnews/extensions/smime/build/nsMsgSMIMEFactory.cpp index 52ce9d37782..2fe5b008be2 100644 --- a/mozilla/mailnews/extensions/smime/build/nsMsgSMIMEFactory.cpp +++ b/mozilla/mailnews/extensions/smime/build/nsMsgSMIMEFactory.cpp @@ -58,7 +58,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgSMIMEComposeFields); // //////////////////////////////////////////////////////////// -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Msg Compose Secure", NS_MSGCOMPOSESECURE_CID, diff --git a/mozilla/mailnews/imap/build/nsImapFactory.cpp b/mozilla/mailnews/imap/build/nsImapFactory.cpp index 0b683a76c52..8d0cbebdd7e 100644 --- a/mozilla/mailnews/imap/build/nsImapFactory.cpp +++ b/mozilla/mailnews/imap/build/nsImapFactory.cpp @@ -59,7 +59,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsImapMailFolder) NS_GENERIC_FACTORY_CONSTRUCTOR(nsImapMockChannel) // The list of components we register -static nsModuleComponentInfo gComponents[] = { +static const nsModuleComponentInfo gComponents[] = { { "IMAP URL", NS_IMAPURL_CID, nsnull, nsImapUrlConstructor }, diff --git a/mozilla/mailnews/import/eudora/src/nsEudoraFactory.cpp b/mozilla/mailnews/import/eudora/src/nsEudoraFactory.cpp index 3cc69c60138..b5131a3fd34 100644 --- a/mozilla/mailnews/import/eudora/src/nsEudoraFactory.cpp +++ b/mozilla/mailnews/import/eudora/src/nsEudoraFactory.cpp @@ -62,7 +62,7 @@ NS_METHOD EudoraRegister(nsIComponentManager *aCompMgr, NS_GENERIC_FACTORY_CONSTRUCTOR(nsEudoraImport) -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "Text Import Component", NS_EUDORAIMPORT_CID, "@mozilla.org/import/import-eudora;1", diff --git a/mozilla/mailnews/import/oexpress/nsOEFactory.cpp b/mozilla/mailnews/import/oexpress/nsOEFactory.cpp index 73886e64f1e..71dc7d82368 100644 --- a/mozilla/mailnews/import/oexpress/nsOEFactory.cpp +++ b/mozilla/mailnews/import/oexpress/nsOEFactory.cpp @@ -81,7 +81,7 @@ NS_METHOD OERegister(nsIComponentManager *aCompMgr, NS_GENERIC_FACTORY_CONSTRUCTOR(nsOEImport) -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "Outlook Express Import Component", NS_OEIMPORT_CID, "@mozilla.org/import/import-oe;1", diff --git a/mozilla/mailnews/import/outlook/src/nsOutlookFactory.cpp b/mozilla/mailnews/import/outlook/src/nsOutlookFactory.cpp index cdb17ee6d5a..9842da48aec 100644 --- a/mozilla/mailnews/import/outlook/src/nsOutlookFactory.cpp +++ b/mozilla/mailnews/import/outlook/src/nsOutlookFactory.cpp @@ -81,7 +81,7 @@ NS_METHOD OutlookRegister(nsIComponentManager *aCompMgr, NS_GENERIC_FACTORY_CONSTRUCTOR(nsOutlookImport) -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "Outlook Import Component", NS_OUTLOOKIMPORT_CID, "@mozilla.org/import/import-outlook;1", diff --git a/mozilla/mailnews/import/src/nsImportFactory.cpp b/mozilla/mailnews/import/src/nsImportFactory.cpp index 865d7e2263b..72cede261b7 100644 --- a/mozilla/mailnews/import/src/nsImportFactory.cpp +++ b/mozilla/mailnews/import/src/nsImportFactory.cpp @@ -50,7 +50,7 @@ extern NS_METHOD NS_NewImportService(nsISupports* aOuter, REFNSIID aIID, void ** //---------------------------------------------------------------------- //---------------------------------------- -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "Import Service Component", NS_IMPORTSERVICE_CID, NS_IMPORTSERVICE_CONTRACTID, NS_NewImportService diff --git a/mozilla/mailnews/import/text/src/nsTextFactory.cpp b/mozilla/mailnews/import/text/src/nsTextFactory.cpp index 38874e81b9e..6e40eb7eb15 100644 --- a/mozilla/mailnews/import/text/src/nsTextFactory.cpp +++ b/mozilla/mailnews/import/text/src/nsTextFactory.cpp @@ -62,7 +62,7 @@ NS_METHOD TextRegister(nsIComponentManager *aCompMgr, NS_GENERIC_FACTORY_CONSTRUCTOR(nsTextImport) -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "Text Import Component", NS_TEXTIMPORT_CID, "@mozilla.org/import/import-text;1", diff --git a/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp b/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp index 0591afc9789..487e79692c9 100644 --- a/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp +++ b/mozilla/mailnews/local/build/nsMsgLocalFactory.cpp @@ -80,7 +80,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsNoIncomingServer) NS_GENERIC_FACTORY_CONSTRUCTOR(nsLocalStringService) // The list of components we register -static nsModuleComponentInfo gComponents[] = { +static const nsModuleComponentInfo gComponents[] = { { "Mailbox URL", NS_MAILBOXURL_CID, NS_MAILBOXURL_CONTRACTID, nsMailboxUrlConstructor }, diff --git a/mozilla/mailnews/mapi/mapihook/src/msgMapiSupport.cpp b/mozilla/mailnews/mapi/mapihook/src/msgMapiSupport.cpp index 53090a035d9..8fecb473c9d 100644 --- a/mozilla/mailnews/mapi/mapihook/src/msgMapiSupport.cpp +++ b/mozilla/mailnews/mapi/mapihook/src/msgMapiSupport.cpp @@ -186,7 +186,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsMapiRegistry); NS_GENERIC_FACTORY_CONSTRUCTOR(nsMapiSupport); // The list of components we register -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { NS_IMAPIREGISTRY_CLASSNAME, diff --git a/mozilla/mailnews/mime/build/nsMimeModule.cpp b/mozilla/mailnews/mime/build/nsMimeModule.cpp index 489c18a337e..d6855f6db18 100644 --- a/mozilla/mailnews/mime/build/nsMimeModule.cpp +++ b/mozilla/mailnews/mime/build/nsMimeModule.cpp @@ -63,7 +63,7 @@ static NS_IMETHODIMP streamConverterDestructor() } // The list of components we register -static nsModuleComponentInfo gComponents[] = { +static const nsModuleComponentInfo gComponents[] = { { "MimeObjectClassAccess", NS_MIME_OBJECT_CLASS_ACCESS_CID, nsnull, nsMimeObjectClassAccessConstructor }, diff --git a/mozilla/mailnews/mime/cthandlers/calendar/nsCalendarFactory.cpp b/mozilla/mailnews/mime/cthandlers/calendar/nsCalendarFactory.cpp index b79911d555a..f4e9f990023 100644 --- a/mozilla/mailnews/mime/cthandlers/calendar/nsCalendarFactory.cpp +++ b/mozilla/mailnews/mime/cthandlers/calendar/nsCalendarFactory.cpp @@ -91,7 +91,7 @@ nsCalendarMimeContentTypeHandlerConstructor(nsISupports *aOuter, // information like the function to create an instance, contractid, and // class name. // -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "MIME Calendar Handler", NS_CALENDAR_CONTENT_TYPE_HANDLER_CID, "@mozilla.org/mimecth;1?type=text/calendar", nsCalendarMimeContentTypeHandlerConstructor, } diff --git a/mozilla/mailnews/mime/cthandlers/smimestub/nsSMIMEStubFactory.cpp b/mozilla/mailnews/mime/cthandlers/smimestub/nsSMIMEStubFactory.cpp index 0b9b8a863c0..8b6bbf8de83 100644 --- a/mozilla/mailnews/mime/cthandlers/smimestub/nsSMIMEStubFactory.cpp +++ b/mozilla/mailnews/mime/cthandlers/smimestub/nsSMIMEStubFactory.cpp @@ -112,7 +112,7 @@ nsSMimeMimeContentTypeHandlerConstructor(nsISupports *aOuter, // information like the function to create an instance, contractid, and // class name. // -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "MIME SMIMEStubed Mail Handler", NS_SMIME_CONTENT_TYPE_HANDLER_CID, "@mozilla.org/mimecth;1?type=application/x-pkcs7-mime", nsSMimeMimeContentTypeHandlerConstructor, }, diff --git a/mozilla/mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp b/mozilla/mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp index 2145d685f30..107b34d9c7f 100644 --- a/mozilla/mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp +++ b/mozilla/mailnews/mime/cthandlers/vcard/nsVCardFactory.cpp @@ -94,7 +94,7 @@ nsVCardMimeContentTypeHandlerConstructor(nsISupports *aOuter, // information like the function to create an instance, contractid, and // class name. // -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "MIME VCard Handler", NS_VCARD_CONTENT_TYPE_HANDLER_CID, "@mozilla.org/mimecth;1?type=text/x-vcard", nsVCardMimeContentTypeHandlerConstructor, } diff --git a/mozilla/mailnews/mime/emitters/build/nsEmitterFactory.cpp b/mozilla/mailnews/mime/emitters/build/nsEmitterFactory.cpp index e84d4d15abf..c6d4ad01f05 100644 --- a/mozilla/mailnews/mime/emitters/build/nsEmitterFactory.cpp +++ b/mozilla/mailnews/mime/emitters/build/nsEmitterFactory.cpp @@ -78,7 +78,7 @@ static NS_METHOD UnRegisterMimeEmitter(nsIComponentManager *aCompMgr, return NS_OK; } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "HTML MIME Emitter", NS_HTML_MIME_EMITTER_CID, diff --git a/mozilla/mailnews/news/build/nsMsgNewsFactory.cpp b/mozilla/mailnews/news/build/nsMsgNewsFactory.cpp index 5993294a3de..9b9d1d704d1 100644 --- a/mozilla/mailnews/news/build/nsMsgNewsFactory.cpp +++ b/mozilla/mailnews/news/build/nsMsgNewsFactory.cpp @@ -70,7 +70,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsNNTPNewsgroupList) NS_GENERIC_FACTORY_CONSTRUCTOR(nsMsgNewsFolder) NS_GENERIC_FACTORY_CONSTRUCTOR(nsNewsDownloadDialogArgs) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "NNTP URL", NS_NNTPURL_CID, diff --git a/mozilla/modules/libimg/gifcom/nsGIFModule.cpp b/mozilla/modules/libimg/gifcom/nsGIFModule.cpp index f68f070047c..d2194bdf5d9 100644 --- a/mozilla/modules/libimg/gifcom/nsGIFModule.cpp +++ b/mozilla/modules/libimg/gifcom/nsGIFModule.cpp @@ -43,7 +43,7 @@ static NS_DEFINE_CID(kGIFDecoderCID, NS_GIFDECODER_CID); -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "GIF Decoder", NS_GIFDECODER_CID, diff --git a/mozilla/modules/libjar/nsJARFactory.cpp b/mozilla/modules/libjar/nsJARFactory.cpp index c263f3ebd92..d375303a3d9 100644 --- a/mozilla/modules/libjar/nsJARFactory.cpp +++ b/mozilla/modules/libjar/nsJARFactory.cpp @@ -42,7 +42,7 @@ extern nsRecyclingAllocator *gZlibAllocator; // The list of components we register -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Zip Reader", NS_ZIPREADER_CID, diff --git a/mozilla/modules/libjar/nsJARProtocolModule.cpp b/mozilla/modules/libjar/nsJARProtocolModule.cpp index 7e4f4b1aa73..d871cc35021 100644 --- a/mozilla/modules/libjar/nsJARProtocolModule.cpp +++ b/mozilla/modules/libjar/nsJARProtocolModule.cpp @@ -39,7 +39,7 @@ #include "nsJARProtocolHandler.h" -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "JAR Protocol Handler", NS_JARPROTOCOLHANDLER_CID, diff --git a/mozilla/modules/libpr0n/decoders/bmp/nsBMPModule.cpp b/mozilla/modules/libpr0n/decoders/bmp/nsBMPModule.cpp index c2b980c4e22..d8e1d2d13c7 100644 --- a/mozilla/modules/libpr0n/decoders/bmp/nsBMPModule.cpp +++ b/mozilla/modules/libpr0n/decoders/bmp/nsBMPModule.cpp @@ -34,7 +34,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsICODecoder) NS_GENERIC_FACTORY_CONSTRUCTOR(nsBMPDecoder) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "ICO Decoder", NS_ICODECODER_CID, diff --git a/mozilla/modules/libpr0n/decoders/gif/nsGIFModule.cpp b/mozilla/modules/libpr0n/decoders/gif/nsGIFModule.cpp index fdeef8595ab..4e63538cf28 100644 --- a/mozilla/modules/libpr0n/decoders/gif/nsGIFModule.cpp +++ b/mozilla/modules/libpr0n/decoders/gif/nsGIFModule.cpp @@ -47,7 +47,7 @@ extern nsRecyclingAllocator *gGifAllocator; NS_GENERIC_FACTORY_CONSTRUCTOR(nsGIFDecoder2) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "GIF Decoder", NS_GIFDECODER2_CID, diff --git a/mozilla/modules/libpr0n/decoders/icon/nsIconModule.cpp b/mozilla/modules/libpr0n/decoders/icon/nsIconModule.cpp index 148e017933a..2990355a5b5 100644 --- a/mozilla/modules/libpr0n/decoders/icon/nsIconModule.cpp +++ b/mozilla/modules/libpr0n/decoders/icon/nsIconModule.cpp @@ -36,7 +36,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsIconDecoder) NS_GENERIC_FACTORY_CONSTRUCTOR(nsIconProtocolHandler) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "icon decoder", NS_ICONDECODER_CID, diff --git a/mozilla/modules/libpr0n/decoders/jpeg/nsJPEGFactory.cpp b/mozilla/modules/libpr0n/decoders/jpeg/nsJPEGFactory.cpp index 28e5288c80d..666f8cdeed6 100644 --- a/mozilla/modules/libpr0n/decoders/jpeg/nsJPEGFactory.cpp +++ b/mozilla/modules/libpr0n/decoders/jpeg/nsJPEGFactory.cpp @@ -30,7 +30,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsJPEGDecoder) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "ppm decoder", NS_JPEGDECODER_CID, diff --git a/mozilla/modules/libpr0n/decoders/mng/nsMNGFactory.cpp b/mozilla/modules/libpr0n/decoders/mng/nsMNGFactory.cpp index 6e71b434b5f..02c34bc546b 100644 --- a/mozilla/modules/libpr0n/decoders/mng/nsMNGFactory.cpp +++ b/mozilla/modules/libpr0n/decoders/mng/nsMNGFactory.cpp @@ -29,7 +29,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsMNGDecoder) NS_GENERIC_FACTORY_CONSTRUCTOR(imgContainerMNG) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "MNG decoder", NS_MNGDECODER_CID, diff --git a/mozilla/modules/libpr0n/decoders/png/nsPNGFactory.cpp b/mozilla/modules/libpr0n/decoders/png/nsPNGFactory.cpp index 17ffa300d02..058b663dad4 100644 --- a/mozilla/modules/libpr0n/decoders/png/nsPNGFactory.cpp +++ b/mozilla/modules/libpr0n/decoders/png/nsPNGFactory.cpp @@ -30,7 +30,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsPNGDecoder) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "PNG decoder", NS_PNGDECODER_CID, diff --git a/mozilla/modules/libpr0n/decoders/ppm/nsPPMFactory.cpp b/mozilla/modules/libpr0n/decoders/ppm/nsPPMFactory.cpp index 7ad5b0fa470..a72ecb66b15 100644 --- a/mozilla/modules/libpr0n/decoders/ppm/nsPPMFactory.cpp +++ b/mozilla/modules/libpr0n/decoders/ppm/nsPPMFactory.cpp @@ -30,7 +30,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsPPMDecoder) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "ppm decoder", NS_PPMDECODER_CID, diff --git a/mozilla/modules/libpr0n/src/ImageFactory.cpp b/mozilla/modules/libpr0n/src/ImageFactory.cpp index a3ed955cc34..601fa82bf9d 100644 --- a/mozilla/modules/libpr0n/src/ImageFactory.cpp +++ b/mozilla/modules/libpr0n/src/ImageFactory.cpp @@ -37,7 +37,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(imgContainer) NS_GENERIC_FACTORY_CONSTRUCTOR(imgLoader) NS_GENERIC_FACTORY_CONSTRUCTOR(imgRequestProxy) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "image cache", NS_IMGCACHE_CID, diff --git a/mozilla/modules/libpref/src/nsPrefsFactory.cpp b/mozilla/modules/libpref/src/nsPrefsFactory.cpp index e32c16691cc..aa58f346033 100644 --- a/mozilla/modules/libpref/src/nsPrefsFactory.cpp +++ b/mozilla/modules/libpref/src/nsPrefsFactory.cpp @@ -49,7 +49,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrefService, Init) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPrefLocalizedString, Init) // The list of components we register -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { NS_PREFSERVICE_CLASSNAME, diff --git a/mozilla/modules/oji/src/nsCJVMManagerFactory.cpp b/mozilla/modules/oji/src/nsCJVMManagerFactory.cpp index c747973b8e0..b96871340e0 100644 --- a/mozilla/modules/oji/src/nsCJVMManagerFactory.cpp +++ b/mozilla/modules/oji/src/nsCJVMManagerFactory.cpp @@ -47,7 +47,7 @@ */ // The list of components we register -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "JVM Manager Service", NS_JVMMANAGER_CID, diff --git a/mozilla/modules/oji/tests/src/TestLoader/OJITestLoaderFactory.cpp b/mozilla/modules/oji/tests/src/TestLoader/OJITestLoaderFactory.cpp index 9bac56209d6..a849c9c9535 100755 --- a/mozilla/modules/oji/tests/src/TestLoader/OJITestLoaderFactory.cpp +++ b/mozilla/modules/oji/tests/src/TestLoader/OJITestLoaderFactory.cpp @@ -38,7 +38,7 @@ static const char* loaderRegistryPath = "@mozilla.org/oji/test/api/loader;1"; static const char* loaderRegistryDesc = "OJI API Test Loader"; // The list of components we register -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { loaderRegistryDesc, OJITESTLOADER_CID, diff --git a/mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp b/mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp index 31b38ed2dbd..6eb9657b635 100644 --- a/mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginClassicModule.cpp @@ -80,7 +80,7 @@ NS_METHOD nsClassicPluginFactory::CreatePlugin(nsIServiceManagerObsolete* aServi return ns4xPlugin::CreatePlugin(aServiceMgr, aFileName, aFullPath, aLibrary, aResult); } -static nsModuleComponentInfo gComponentInfo[] = { +static const nsModuleComponentInfo gComponentInfo[] = { { "Classic Plugin Factory", NS_CLASSIC_PLUGIN_FACTORY_CID, NS_CLASSIC_PLUGIN_FACTORY_CONTRACTID, diff --git a/mozilla/modules/plugin/base/src/nsPluginModule.cpp b/mozilla/modules/plugin/base/src/nsPluginModule.cpp index 3ec1769c7f3..40b27b4c161 100644 --- a/mozilla/modules/plugin/base/src/nsPluginModule.cpp +++ b/mozilla/modules/plugin/base/src/nsPluginModule.cpp @@ -43,7 +43,7 @@ #include "nsPluginDocLoaderFactory.h" #include "ns4xPlugin.h" -static nsModuleComponentInfo gComponentInfo[] = { +static const nsModuleComponentInfo gComponentInfo[] = { { "Plugin Host", NS_PLUGIN_HOST_CID, "@mozilla.org/plugin/host;1", diff --git a/mozilla/modules/plugin/samples/simple/npsimple.cpp b/mozilla/modules/plugin/samples/simple/npsimple.cpp index 1ae1bd5b08f..d08cc6a3b6b 100644 --- a/mozilla/modules/plugin/samples/simple/npsimple.cpp +++ b/mozilla/modules/plugin/samples/simple/npsimple.cpp @@ -377,7 +377,7 @@ protected: ******************************************************************************/ // XXXwaterson document! -static nsModuleComponentInfo gComponentInfo[] = { +static const nsModuleComponentInfo gComponentInfo[] = { { "Simple Plugin", NS_SIMPLEPLUGIN_CID, NS_INLINE_PLUGIN_CONTRACTID_PREFIX PLUGIN_MIME_TYPE, diff --git a/mozilla/modules/plugin/samples/testevents/npevents.cpp b/mozilla/modules/plugin/samples/testevents/npevents.cpp index e9fd7d5ba14..5cd79c8c166 100644 --- a/mozilla/modules/plugin/samples/testevents/npevents.cpp +++ b/mozilla/modules/plugin/samples/testevents/npevents.cpp @@ -244,7 +244,7 @@ protected: }; // The module loader information. -static nsModuleComponentInfo gComponentInfo[] = { +static const nsModuleComponentInfo gComponentInfo[] = { { "Events Sample Plugin", NS_EVENTSAMPLEPLUGIN_CID, NS_INLINE_PLUGIN_CONTRACTID_PREFIX PLUGIN_MIME_TYPE, diff --git a/mozilla/netwerk/build/nsNetModule.cpp b/mozilla/netwerk/build/nsNetModule.cpp index c1949a37404..564bb31edb2 100644 --- a/mozilla/netwerk/build/nsNetModule.cpp +++ b/mozilla/netwerk/build/nsNetModule.cpp @@ -583,7 +583,7 @@ static void PR_CALLBACK nsNeckoShutdown(nsIModule *neckoModule) nsStandardURL::ShutdownGlobalObjects(); } -static nsModuleComponentInfo gNetModuleInfo[] = { +static const nsModuleComponentInfo gNetModuleInfo[] = { { NS_IOSERVICE_CLASSNAME, NS_IOSERVICE_CID, NS_IOSERVICE_CONTRACTID, diff --git a/mozilla/netwerk/build2/nsNetModule2.cpp b/mozilla/netwerk/build2/nsNetModule2.cpp index 8e141b6ca5e..723ea0d261d 100644 --- a/mozilla/netwerk/build2/nsNetModule2.cpp +++ b/mozilla/netwerk/build2/nsNetModule2.cpp @@ -48,7 +48,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFtpProtocolHandler, Init); /////////////////////////////////////////////////////////////////////////////// // Module implementation for the net library -static nsModuleComponentInfo gNetModuleInfo[] = { +static const nsModuleComponentInfo gNetModuleInfo[] = { //gopher: { "The Gopher Protocol Handler", NS_GOPHERHANDLER_CID, diff --git a/mozilla/netwerk/cache/src/nsCacheModule.cpp b/mozilla/netwerk/cache/src/nsCacheModule.cpp index d7148b44714..ddc31c5a414 100644 --- a/mozilla/netwerk/cache/src/nsCacheModule.cpp +++ b/mozilla/netwerk/cache/src/nsCacheModule.cpp @@ -29,7 +29,7 @@ // nsCacheService // -static nsModuleComponentInfo gResComponents[] = { +static const nsModuleComponentInfo gResComponents[] = { { NS_CACHESERVICE_CLASSNAME, NS_CACHESERVICE_CID, diff --git a/mozilla/netwerk/mime/src/nsMIMEServiceModule.cpp b/mozilla/netwerk/mime/src/nsMIMEServiceModule.cpp index 28cc5347e69..efe8af3bb04 100644 --- a/mozilla/netwerk/mime/src/nsMIMEServiceModule.cpp +++ b/mozilla/netwerk/mime/src/nsMIMEServiceModule.cpp @@ -41,7 +41,7 @@ #include "nsMIMEInfoImpl.h" NS_GENERIC_FACTORY_CONSTRUCTOR(nsMIMEInfoImpl); -static nsModuleComponentInfo gResComponents[] = { +static const nsModuleComponentInfo gResComponents[] = { { "The MIME mapping service", NS_MIMESERVICE_CID, "@mozilla.org/mime;1", diff --git a/mozilla/netwerk/protocol/about/src/nsAboutProtocolModule.cpp b/mozilla/netwerk/protocol/about/src/nsAboutProtocolModule.cpp index 9dad8b07bf2..65d149d3dd2 100644 --- a/mozilla/netwerk/protocol/about/src/nsAboutProtocolModule.cpp +++ b/mozilla/netwerk/protocol/about/src/nsAboutProtocolModule.cpp @@ -44,7 +44,7 @@ #include "nsAboutCredits.h" #include "mzAboutMozilla.h" -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "About Protocol Handler", NS_ABOUTPROTOCOLHANDLER_CID, diff --git a/mozilla/netwerk/protocol/data/src/nsDataModule.cpp b/mozilla/netwerk/protocol/data/src/nsDataModule.cpp index 2afda984ba7..b9acee3362b 100644 --- a/mozilla/netwerk/protocol/data/src/nsDataModule.cpp +++ b/mozilla/netwerk/protocol/data/src/nsDataModule.cpp @@ -40,7 +40,7 @@ #include "nsDataHandler.h" // The list of components we register -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "Data Protocol Handler", NS_DATAHANDLER_CID, NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "data", diff --git a/mozilla/netwerk/protocol/datetime/src/nsDateTimeModule.cpp b/mozilla/netwerk/protocol/datetime/src/nsDateTimeModule.cpp index 5ca6de07d58..0646d2905bd 100644 --- a/mozilla/netwerk/protocol/datetime/src/nsDateTimeModule.cpp +++ b/mozilla/netwerk/protocol/datetime/src/nsDateTimeModule.cpp @@ -38,7 +38,7 @@ #include "nsIGenericFactory.h" #include "nsDateTimeHandler.h" -static nsModuleComponentInfo gResComponents[] = { +static const nsModuleComponentInfo gResComponents[] = { { "The DateTime Protocol Handler", NS_DATETIMEHANDLER_CID, NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "datetime", diff --git a/mozilla/netwerk/protocol/file/src/nsFileProtocolModule.cpp b/mozilla/netwerk/protocol/file/src/nsFileProtocolModule.cpp index 73fe2672ca2..de32277fafb 100644 --- a/mozilla/netwerk/protocol/file/src/nsFileProtocolModule.cpp +++ b/mozilla/netwerk/protocol/file/src/nsFileProtocolModule.cpp @@ -40,7 +40,7 @@ #include "nsFileChannel.h" #include "nsFileProtocolHandler.h" -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "File Protocol Handler", NS_FILEPROTOCOLHANDLER_CID, diff --git a/mozilla/netwerk/protocol/finger/src/nsFingerModule.cpp b/mozilla/netwerk/protocol/finger/src/nsFingerModule.cpp index 97d3cdf0745..fdd01bc10d1 100644 --- a/mozilla/netwerk/protocol/finger/src/nsFingerModule.cpp +++ b/mozilla/netwerk/protocol/finger/src/nsFingerModule.cpp @@ -23,7 +23,7 @@ #include "nsIGenericFactory.h" #include "nsFingerHandler.h" -static nsModuleComponentInfo gResComponents[] = { +static const nsModuleComponentInfo gResComponents[] = { { "The Finger Protocol Handler", NS_FINGERHANDLER_CID, NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "finger", diff --git a/mozilla/netwerk/protocol/jar/src/nsJARProtocolModule.cpp b/mozilla/netwerk/protocol/jar/src/nsJARProtocolModule.cpp index 7e4f4b1aa73..d871cc35021 100644 --- a/mozilla/netwerk/protocol/jar/src/nsJARProtocolModule.cpp +++ b/mozilla/netwerk/protocol/jar/src/nsJARProtocolModule.cpp @@ -39,7 +39,7 @@ #include "nsJARProtocolHandler.h" -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "JAR Protocol Handler", NS_JARPROTOCOLHANDLER_CID, diff --git a/mozilla/netwerk/protocol/keyword/src/nsKeywordModule.cpp b/mozilla/netwerk/protocol/keyword/src/nsKeywordModule.cpp index 8b5ba8edd9f..0956bed127e 100644 --- a/mozilla/netwerk/protocol/keyword/src/nsKeywordModule.cpp +++ b/mozilla/netwerk/protocol/keyword/src/nsKeywordModule.cpp @@ -38,7 +38,7 @@ #include "nsIGenericFactory.h" #include "nsKeywordProtocolHandler.h" -static nsModuleComponentInfo gResComponents[] = { +static const nsModuleComponentInfo gResComponents[] = { { "The Keyword Protocol Handler", NS_KEYWORDPROTOCOLHANDLER_CID, NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "keyword", diff --git a/mozilla/netwerk/protocol/theme/src/nsThemeModule.cpp b/mozilla/netwerk/protocol/theme/src/nsThemeModule.cpp index d5d541e0f36..a53f0a614f1 100644 --- a/mozilla/netwerk/protocol/theme/src/nsThemeModule.cpp +++ b/mozilla/netwerk/protocol/theme/src/nsThemeModule.cpp @@ -24,7 +24,7 @@ #include "nsIGenericFactory.h" #include "nsThemeHandler.h" -static nsModuleComponentInfo gResComponents[] = { +static const nsModuleComponentInfo gResComponents[] = { { "The Theme Protocol Handler", NS_THEMEHANDLER_CID, NS_NETWORK_PROTOCOL_CONTRACTID_PREFIX "theme", diff --git a/mozilla/netwerk/streamconv/converters/nsConvFactories.cpp b/mozilla/netwerk/streamconv/converters/nsConvFactories.cpp index 8a6b077d178..79a2508a9a2 100644 --- a/mozilla/netwerk/streamconv/converters/nsConvFactories.cpp +++ b/mozilla/netwerk/streamconv/converters/nsConvFactories.cpp @@ -234,7 +234,7 @@ CreateNewNSTXTToHTMLConvFactory(nsISupports *aOuter, REFNSIID aIID, void **aResu // The list of components we register -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "FTPDirListingConverter", NS_FTPDIRLISTINGCONVERTER_CID, diff --git a/mozilla/netwerk/streamconv/src/nsStreamConvServiceFactory.cpp b/mozilla/netwerk/streamconv/src/nsStreamConvServiceFactory.cpp index 73fbe91966b..44b6f38bb62 100644 --- a/mozilla/netwerk/streamconv/src/nsStreamConvServiceFactory.cpp +++ b/mozilla/netwerk/streamconv/src/nsStreamConvServiceFactory.cpp @@ -95,7 +95,7 @@ CreateNewStreamConv(nsISupports* aOuter, REFNSIID aIID, void **aResult) } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Stream Converter Service", NS_STREAMCONVERTERSERVICE_CID, diff --git a/mozilla/parser/htmlparser/src/nsParserModule.cpp b/mozilla/parser/htmlparser/src/nsParserModule.cpp index 9014567cb7b..83f7cecbb6d 100644 --- a/mozilla/parser/htmlparser/src/nsParserModule.cpp +++ b/mozilla/parser/htmlparser/src/nsParserModule.cpp @@ -73,7 +73,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(CTransitionalDTD) NS_GENERIC_FACTORY_CONSTRUCTOR(CViewSourceHTML) NS_GENERIC_FACTORY_CONSTRUCTOR(nsParserService) -static nsModuleComponentInfo gComponents[] = { +static const nsModuleComponentInfo gComponents[] = { #ifdef NS_DEBUG { "Logging sink", NS_LOGGING_SINK_CID, NULL, nsLoggingSinkConstructor }, diff --git a/mozilla/profile/pref-migrator/src/nsPrefMigrationFactory.cpp b/mozilla/profile/pref-migrator/src/nsPrefMigrationFactory.cpp index 9a91dca3e0c..fe63e757b68 100644 --- a/mozilla/profile/pref-migrator/src/nsPrefMigrationFactory.cpp +++ b/mozilla/profile/pref-migrator/src/nsPrefMigrationFactory.cpp @@ -65,7 +65,7 @@ CreateNewPrefMigration(nsISupports* aOuter, REFNSIID aIID, void **aResult) NS_GENERIC_FACTORY_CONSTRUCTOR(nsPrefConverter) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Profile Migration", NS_PREFMIGRATION_CID, diff --git a/mozilla/profile/src/nsProfileFactory.cpp b/mozilla/profile/src/nsProfileFactory.cpp index ab624ad5d34..aa43c510590 100644 --- a/mozilla/profile/src/nsProfileFactory.cpp +++ b/mozilla/profile/src/nsProfileFactory.cpp @@ -41,7 +41,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsProfile); -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Profile Manager", NS_PROFILE_CID, diff --git a/mozilla/rdf/build/nsRDFModule.cpp b/mozilla/rdf/build/nsRDFModule.cpp index 8ece9d3aa40..800003e4558 100644 --- a/mozilla/rdf/build/nsRDFModule.cpp +++ b/mozilla/rdf/build/nsRDFModule.cpp @@ -102,7 +102,7 @@ MAKE_CTOR(RDFContentSink,RDFContentSink,RDFContentSink) MAKE_CTOR(RDFDefaultResource,DefaultResource,RDFResource) // The list of components we register -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { // register our build-in datasources: { "RDF Composite Data Source", diff --git a/mozilla/rdf/chrome/build/nsChromeFactory.cpp b/mozilla/rdf/chrome/build/nsChromeFactory.cpp index da945c7b149..7273ea1bf8d 100644 --- a/mozilla/rdf/chrome/build/nsChromeFactory.cpp +++ b/mozilla/rdf/chrome/build/nsChromeFactory.cpp @@ -50,7 +50,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsChromeRegistry, Init) // The list of components we register -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Chrome Registry", NS_CHROMEREGISTRY_CID, diff --git a/mozilla/security/manager/boot/src/nsBOOTModule.cpp b/mozilla/security/manager/boot/src/nsBOOTModule.cpp index de4d921c159..4f9b778e261 100644 --- a/mozilla/security/manager/boot/src/nsBOOTModule.cpp +++ b/mozilla/security/manager/boot/src/nsBOOTModule.cpp @@ -33,7 +33,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsEntropyCollector) NS_GENERIC_FACTORY_CONSTRUCTOR(nsSecureBrowserUIImpl) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Entropy Collector", diff --git a/mozilla/security/manager/pki/src/nsPKIModule.cpp b/mozilla/security/manager/pki/src/nsPKIModule.cpp index 352e6be598d..0216c8e1c92 100644 --- a/mozilla/security/manager/pki/src/nsPKIModule.cpp +++ b/mozilla/security/manager/pki/src/nsPKIModule.cpp @@ -32,7 +32,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsNSSDialogs, Init) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsPKIParamBlock, Init) NS_GENERIC_FACTORY_CONSTRUCTOR(nsNSSASN1Outliner) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "NSS Dialogs", diff --git a/mozilla/security/manager/ssl/src/nsNSSModule.cpp b/mozilla/security/manager/ssl/src/nsNSSModule.cpp index 622256b620b..73bea60e363 100644 --- a/mozilla/security/manager/ssl/src/nsNSSModule.cpp +++ b/mozilla/security/manager/ssl/src/nsNSSModule.cpp @@ -206,7 +206,7 @@ static NS_METHOD RegisterPSMContentListeners( return NS_OK; } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { PSM_COMPONENT_CLASSNAME, diff --git a/mozilla/uriloader/build/nsURILoaderModule.cpp b/mozilla/uriloader/build/nsURILoaderModule.cpp index bc896c3b40d..97d9e1a6dda 100644 --- a/mozilla/uriloader/build/nsURILoaderModule.cpp +++ b/mozilla/uriloader/build/nsURILoaderModule.cpp @@ -56,7 +56,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsExternalProtocolHandler) // information like the function to create an instance, contractid, and // class name. // -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "Netscape URI Loader Service", NS_URI_LOADER_CID, NS_URI_LOADER_CONTRACTID, nsURILoaderConstructor, }, { "Netscape Doc Loader", NS_DOCUMENTLOADER_CID, NS_DOCUMENTLOADER_CONTRACTID, nsDocLoaderImplConstructor, }, { "Netscape Doc Loader Service", NS_DOCUMENTLOADER_SERVICE_CID, NS_DOCUMENTLOADER_SERVICE_CONTRACTID, diff --git a/mozilla/view/src/nsViewFactory.cpp b/mozilla/view/src/nsViewFactory.cpp index 6c6e747cb91..5888e839dc0 100644 --- a/mozilla/view/src/nsViewFactory.cpp +++ b/mozilla/view/src/nsViewFactory.cpp @@ -69,7 +69,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsView) NS_GENERIC_FACTORY_CONSTRUCTOR(nsScrollingView) NS_GENERIC_FACTORY_CONSTRUCTOR(nsScrollPortView) -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "View Manager", NS_VIEW_MANAGER_CID, "@mozilla.org/view-manager;1", ViewManagerConstructor }, { "View", NS_VIEW_CID, "@mozilla.org/view;1", nsViewConstructor }, diff --git a/mozilla/view/src/nsViewManager.cpp b/mozilla/view/src/nsViewManager.cpp index a05e3ce1f7c..463dca162f7 100644 --- a/mozilla/view/src/nsViewManager.cpp +++ b/mozilla/view/src/nsViewManager.cpp @@ -90,7 +90,7 @@ static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); we ask for a specific z-order, we don't assume that widget z-ordering actually works. */ -//#define NO_DOUBLE_BUFFER +#define NO_DOUBLE_BUFFER // if defined widget changes like moves and resizes are defered until and done // all in one pass. diff --git a/mozilla/widget/src/beos/nsWidgetFactory.cpp b/mozilla/widget/src/beos/nsWidgetFactory.cpp index c4c12f16bd6..32623ba3db2 100644 --- a/mozilla/widget/src/beos/nsWidgetFactory.cpp +++ b/mozilla/widget/src/beos/nsWidgetFactory.cpp @@ -128,7 +128,7 @@ static nsresult nsVertScrollbarConstructor(nsISupports *aOuter,REFNSIID aIID, return rv; } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "BeOS nsWindow", NS_WINDOW_CID, diff --git a/mozilla/widget/src/build/nsWinWidgetFactory.cpp b/mozilla/widget/src/build/nsWinWidgetFactory.cpp index 724e8bc940f..d6e454021ec 100644 --- a/mozilla/widget/src/build/nsWinWidgetFactory.cpp +++ b/mozilla/widget/src/build/nsWinWidgetFactory.cpp @@ -141,7 +141,7 @@ nsVertScrollbarConstructor (nsISupports *aOuter, REFNSIID aIID, void **aResult) return rv; } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "nsWindow", NS_WINDOW_CID, diff --git a/mozilla/widget/src/gtk/nsWidgetFactory.cpp b/mozilla/widget/src/gtk/nsWidgetFactory.cpp index 03022bc35dc..99d9ce09a6b 100644 --- a/mozilla/widget/src/gtk/nsWidgetFactory.cpp +++ b/mozilla/widget/src/gtk/nsWidgetFactory.cpp @@ -143,7 +143,7 @@ static nsresult nsVertScrollbarConstructor (nsISupports *aOuter, REFNSIID aIID, return rv; } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Gtk nsWindow", NS_WINDOW_CID, diff --git a/mozilla/widget/src/gtk2/nsWidgetFactory.cpp b/mozilla/widget/src/gtk2/nsWidgetFactory.cpp index 1f4ad348a63..6aea88ec7b4 100644 --- a/mozilla/widget/src/gtk2/nsWidgetFactory.cpp +++ b/mozilla/widget/src/gtk2/nsWidgetFactory.cpp @@ -108,7 +108,7 @@ nsresult nsVertScrollbarConstructor (nsISupports *aOuter, return rv; } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Gtk2 Window", NS_WINDOW_CID, diff --git a/mozilla/widget/src/mac/nsWidgetFactory.cpp b/mozilla/widget/src/mac/nsWidgetFactory.cpp index 8242f36b5c0..0909aa9736d 100644 --- a/mozilla/widget/src/mac/nsWidgetFactory.cpp +++ b/mozilla/widget/src/mac/nsWidgetFactory.cpp @@ -122,7 +122,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDragHelperService) NS_GENERIC_FACTORY_CONSTRUCTOR(nsBidiKeyboard) #endif -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "nsWindow", NS_WINDOW_CID, diff --git a/mozilla/widget/src/os2/nsWidgetFactory.cpp b/mozilla/widget/src/os2/nsWidgetFactory.cpp index 67e692a0764..6582c7a495c 100644 --- a/mozilla/widget/src/os2/nsWidgetFactory.cpp +++ b/mozilla/widget/src/os2/nsWidgetFactory.cpp @@ -214,7 +214,7 @@ static NS_IMETHODIMP nsVertScrollbarConstructor (nsISupports *aOuter, REFNSIID a // component definition, will be exported using XPCOM -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "OS/2 AppShell", NS_APPSHELL_CID, diff --git a/mozilla/widget/src/photon/nsWidgetFactory.cpp b/mozilla/widget/src/photon/nsWidgetFactory.cpp index f522b91a899..f9167120b52 100644 --- a/mozilla/widget/src/photon/nsWidgetFactory.cpp +++ b/mozilla/widget/src/photon/nsWidgetFactory.cpp @@ -132,7 +132,7 @@ static nsresult nsVertScrollbarConstructor (nsISupports *aOuter, REFNSIID aIID, return rv; } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Ph nsWindow", NS_WINDOW_CID, diff --git a/mozilla/widget/src/qt/nsWidgetFactory.cpp b/mozilla/widget/src/qt/nsWidgetFactory.cpp index 1f50e236cc5..80104b95445 100644 --- a/mozilla/widget/src/qt/nsWidgetFactory.cpp +++ b/mozilla/widget/src/qt/nsWidgetFactory.cpp @@ -123,7 +123,7 @@ static nsresult nsVertScrollbarConstructor(nsISupports *aOuter,REFNSIID aIID, return rv; } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Qt nsWindow", NS_WINDOW_CID, diff --git a/mozilla/widget/src/xlib/nsWidgetFactory.cpp b/mozilla/widget/src/xlib/nsWidgetFactory.cpp index f78365455c4..c82deccc20c 100644 --- a/mozilla/widget/src/xlib/nsWidgetFactory.cpp +++ b/mozilla/widget/src/xlib/nsWidgetFactory.cpp @@ -136,7 +136,7 @@ static nsresult nsVertScrollbarConstructor (nsISupports *aOuter, REFNSIID aIID, return rv; } -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Xlib nsWindow", NS_WINDOW_CID, diff --git a/mozilla/widget/src/xremoteclient/XRemoteClientFactory.cpp b/mozilla/widget/src/xremoteclient/XRemoteClientFactory.cpp index 9f26b571d7a..138e31cd607 100644 --- a/mozilla/widget/src/xremoteclient/XRemoteClientFactory.cpp +++ b/mozilla/widget/src/xremoteclient/XRemoteClientFactory.cpp @@ -49,7 +49,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(XRemoteClient) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "XRemote Client", NS_XREMOTECLIENT_CID, diff --git a/mozilla/xpcom/base/nsLeakDetector.cpp b/mozilla/xpcom/base/nsLeakDetector.cpp index 1ebfbee8a1a..59bc572b4fa 100644 --- a/mozilla/xpcom/base/nsLeakDetector.cpp +++ b/mozilla/xpcom/base/nsLeakDetector.cpp @@ -166,7 +166,7 @@ nsresult NS_InitLeakDetector() if (NS_FAILED(rv)) return rv; - static nsModuleComponentInfo info = { + static const nsModuleComponentInfo info = { "Leak Detector", kCLeakDetectorCID, NS_CLEAKDETECTOR_CONTRACTID, nsLeakDetectorConstructor }; diff --git a/mozilla/xpcom/build/nsXPComInit.cpp b/mozilla/xpcom/build/nsXPComInit.cpp index e0f0a609381..aee964fb25d 100644 --- a/mozilla/xpcom/build/nsXPComInit.cpp +++ b/mozilla/xpcom/build/nsXPComInit.cpp @@ -176,7 +176,7 @@ nsXPTIInterfaceInfoManagerGetSingleton(nsISupports* outer, static nsresult RegisterGenericFactory(nsIComponentManager* compMgr, - nsModuleComponentInfo *info) + const nsModuleComponentInfo *info) { nsresult rv; nsIGenericFactory* fact; @@ -211,7 +211,7 @@ PRBool gXPCOMShuttingDown = PR_FALSE; NULL, NULL, NULL, NS_CI_INTERFACE_GETTER_NAME(Class), NULL, \ &NS_CLASSINFO_NAME(Class) } -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { // ugh #define NS_MEMORY_CONTRACTID "@mozilla.org/xpcom/memory-service;1" #define NS_MEMORY_CLASSNAME "Global Memory Service" diff --git a/mozilla/xpcom/sample/nsSampleModule.cpp b/mozilla/xpcom/sample/nsSampleModule.cpp index 1a2c02e6a16..5b5843fbe99 100644 --- a/mozilla/xpcom/sample/nsSampleModule.cpp +++ b/mozilla/xpcom/sample/nsSampleModule.cpp @@ -107,7 +107,7 @@ static NS_METHOD nsSampleUnregistrationProc(nsIComponentManager *aCompMgr, // For each class that wishes to support nsIClassInfo, add a line like this NS_DECL_CLASSINFO(nsSampleImpl) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Sample Component", NS_SAMPLE_CID, NS_SAMPLE_CONTRACTID, nsSampleImplConstructor, nsSampleRegistrationProc /* NULL if you dont need one */, diff --git a/mozilla/xpcom/tests/dynamic/TestDynamic.cpp b/mozilla/xpcom/tests/dynamic/TestDynamic.cpp index 139d11da1f2..d163fd1001a 100644 --- a/mozilla/xpcom/tests/dynamic/TestDynamic.cpp +++ b/mozilla/xpcom/tests/dynamic/TestDynamic.cpp @@ -66,7 +66,7 @@ void TestDynamicClassImpl::Test() { NS_GENERIC_FACTORY_CONSTRUCTOR(TestDynamicClassImpl); -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Test Dynamic", NS_TESTLOADEDFACTORY_CID, NS_TESTLOADEDFACTORY_CONTRACTID, TestDynamicClassImplConstructor diff --git a/mozilla/xpcom/tests/services/MyService.cpp b/mozilla/xpcom/tests/services/MyService.cpp index c3b1df78003..527384d0479 100644 --- a/mozilla/xpcom/tests/services/MyService.cpp +++ b/mozilla/xpcom/tests/services/MyService.cpp @@ -84,7 +84,7 @@ MyService::Doit(void) NS_GENERIC_FACTORY_CONSTRUCTOR(MyService) -static nsModuleComponentInfo myService_components[] = { +static const nsModuleComponentInfo myService_components[] = { { "MyService", NS_IMYSERVICE_CID, nsnull, MyServiceConstructor }, }; diff --git a/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp b/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp index e4b33cb4d8f..260bd2ac7b2 100644 --- a/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp +++ b/mozilla/xpfe/appshell/src/nsAppShellFactory.cpp @@ -70,7 +70,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsWindowMediator); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUserInfo); NS_GENERIC_FACTORY_CONSTRUCTOR(nsTimingService); -static nsModuleComponentInfo gAppShellModuleInfo[] = +static const nsModuleComponentInfo gAppShellModuleInfo[] = { { "AppShell Service", NS_APPSHELL_SERVICE_CID, diff --git a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp index 091a06f01a8..4733680608d 100644 --- a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp +++ b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp @@ -947,7 +947,7 @@ NS_IMETHODIMP nsBrowserContentHandler::HandleContent(const char * aContentType, NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsBrowserInstance, Init) NS_GENERIC_FACTORY_CONSTRUCTOR(nsBrowserContentHandler) -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "nsBrowserInstance", NS_BROWSERINSTANCE_CID, NS_BROWSERINSTANCE_CONTRACTID, diff --git a/mozilla/xpfe/components/build/nsModule.cpp b/mozilla/xpfe/components/build/nsModule.cpp index feaed08a6d0..e3ec763024c 100644 --- a/mozilla/xpfe/components/build/nsModule.cpp +++ b/mozilla/xpfe/components/build/nsModule.cpp @@ -126,7 +126,7 @@ UnregisterProc(nsIComponentManager *aCompMgr, return rv; } -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "AutoComplete Search Results", NS_AUTOCOMPLETERESULTS_CID, NS_AUTOCOMPLETERESULTS_CONTRACTID, nsAutoCompleteResultsConstructor}, { "AutoComplete Search Item", NS_AUTOCOMPLETEITEM_CID, NS_AUTOCOMPLETEITEM_CONTRACTID, diff --git a/mozilla/xpfe/components/filepicker/src/nsFileView.cpp b/mozilla/xpfe/components/filepicker/src/nsFileView.cpp index 3cc1d8fbbe2..2701b5eb084 100644 --- a/mozilla/xpfe/components/filepicker/src/nsFileView.cpp +++ b/mozilla/xpfe/components/filepicker/src/nsFileView.cpp @@ -101,7 +101,7 @@ protected: // Factory constructor NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFileView, Init) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "nsFileView", NS_FILEVIEW_CID, NS_FILEVIEW_CONTRACTID, nsFileViewConstructor } diff --git a/mozilla/xpfe/components/find/src/nsFindModule.cpp b/mozilla/xpfe/components/find/src/nsFindModule.cpp index 1a20be5ede6..f0419b3bdf7 100644 --- a/mozilla/xpfe/components/find/src/nsFindModule.cpp +++ b/mozilla/xpfe/components/find/src/nsFindModule.cpp @@ -13,7 +13,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsFindService) NS_GENERIC_FACTORY_SINGLETON_CONSTRUCTOR(nsIFindService, nsFindService::GetSingleton) -static nsModuleComponentInfo gComponents[] = { +static const nsModuleComponentInfo gComponents[] = { { NS_IFINDCOMPONENT_CLASSNAME, NS_FINDCOMPONENT_CID, diff --git a/mozilla/xpfe/components/regviewer/nsRegistryDataSource.cpp b/mozilla/xpfe/components/regviewer/nsRegistryDataSource.cpp index 52b352488b1..74ea8fbedf9 100644 --- a/mozilla/xpfe/components/regviewer/nsRegistryDataSource.cpp +++ b/mozilla/xpfe/components/regviewer/nsRegistryDataSource.cpp @@ -858,7 +858,7 @@ nsRegistryDataSource::SubkeyEnumerator::GetNext(nsISupports** _retval) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsRegistryDataSource, Init) // The list of components we register -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { "Registry Viewer", NS_REGISTRYVIEWER_CID, "@mozilla.org/registry-viewer;1", nsRegistryDataSourceConstructor, }, diff --git a/mozilla/xpfe/components/search/src/nsRegisterSearch.cpp b/mozilla/xpfe/components/search/src/nsRegisterSearch.cpp index f5d6fa5ca1f..999c536d3c7 100755 --- a/mozilla/xpfe/components/search/src/nsRegisterSearch.cpp +++ b/mozilla/xpfe/components/search/src/nsRegisterSearch.cpp @@ -46,7 +46,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(LocalSearchDataSource, Init) NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(InternetSearchDataSource, Init) -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "Local Search", NS_RDFFINDDATASOURCE_CID, NS_LOCALSEARCH_SERVICE_CONTRACTID, LocalSearchDataSourceConstructor, diff --git a/mozilla/xpfe/components/shistory/src/nsSHistoryModule.cpp b/mozilla/xpfe/components/shistory/src/nsSHistoryModule.cpp index 00f905840a0..c8f75f78628 100644 --- a/mozilla/xpfe/components/shistory/src/nsSHistoryModule.cpp +++ b/mozilla/xpfe/components/shistory/src/nsSHistoryModule.cpp @@ -58,7 +58,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsSHistory, Init) /////////////////////////////////////////////////////////////////////////////// // Module implementation for the history library -static nsModuleComponentInfo gSHistoryModuleInfo[] = +static const nsModuleComponentInfo gSHistoryModuleInfo[] = { { "nsSHEntry", NS_SHENTRY_CID, NS_SHENTRY_CONTRACTID, nsSHEntryConstructor }, diff --git a/mozilla/xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp b/mozilla/xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp index f6d11ed9af6..c5828fc2c68 100644 --- a/mozilla/xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp +++ b/mozilla/xpfe/components/ucth/src/nsUnknownContentTypeHandler.cpp @@ -307,7 +307,7 @@ nsUnknownContentTypeHandler::PromptForSaveToFile(nsISupports * aWindowContext, c NS_GENERIC_FACTORY_CONSTRUCTOR(nsUnknownContentTypeHandler) -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { NS_IUNKNOWNCONTENTTYPEHANDLER_CLASSNAME, NS_UNKNOWNCONTENTTYPEHANDLER_CID, NS_IUNKNOWNCONTENTTYPEHANDLER_CONTRACTID, diff --git a/mozilla/xpfe/components/urlbarhistory/src/nsUBHistoryModule.cpp b/mozilla/xpfe/components/urlbarhistory/src/nsUBHistoryModule.cpp index 8fd4c9b7ecd..c252c892c65 100644 --- a/mozilla/xpfe/components/urlbarhistory/src/nsUBHistoryModule.cpp +++ b/mozilla/xpfe/components/urlbarhistory/src/nsUBHistoryModule.cpp @@ -51,7 +51,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsUrlbarHistory) /////////////////////////////////////////////////////////////////////////////// // Module implementation for the history library -static nsModuleComponentInfo gUBHistoryModuleInfo[] = +static const nsModuleComponentInfo gUBHistoryModuleInfo[] = { { "nsUrlbarHistory", NS_URLBARHISTORY_CID, NS_URLBARHISTORY_CONTRACTID, nsUrlbarHistoryConstructor }, diff --git a/mozilla/xpfe/components/xfer/src/nsStreamTransfer.cpp b/mozilla/xpfe/components/xfer/src/nsStreamTransfer.cpp index 7464af5dc5f..491cc6d864d 100644 --- a/mozilla/xpfe/components/xfer/src/nsStreamTransfer.cpp +++ b/mozilla/xpfe/components/xfer/src/nsStreamTransfer.cpp @@ -385,7 +385,7 @@ nsString nsStreamTransfer::SuggestNameFor( nsIChannel *aChannel, char const *sug NS_GENERIC_FACTORY_CONSTRUCTOR(nsStreamTransfer) -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { NS_ISTREAMTRANSFER_CLASSNAME, NS_STREAMTRANSFER_CID, NS_ISTREAMTRANSFER_CONTRACTID, diff --git a/mozilla/xpfe/components/xremote/src/XRemoteService.cpp b/mozilla/xpfe/components/xremote/src/XRemoteService.cpp index 614a363ce22..275596832d4 100644 --- a/mozilla/xpfe/components/xremote/src/XRemoteService.cpp +++ b/mozilla/xpfe/components/xremote/src/XRemoteService.cpp @@ -856,7 +856,7 @@ XRemoteService::FindWindow(const PRUnichar *aType, NS_GENERIC_FACTORY_CONSTRUCTOR(XRemoteService) -static nsModuleComponentInfo components[] = { +static const nsModuleComponentInfo components[] = { { NS_IXREMOTESERVICE_CLASSNAME, NS_XREMOTESERVICE_CID, NS_IXREMOTESERVICE_CONTRACTID, diff --git a/mozilla/xpinstall/src/nsSoftwareUpdate.cpp b/mozilla/xpinstall/src/nsSoftwareUpdate.cpp index 2985be7a742..7a979a3399c 100644 --- a/mozilla/xpinstall/src/nsSoftwareUpdate.cpp +++ b/mozilla/xpinstall/src/nsSoftwareUpdate.cpp @@ -622,7 +622,7 @@ RegisterSoftwareUpdate( nsIComponentManager *aCompMgr, // The list of components we register -static nsModuleComponentInfo components[] = +static const nsModuleComponentInfo components[] = { { "SoftwareUpdate Component", NS_SoftwareUpdate_CID,