diff --git a/content/base/src/nsCopySupport.cpp b/content/base/src/nsCopySupport.cpp index 389f607510f7..2058933638f8 100644 --- a/content/base/src/nsCopySupport.cpp +++ b/content/base/src/nsCopySupport.cpp @@ -68,7 +68,6 @@ #include "nsHTMLAtoms.h" #ifdef IBMBIDI #include "nsBidiUtils.h" -//static NS_DEFINE_CID(kUBidiUtilCID, NS_UNICHARBIDIUTIL_CID); #endif // image copy stuff diff --git a/docshell/base/nsWebShell.cpp b/docshell/base/nsWebShell.cpp index ca183a85324e..1163fdbe54c9 100644 --- a/docshell/base/nsWebShell.cpp +++ b/docshell/base/nsWebShell.cpp @@ -73,8 +73,6 @@ typedef unsigned long HMTX; #include "nsVoidArray.h" #include "nsString.h" #include "nsReadableUtils.h" -#include "nsWidgetsCID.h" -#include "nsGfxCIID.h" #include "plevent.h" #include "prprf.h" #include "nsIPluginHost.h" @@ -91,7 +89,6 @@ typedef unsigned long HMTX; #include "prthread.h" #include "nsXPIDLString.h" #include "nsDOMError.h" -#include "nsLayoutCID.h" #include "nsIDOMRange.h" #include "nsIURIContentListener.h" #include "nsIDOMDocument.h" @@ -158,14 +155,6 @@ static PRLogModuleInfo* gLogModule = PR_NewLogModule("webshell"); //---------------------------------------------------------------------- -//---------------------------------------------------------------------- - -// Class IID's -static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_CID(kCDOMRangeCID, NS_RANGE_CID); - -//---------------------------------------------------------------------- - static PRBool IsOffline() { diff --git a/dom/src/base/nsGlobalWindow.cpp b/dom/src/base/nsGlobalWindow.cpp index 10cac1912bf3..ce01d1092830 100644 --- a/dom/src/base/nsGlobalWindow.cpp +++ b/dom/src/base/nsGlobalWindow.cpp @@ -178,7 +178,6 @@ static NS_DEFINE_CID(kHTTPHandlerCID, NS_HTTPPROTOCOLHANDLER_CID); static NS_DEFINE_CID(kXULControllersCID, NS_XULCONTROLLERS_CID); static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID); // For window.find() static NS_DEFINE_CID(kCStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); diff --git a/dom/src/base/nsMimeTypeArray.cpp b/dom/src/base/nsMimeTypeArray.cpp index c10d4f3cabca..0bd5f3216d57 100644 --- a/dom/src/base/nsMimeTypeArray.cpp +++ b/dom/src/base/nsMimeTypeArray.cpp @@ -47,7 +47,6 @@ #include "nsIMIMEInfo.h" #include "nsIFile.h" -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); MimeTypeArrayImpl::MimeTypeArrayImpl(nsIDOMNavigator* navigator) { diff --git a/editor/libeditor/html/nsEditorTxnLog.cpp b/editor/libeditor/html/nsEditorTxnLog.cpp index 9e3229b588ec..846650717591 100644 --- a/editor/libeditor/html/nsEditorTxnLog.cpp +++ b/editor/libeditor/html/nsEditorTxnLog.cpp @@ -45,7 +45,6 @@ #define LOCK_LOG(doc) #define UNLOCK_LOG(doc) -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); nsEditorTxnLog::nsEditorTxnLog(nsHTMLEditorLog *aEditorLog) { diff --git a/editor/txmgr/src/nsTransactionManager.cpp b/editor/txmgr/src/nsTransactionManager.cpp index 4210998035e2..adf58f5d6210 100644 --- a/editor/txmgr/src/nsTransactionManager.cpp +++ b/editor/txmgr/src/nsTransactionManager.cpp @@ -50,8 +50,6 @@ #define LOCK_TX_MANAGER(mgr) (mgr)->Lock() #define UNLOCK_TX_MANAGER(mgr) (mgr)->Unlock() -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kITransactionManagerIID, NS_ITRANSACTIONMANAGER_IID); nsTransactionManager::nsTransactionManager(PRInt32 aMaxTransactionCount) : mMaxTransactionCount(aMaxTransactionCount), mListeners(0) diff --git a/editor/txtsvc/src/nsTSDNotifier.cpp b/editor/txtsvc/src/nsTSDNotifier.cpp index 126ea1a6cd42..14a19a37f1ae 100644 --- a/editor/txtsvc/src/nsTSDNotifier.cpp +++ b/editor/txtsvc/src/nsTSDNotifier.cpp @@ -40,8 +40,6 @@ #include "nsTSDNotifier.h" #include "nsTextServicesDocument.h" -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIEditActionListenerIID, NS_IEDITACTIONLISTENER_IID); nsTSDNotifier::nsTSDNotifier(nsTextServicesDocument *aDoc) : mDoc(aDoc) { diff --git a/embedding/browser/activex/src/control/guids.cpp b/embedding/browser/activex/src/control/guids.cpp index 8d965dff58ad..51125bdbbd09 100644 --- a/embedding/browser/activex/src/control/guids.cpp +++ b/embedding/browser/activex/src/control/guids.cpp @@ -40,9 +40,4 @@ #include "guids.h" // Class IDs -NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -NS_DEFINE_IID(kHTMLEditorCID, NS_HTMLEDITOR_CID); -NS_DEFINE_CID(kCookieServiceCID, NS_COOKIESERVICE_CID); -NS_DEFINE_CID(kPrefCID, NS_PREF_CID); -NS_DEFINE_CID(kWindowCID, NS_WINDOW_CID); diff --git a/embedding/browser/activex/src/plugin/XPConnect.cpp b/embedding/browser/activex/src/plugin/XPConnect.cpp index 120706d2f799..4940967a6c4e 100644 --- a/embedding/browser/activex/src/plugin/XPConnect.cpp +++ b/embedding/browser/activex/src/plugin/XPConnect.cpp @@ -80,8 +80,6 @@ #include "nsIURI.h" #endif -static NS_DEFINE_IID(kIClassInfoIID, NS_ICLASSINFO_IID); -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); /////////////////////////////////////////////////////////////////////////////// // nsScriptablePeer diff --git a/embedding/browser/photon/src/EmbedPrivate.cpp b/embedding/browser/photon/src/EmbedPrivate.cpp index 9ac82acd5909..ea9984427897 100644 --- a/embedding/browser/photon/src/EmbedPrivate.cpp +++ b/embedding/browser/photon/src/EmbedPrivate.cpp @@ -30,9 +30,6 @@ #include "nsReadableUtils.h" #include "nsIWidget.h" -// for NS_APPSHELL_CID -#include - // for do_GetInterface #include #include @@ -61,7 +58,6 @@ #include "nsIWebBrowserPrint.h" #include "nsIClipboardCommands.h" #include "docshell/nsCDefaultURIFixup.h" -#include "nsGfxCIID.h" // for the focus hacking we need to do #include @@ -81,9 +77,6 @@ #include "PtMozilla.h" -static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); -static NS_DEFINE_CID(kPrintOptionsCID, NS_PRINTOPTIONS_CID); - static const char sWatcherContractID[] = "@mozilla.org/embedcomp/window-watcher;1"; nsIAppShell *EmbedPrivate::sAppShell = nsnull; diff --git a/embedding/browser/photon/src/PtMozilla.cpp b/embedding/browser/photon/src/PtMozilla.cpp index 73058c6340b8..77ae4ab65fa1 100644 --- a/embedding/browser/photon/src/PtMozilla.cpp +++ b/embedding/browser/photon/src/PtMozilla.cpp @@ -90,10 +90,7 @@ ph_getModuleInfo(nsStaticModuleInfo **info, PRUint32 *count); NS_EXTERN_IID(kHTMLEditorCID); NS_EXTERN_IID(kCookieServiceCID); NS_EXTERN_IID(kWindowCID); -static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); -static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); -static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); #define NS_PROMPTSERVICE_CID \ {0xa2112d6a, 0x0e28, 0x421f, {0xb4, 0x6a, 0x25, 0xc0, 0xb3, 0x8, 0xcb, 0xd0}} diff --git a/embedding/browser/powerplant/source/CBrowserShell.cpp b/embedding/browser/powerplant/source/CBrowserShell.cpp index d3555defd43b..99a56055fa39 100644 --- a/embedding/browser/powerplant/source/CBrowserShell.cpp +++ b/embedding/browser/powerplant/source/CBrowserShell.cpp @@ -26,7 +26,6 @@ #include "nsCWebBrowser.h" #include "nsIComponentManager.h" -#include "nsWidgetsCID.h" #include "nsRepeater.h" #include "nsString.h" #include "nsXPIDLString.h" @@ -91,8 +90,6 @@ // ToolBox #include -static NS_DEFINE_IID(kWindowCID, NS_WINDOW_CID); - const nsCString CBrowserShell::kEmptyCString; nsCOMPtr CBrowserShell::sDragHelper; diff --git a/extensions/cookie/nsImgManager.cpp b/extensions/cookie/nsImgManager.cpp index b31aae9f2ad4..db2e2da987e8 100644 --- a/extensions/cookie/nsImgManager.cpp +++ b/extensions/cookie/nsImgManager.cpp @@ -43,7 +43,6 @@ #include "nsCOMPtr.h" #include "nsXPIDLString.h" #include "nsIURI.h" -#include "nsNetCID.h" #include "nsIServiceManager.h" #include "nsIScriptGlobalObject.h" #include "nsIDOMWindow.h" @@ -53,8 +52,6 @@ #include "nsIObserverService.h" #include "nsString.h" -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); - // Possible behavior pref values #define IMAGE_ACCEPT 0 #define IMAGE_NOFOREIGN 1 diff --git a/extensions/layout-debug/src/nsRegressionTester.cpp b/extensions/layout-debug/src/nsRegressionTester.cpp index 82ea3e1c25fe..4d0b7676491a 100644 --- a/extensions/layout-debug/src/nsRegressionTester.cpp +++ b/extensions/layout-debug/src/nsRegressionTester.cpp @@ -71,7 +71,6 @@ static NS_DEFINE_CID(kFrameUtilCID, NS_FRAME_UTIL_CID); -static NS_DEFINE_CID(kLayoutDebuggerCID, NS_LAYOUT_DEBUGGER_CID); nsRegressionTester::nsRegressionTester() diff --git a/extensions/pics/src/nsPICS.cpp b/extensions/pics/src/nsPICS.cpp index bb8fff1c95ea..86d3d01008c5 100644 --- a/extensions/pics/src/nsPICS.cpp +++ b/extensions/pics/src/nsPICS.cpp @@ -81,13 +81,10 @@ static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); static NS_DEFINE_IID(kDocLoaderServiceCID, NS_DOCUMENTLOADER_SERVICE_CID); -static NS_DEFINE_IID(kIDocumentLoaderIID, NS_IDOCUMENTLOADER_IID); static NS_DEFINE_IID(kIWebShellServicesIID, NS_IWEB_SHELL_SERVICES_IID); -//static NS_DEFINE_IID(kIWebShellIID, NS_IWEB_SHELL_IID); static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID); -static NS_DEFINE_IID(kIDocumentLoaderObserverIID, NS_IDOCUMENTLOADEROBSERVER_IID); #define PICS_DOMAIN "browser.PICS." #define PICS_ENABLED_PREF PICS_DOMAIN"ratings_enabled" diff --git a/extensions/pics/src/nsPICSElementObserver.cpp b/extensions/pics/src/nsPICSElementObserver.cpp index 65b61fb12bca..830e07f9d8d3 100644 --- a/extensions/pics/src/nsPICSElementObserver.cpp +++ b/extensions/pics/src/nsPICSElementObserver.cpp @@ -56,13 +56,7 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #include "plstr.h" #include "prenv.h" -//static NS_DEFINE_IID(kIObserverIID, NS_IOBSERVER_IID); -//static NS_DEFINE_IID(kObserverCID, NS_OBSERVER_CID); static NS_DEFINE_IID(kIPICSElementObserverIID, NS_IPICSELEMENTOBSERVER_IID); -static NS_DEFINE_IID(kIElementObserverIID, NS_IELEMENTOBSERVER_IID); -static NS_DEFINE_IID(kIObserverIID, NS_IOBSERVER_IID); -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - static NS_DEFINE_IID(kIPICSIID, NS_IPICS_IID); static NS_DEFINE_IID(kPICSCID, NS_PICS_CID); diff --git a/extensions/transformiix/source/xslt/txExecutionState.cpp b/extensions/transformiix/source/xslt/txExecutionState.cpp index 414b9685b48f..859ac133275d 100644 --- a/extensions/transformiix/source/xslt/txExecutionState.cpp +++ b/extensions/transformiix/source/xslt/txExecutionState.cpp @@ -49,8 +49,6 @@ #ifndef TX_EXE #include "nsIDOMDocument.h" -#include "nsContentCID.h" -static NS_DEFINE_CID(kXMLDocumentCID, NS_XMLDOCUMENT_CID); #endif const PRInt32 txExecutionState::kMaxRecursionDepth = 20000; diff --git a/extensions/universalchardet/src/nsUniversalCharDetModule.cpp b/extensions/universalchardet/src/nsUniversalCharDetModule.cpp index 34c50a4b2659..600e0545a86f 100644 --- a/extensions/universalchardet/src/nsUniversalCharDetModule.cpp +++ b/extensions/universalchardet/src/nsUniversalCharDetModule.cpp @@ -55,8 +55,6 @@ #include "nsUniversalDetector.h" -static NS_DEFINE_CID(kUniversalDetectorCID, NS_UNIVERSAL_DETECTOR_CID); -static NS_DEFINE_CID(kUniversalStringDetectorCID, NS_UNIVERSAL_STRING_DETECTOR_CID); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUniversalXPCOMDetector); NS_GENERIC_FACTORY_CONSTRUCTOR(nsUniversalXPCOMStringDetector); diff --git a/extensions/universalchardet/src/nsUniversalDetector.cpp b/extensions/universalchardet/src/nsUniversalDetector.cpp index d9af306d1343..58291f77e26a 100644 --- a/extensions/universalchardet/src/nsUniversalDetector.cpp +++ b/extensions/universalchardet/src/nsUniversalDetector.cpp @@ -54,9 +54,6 @@ #include "nsEscCharsetProber.h" #include "nsLatin1Prober.h" -static NS_DEFINE_CID(kUniversalDetectorCID, NS_UNIVERSAL_DETECTOR_CID); -static NS_DEFINE_CID(kUniversalStringDetectorCID, NS_UNIVERSAL_STRING_DETECTOR_CID); - nsUniversalDetector::nsUniversalDetector() { mDone = PR_FALSE; diff --git a/extensions/wallet/src/wallet.cpp b/extensions/wallet/src/wallet.cpp index 0b56c93650ce..ba7fd1471217 100644 --- a/extensions/wallet/src/wallet.cpp +++ b/extensions/wallet/src/wallet.cpp @@ -85,7 +85,6 @@ #define morseAssert(x,y) 0 #endif -static NS_DEFINE_IID(kIDOMHTMLOptionElementIID, NS_IDOMHTMLOPTIONELEMENT_IID); #include "prlong.h" #include "prinrval.h" diff --git a/extensions/webservices/soap/src/nsSOAPMessage.cpp b/extensions/webservices/soap/src/nsSOAPMessage.cpp index a0b277d619ba..95a9a2651ccd 100644 --- a/extensions/webservices/soap/src/nsSOAPMessage.cpp +++ b/extensions/webservices/soap/src/nsSOAPMessage.cpp @@ -526,8 +526,6 @@ NS_IMETHODIMP return NS_OK; } -static NS_DEFINE_CID(kMemoryCID, NS_MEMORY_CID); - /** * Internally used to track down the encoding to be used at the headers * or parameters. We know the version is legal, or we couldn't have diff --git a/extensions/xmlterm/base/mozLineTerm.cpp b/extensions/xmlterm/base/mozLineTerm.cpp index 7c71b833dea9..37e760e25c22 100644 --- a/extensions/xmlterm/base/mozLineTerm.cpp +++ b/extensions/xmlterm/base/mozLineTerm.cpp @@ -48,13 +48,6 @@ #define MAXCOL 4096 // Maximum columns in line buffer -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - -static NS_DEFINE_IID(kILineTermIID, MOZILINETERM_IID); -static NS_DEFINE_IID(kILineTermAuxIID, MOZILINETERMAUX_IID); - -static NS_DEFINE_IID(kLineTermCID, MOZLINETERM_CID); - ///////////////////////////////////////////////////////////////////////// // mozLineTerm implementaion ///////////////////////////////////////////////////////////////////////// diff --git a/extensions/xmlterm/base/mozXMLTermStream.cpp b/extensions/xmlterm/base/mozXMLTermStream.cpp index 5d32746d28c1..44c0fb29b947 100644 --- a/extensions/xmlterm/base/mozXMLTermStream.cpp +++ b/extensions/xmlterm/base/mozXMLTermStream.cpp @@ -53,7 +53,6 @@ #include "mozXMLTermStream.h" static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); ///////////////////////////////////////////////////////////////////////// // mozXMLTermStream implementation diff --git a/gfx/src/beos/nsDeviceContextSpecFactoryB.cpp b/gfx/src/beos/nsDeviceContextSpecFactoryB.cpp index cc95122947e3..2b0f7e354e50 100644 --- a/gfx/src/beos/nsDeviceContextSpecFactoryB.cpp +++ b/gfx/src/beos/nsDeviceContextSpecFactoryB.cpp @@ -58,7 +58,6 @@ nsDeviceContextSpecFactoryBeOS :: ~nsDeviceContextSpecFactoryBeOS() { } -static NS_DEFINE_IID(kIDeviceContextSpecIID, NS_IDEVICE_CONTEXT_SPEC_IID); static NS_DEFINE_CID(kDeviceContextSpecCID, NS_DEVICE_CONTEXT_SPEC_CID); NS_IMPL_ISUPPORTS1(nsDeviceContextSpecFactoryBeOS, nsIDeviceContextSpecFactory) diff --git a/gfx/src/beos/nsRegionBeOS.cpp b/gfx/src/beos/nsRegionBeOS.cpp index 45134355daa1..20b24a6ee144 100644 --- a/gfx/src/beos/nsRegionBeOS.cpp +++ b/gfx/src/beos/nsRegionBeOS.cpp @@ -45,7 +45,6 @@ static int nRegions; #endif -static NS_DEFINE_IID(kRegionIID, NS_IREGION_IID); nsRegionBeOS :: nsRegionBeOS() { diff --git a/gfx/src/beos/nsRenderingContextBeOS.cpp b/gfx/src/beos/nsRenderingContextBeOS.cpp index f54ddd6a5e8e..17d515b2a5d2 100644 --- a/gfx/src/beos/nsRenderingContextBeOS.cpp +++ b/gfx/src/beos/nsRenderingContextBeOS.cpp @@ -47,7 +47,6 @@ #include #include -static NS_DEFINE_IID(kRenderingContextIID, NS_IRENDERING_CONTEXT_IID); NS_IMPL_THREADSAFE_ISUPPORTS1(nsRenderingContextBeOS, nsIRenderingContext) diff --git a/gfx/src/os2/nsFontMetricsOS2.cpp b/gfx/src/os2/nsFontMetricsOS2.cpp index 01a8074d1f0c..421539e5db4a 100644 --- a/gfx/src/os2/nsFontMetricsOS2.cpp +++ b/gfx/src/os2/nsFontMetricsOS2.cpp @@ -53,7 +53,6 @@ #define USER_DEFINED "x-user-def" static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); -static NS_DEFINE_IID(kIFontMetricsIID, NS_IFONT_METRICS_IID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID); static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID); diff --git a/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp b/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp index 25f6212d29a5..a439179f21e2 100644 --- a/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp +++ b/gfx/src/photon/nsDeviceContextSpecFactoryP.cpp @@ -58,7 +58,6 @@ nsDeviceContextSpecFactoryPh :: ~nsDeviceContextSpecFactoryPh() static NS_DEFINE_IID(kIDeviceContextSpecIID, NS_IDEVICE_CONTEXT_SPEC_IID); static NS_DEFINE_IID(kDeviceContextSpecCID, NS_DEVICE_CONTEXT_SPEC_CID); -static NS_DEFINE_CID(kPrintOptionsCID, NS_PRINTOPTIONS_CID); NS_IMPL_ISUPPORTS1(nsDeviceContextSpecFactoryPh, nsIDeviceContextSpecFactory) diff --git a/gfx/src/photon/nsDeviceContextSpecPh.cpp b/gfx/src/photon/nsDeviceContextSpecPh.cpp index ce247a7198ba..de8033f68a79 100644 --- a/gfx/src/photon/nsDeviceContextSpecPh.cpp +++ b/gfx/src/photon/nsDeviceContextSpecPh.cpp @@ -57,8 +57,6 @@ #include "nsReadableUtils.h" #include "nsIPref.h" -static NS_DEFINE_CID( kPrintOptionsCID, NS_PRINTOPTIONS_CID ); - nsDeviceContextSpecPh :: nsDeviceContextSpecPh() { NS_INIT_ISUPPORTS(); diff --git a/gfx/src/photon/nsFontMetricsPh.cpp b/gfx/src/photon/nsFontMetricsPh.cpp index 1dd88b98b573..84a89d0e9613 100644 --- a/gfx/src/photon/nsFontMetricsPh.cpp +++ b/gfx/src/photon/nsFontMetricsPh.cpp @@ -57,7 +57,6 @@ static nsIPref* gPref = nsnull; #undef USER_DEFINED #define USER_DEFINED "x-user-def" -static NS_DEFINE_IID(kIFontMetricsIID, NS_IFONT_METRICS_IID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); nsFontMetricsPh::nsFontMetricsPh() diff --git a/gfx/src/photon/nsImagePh.cpp b/gfx/src/photon/nsImagePh.cpp index 21e978ee9ea9..939bea175998 100644 --- a/gfx/src/photon/nsImagePh.cpp +++ b/gfx/src/photon/nsImagePh.cpp @@ -178,7 +178,6 @@ printf( "MyPiResizeImage\n" ); //#define ALLOW_PHIMAGE_CACHEING #define IsFlagSet(a,b) (a & b) -// static NS_DEFINE_IID(kIImageIID, NS_IIMAGE_IID); NS_IMPL_ISUPPORTS1(nsImagePh, nsIImage) diff --git a/gfx/src/photon/nsRegionPh.cpp b/gfx/src/photon/nsRegionPh.cpp index 921514677704..b50a48a18dbd 100644 --- a/gfx/src/photon/nsRegionPh.cpp +++ b/gfx/src/photon/nsRegionPh.cpp @@ -44,7 +44,6 @@ #include "nsPhGfxLog.h" -static NS_DEFINE_IID(kRegionIID, NS_IREGION_IID); #define tulx t->rect.ul.x #define tuly t->rect.ul.y diff --git a/gfx/src/photon/nsRenderingContextPh.cpp b/gfx/src/photon/nsRenderingContextPh.cpp index 3db2e1500643..84e7af6a94fd 100644 --- a/gfx/src/photon/nsRenderingContextPh.cpp +++ b/gfx/src/photon/nsRenderingContextPh.cpp @@ -50,9 +50,6 @@ #include #include "nsReadableUtils.h" -static NS_DEFINE_IID(kIRenderingContextIID, NS_IRENDERING_CONTEXT_IID); -static NS_DEFINE_IID(kIDrawingSurfaceIID, NS_IDRAWING_SURFACE_IID); -static NS_DEFINE_IID(kDrawingSurfaceCID, NS_DRAWING_SURFACE_CID); static NS_DEFINE_CID(kRegionCID, NS_REGION_CID); @@ -903,7 +900,6 @@ void nsRenderingContextPh::ApplyClipping( PhGC_t *gc ) void nsRenderingContextPh::CreateClipRegion( ) { - static NS_DEFINE_CID(kRegionCID, NS_REGION_CID); if( mClipRegion ) return; PRUint32 w, h; diff --git a/gfx/src/ps/nsPostScriptObj.cpp b/gfx/src/ps/nsPostScriptObj.cpp index 618c2b3b79f0..942589f8f0de 100644 --- a/gfx/src/ps/nsPostScriptObj.cpp +++ b/gfx/src/ps/nsPostScriptObj.cpp @@ -92,7 +92,6 @@ static PRLogModuleInfo *nsPostScriptObjLM = PR_NewLogModule("nsPostScriptObj"); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); -static NS_DEFINE_IID(kICharsetConverterManagerIID, NS_ICHARSETCONVERTERMANAGER_IID); /* * global diff --git a/gfx/src/windows/nsRenderingContextWin.cpp b/gfx/src/windows/nsRenderingContextWin.cpp index 92b9572d6d87..9651fb66a093 100644 --- a/gfx/src/windows/nsRenderingContextWin.cpp +++ b/gfx/src/windows/nsRenderingContextWin.cpp @@ -65,8 +65,6 @@ static NS_DEFINE_IID(kIRenderingContextIID, NS_IRENDERING_CONTEXT_IID); static NS_DEFINE_IID(kIRenderingContextWinIID, NS_IRENDERING_CONTEXT_WIN_IID); -static NS_DEFINE_IID(kIDrawingSurfaceIID, NS_IDRAWING_SURFACE_IID); -static NS_DEFINE_IID(kDrawingSurfaceCID, NS_DRAWING_SURFACE_CID); #define FLAG_CLIP_VALID 0x0001 #define FLAG_CLIP_CHANGED 0x0002 diff --git a/gfx/src/x11shared/nsFT2FontCatalog.cpp b/gfx/src/x11shared/nsFT2FontCatalog.cpp index a1ca480a0d43..a6c778137609 100644 --- a/gfx/src/x11shared/nsFT2FontCatalog.cpp +++ b/gfx/src/x11shared/nsFT2FontCatalog.cpp @@ -107,9 +107,6 @@ extern nsFontVendorName sVendorNamesList[]; extern nsulCodePageRangeLanguage ulCodePageRange1Language[]; extern nsulCodePageRangeLanguage ulCodePageRange2Language[]; -static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); -static NS_DEFINE_CID(kCharSetManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); - nsHashtable* nsFT2FontCatalog::sVendorNames = nsnull; nsIPref* nsFT2FontCatalog::sPref = nsnull; diff --git a/gfx/src/xlib/nsDeviceContextXlib.cpp b/gfx/src/xlib/nsDeviceContextXlib.cpp index a94a7885c519..5cf80d8df64d 100644 --- a/gfx/src/xlib/nsDeviceContextXlib.cpp +++ b/gfx/src/xlib/nsDeviceContextXlib.cpp @@ -67,7 +67,6 @@ #endif /* USE_XPRINT */ static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); -static NS_DEFINE_IID(kDeviceContextIID, NS_IDEVICE_CONTEXT_IID); #define XLIB_DEFAULT_FONT1 "-*-helvetica-medium-r-*--*-120-*-*-*-*-iso8859-1" #define XLIB_DEFAULT_FONT2 "-*-fixed-medium-r-*-*-*-120-*-*-*-*-*-*" diff --git a/gfx/src/xlib/nsFontMetricsXlib.cpp b/gfx/src/xlib/nsFontMetricsXlib.cpp index e135f3e429d8..2bdf74608fa7 100644 --- a/gfx/src/xlib/nsFontMetricsXlib.cpp +++ b/gfx/src/xlib/nsFontMetricsXlib.cpp @@ -268,9 +268,6 @@ struct nsFontPropertyNameXlib int mValue; }; -static NS_DEFINE_CID(kCharSetManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); -static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); -static NS_DEFINE_CID(kSaveAsCharsetCID, NS_SAVEASCHARSET_CID); static void SetCharsetLangGroup(nsFontMetricsXlibContext *aFmctx, nsFontCharSetInfoXlib* aCharSetInfo); static int SingleByteConvert(nsFontCharSetInfoXlib* aSelf, XFontStruct* aFont, diff --git a/gfx/src/xlib/nsRegionXlib.cpp b/gfx/src/xlib/nsRegionXlib.cpp index 922de6967c61..781241c797e8 100644 --- a/gfx/src/xlib/nsRegionXlib.cpp +++ b/gfx/src/xlib/nsRegionXlib.cpp @@ -49,7 +49,6 @@ static int nRegions; Region nsRegionXlib::copyRegion = 0; -static NS_DEFINE_IID(kRegionIID, NS_IREGION_IID); nsRegionXlib::nsRegionXlib() { diff --git a/htmlparser/src/CNavDTD.cpp b/htmlparser/src/CNavDTD.cpp index 25ac56ca9a80..151bb5011977 100644 --- a/htmlparser/src/CNavDTD.cpp +++ b/htmlparser/src/CNavDTD.cpp @@ -74,7 +74,6 @@ #endif -static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIDTDIID, NS_IDTD_IID); static NS_DEFINE_IID(kClassIID, NS_INAVHTML_DTD_IID); diff --git a/htmlparser/src/COtherDTD.cpp b/htmlparser/src/COtherDTD.cpp index 02df54aa77fe..5a36beb7078c 100644 --- a/htmlparser/src/COtherDTD.cpp +++ b/htmlparser/src/COtherDTD.cpp @@ -68,7 +68,6 @@ static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIDTDIID, NS_IDTD_IID); static NS_DEFINE_IID(kClassIID, NS_IOTHERHTML_DTD_IID); - static NS_DEFINE_IID(kParserServiceCID, NS_PARSERSERVICE_CID); static const char kVerificationDir[] = "c:/temp"; diff --git a/htmlparser/src/nsParser.cpp b/htmlparser/src/nsParser.cpp index 793f9b78ac7c..2fe9163b8497 100644 --- a/htmlparser/src/nsParser.cpp +++ b/htmlparser/src/nsParser.cpp @@ -79,9 +79,6 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_CID(kCParserCID, NS_PARSER_CID); static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID); -static NS_DEFINE_IID(kExpatDriverCID, NS_EXPAT_DRIVER_CID); -static NS_DEFINE_CID(kNavDTDCID, NS_CNAVDTD_CID); -static NS_DEFINE_CID(kViewSourceDTDCID, NS_VIEWSOURCE_DTD_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); //------------------------------------------------------------------- diff --git a/htmlparser/src/nsParserNode.cpp b/htmlparser/src/nsParserNode.cpp index ec8040d3b90f..611bc0596ebb 100644 --- a/htmlparser/src/nsParserNode.cpp +++ b/htmlparser/src/nsParserNode.cpp @@ -44,9 +44,6 @@ #include "nsITokenizer.h" #include "nsDTDUtils.h" -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kClassIID, NS_PARSER_NODE_IID); -static NS_DEFINE_IID(kIParserNodeIID, NS_IPARSER_NODE_IID); static const nsString& GetEmptyString() { diff --git a/htmlparser/tests/logparse/logparse.cpp b/htmlparser/tests/logparse/logparse.cpp index 576fd3bc09cc..5ff0ead5961e 100644 --- a/htmlparser/tests/logparse/logparse.cpp +++ b/htmlparser/tests/logparse/logparse.cpp @@ -54,8 +54,6 @@ static NS_DEFINE_IID(kLoggingSinkCID, NS_LOGGING_SINK_CID); static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); // Interface IID's -static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID); -static NS_DEFINE_IID(kILoggingSinkIID, NS_ILOGGING_SINK_IID); //---------------------------------------------------------------------- diff --git a/intl/chardet/src/classic/nsClassicCharDetDll.cpp b/intl/chardet/src/classic/nsClassicCharDetDll.cpp index 7aa24ebc9f4f..2b169c696e07 100644 --- a/intl/chardet/src/classic/nsClassicCharDetDll.cpp +++ b/intl/chardet/src/classic/nsClassicCharDetDll.cpp @@ -53,11 +53,6 @@ #include "nsClassicDetectors.h" -static NS_DEFINE_CID(kJAClassicDetectorCID, NS_JA_CLASSIC_DETECTOR_CID); -static NS_DEFINE_CID(kJAClassicStringDetectorCID, NS_JA_CLASSIC_STRING_DETECTOR_CID); -static NS_DEFINE_CID(kKOClassicDetectorCID, NS_KO_CLASSIC_DETECTOR_CID); -static NS_DEFINE_CID(kKOClassicStringDetectorCID, NS_KO_CLASSIC_STRING_DETECTOR_CID); - NS_GENERIC_FACTORY_CONSTRUCTOR(nsJACharsetClassicDetector); NS_GENERIC_FACTORY_CONSTRUCTOR(nsJAStringCharsetClassicDetector); NS_GENERIC_FACTORY_CONSTRUCTOR(nsKOCharsetClassicDetector); diff --git a/intl/chardet/src/nsDetectionAdaptor.cpp b/intl/chardet/src/nsDetectionAdaptor.cpp index 5b8f4d909e24..51e23e5434c5 100644 --- a/intl/chardet/src/nsDetectionAdaptor.cpp +++ b/intl/chardet/src/nsDetectionAdaptor.cpp @@ -46,7 +46,6 @@ #include "nsDetectionAdaptor.h" #include "nsIContentSink.h" -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); //-------------------------------------------------------------- NS_IMETHODIMP nsMyObserver::Notify( diff --git a/intl/chardet/src/nsDocumentCharsetInfo.cpp b/intl/chardet/src/nsDocumentCharsetInfo.cpp index 1c772335ed04..31ba610f7455 100644 --- a/intl/chardet/src/nsDocumentCharsetInfo.cpp +++ b/intl/chardet/src/nsDocumentCharsetInfo.cpp @@ -44,8 +44,6 @@ // XXX doc me -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); - NS_IMPL_THREADSAFE_ISUPPORTS1(nsDocumentCharsetInfo, nsIDocumentCharsetInfo); nsDocumentCharsetInfo::nsDocumentCharsetInfo() diff --git a/intl/chardet/src/nsObserverBase.cpp b/intl/chardet/src/nsObserverBase.cpp index b85bd35568d4..39396df37321 100644 --- a/intl/chardet/src/nsObserverBase.cpp +++ b/intl/chardet/src/nsObserverBase.cpp @@ -47,9 +47,7 @@ #include "nsIHttpChannel.h" #include "nsXPIDLString.h" -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIWebShellServicesIID, NS_IWEB_SHELL_SERVICES_IID); //------------------------------------------------------------------------- NS_IMETHODIMP nsObserverBase::NotifyWebShell(nsISupports* aWebShell, diff --git a/intl/compatibility/src/nsI18nCompatibility.cpp b/intl/compatibility/src/nsI18nCompatibility.cpp index 5b11124e7361..e078134e7b49 100644 --- a/intl/compatibility/src/nsI18nCompatibility.cpp +++ b/intl/compatibility/src/nsI18nCompatibility.cpp @@ -51,9 +51,6 @@ #include "nsI18nCompatibility.h" #include "nsIFile.h" -static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); -static NS_DEFINE_CID(kI18nCompatibilityCID, NS_I18NCOMPATIBILITY_CID); - /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/intl/ctl/src/nsCtlLEModule.cpp b/intl/ctl/src/nsCtlLEModule.cpp index 9feb531e3686..73ac66abe6d6 100644 --- a/intl/ctl/src/nsCtlLEModule.cpp +++ b/intl/ctl/src/nsCtlLEModule.cpp @@ -40,8 +40,6 @@ //---------------------------------------------------------------------------- // Global functions and data [declaration] -static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); - #define ENCODER_NAME_BASE "Unicode Encoder-" NS_GENERIC_FACTORY_CONSTRUCTOR(nsULE) diff --git a/intl/locale/src/mac/nsMacLocale.cpp b/intl/locale/src/mac/nsMacLocale.cpp index 77c0759e9401..e9b11380e4f0 100644 --- a/intl/locale/src/mac/nsMacLocale.cpp +++ b/intl/locale/src/mac/nsMacLocale.cpp @@ -46,8 +46,6 @@ #include "prprf.h" #include -NS_DEFINE_IID(kMacLocaleCID, NS_MACLOCALE_CID); - struct iso_lang_map { char* iso_code; diff --git a/intl/locale/src/os2/nsOS2Locale.cpp b/intl/locale/src/os2/nsOS2Locale.cpp index e94b14a79670..b1de4fe0ad3e 100644 --- a/intl/locale/src/os2/nsOS2Locale.cpp +++ b/intl/locale/src/os2/nsOS2Locale.cpp @@ -39,8 +39,6 @@ #include "nsLocaleCID.h" #include "prprf.h" -NS_DEFINE_IID(kOS2LocaleCID, NS_OS2LOCALE_CID); - /* nsOS2Locale ISupports */ NS_IMPL_ISUPPORTS1(nsOS2Locale,nsIOS2Locale) diff --git a/intl/locale/src/windows/nsIWin32LocaleImpl.cpp b/intl/locale/src/windows/nsIWin32LocaleImpl.cpp index 4bce1e4e6195..0c36697de261 100644 --- a/intl/locale/src/windows/nsIWin32LocaleImpl.cpp +++ b/intl/locale/src/windows/nsIWin32LocaleImpl.cpp @@ -47,8 +47,6 @@ #include #include "nsCRT.h" -NS_DEFINE_IID(kIWin32LocaleImplCID, NS_WIN32LOCALE_CID); - #define USER_DEFINED_PRIMARYLANG 0x0200 #define USER_DEFINED_SUBLANGUAGE 0x20 diff --git a/intl/locale/tests/LocaleSelfTest.cpp b/intl/locale/tests/LocaleSelfTest.cpp index b87b36fff8d7..1ddf298ade9a 100644 --- a/intl/locale/tests/LocaleSelfTest.cpp +++ b/intl/locale/tests/LocaleSelfTest.cpp @@ -80,7 +80,6 @@ // Collation // static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID); -static NS_DEFINE_CID(kCollationCID, NS_COLLATION_CID); // Date and Time // static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); diff --git a/intl/locale/tests/nsLocaleTest.cpp b/intl/locale/tests/nsLocaleTest.cpp index 56219166b0b8..7537c09b84d8 100644 --- a/intl/locale/tests/nsLocaleTest.cpp +++ b/intl/locale/tests/nsLocaleTest.cpp @@ -57,8 +57,6 @@ NS_DEFINE_CID(kLocaleFactoryCID, NS_LOCALEFACTORY_CID); NS_DEFINE_IID(kILocaleFactoryIID, NS_ILOCALEFACTORY_IID); NS_DEFINE_IID(kILocaleServiceIID,NS_ILOCALESERVICE_IID); NS_DEFINE_CID(kLocaleServiceCID,NS_LOCALESERVICE_CID); -NS_DEFINE_CID(kLocaleCID, NS_LOCALE_CID); -NS_DEFINE_IID(kILocaleIID, NS_ILOCALE_IID); NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); diff --git a/intl/lwbrk/src/nsLWBreakerFImp.cpp b/intl/lwbrk/src/nsLWBreakerFImp.cpp index 4ee78d24c929..7dcfc77d7f47 100644 --- a/intl/lwbrk/src/nsLWBreakerFImp.cpp +++ b/intl/lwbrk/src/nsLWBreakerFImp.cpp @@ -52,8 +52,6 @@ nsLWBreakerFImp::~nsLWBreakerFImp() NS_DEFINE_IID(kILineBreakerFactoryIID, NS_ILINEBREAKERFACTORY_IID); NS_DEFINE_IID(kIWordBreakerFactoryIID, NS_IWORDBREAKERFACTORY_IID); -NS_DEFINE_IID(kILineBreakerIID, NS_ILINEBREAKER_IID); -NS_DEFINE_IID(kIWordBreakerIID, NS_IWORDBREAKER_IID); NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); diff --git a/intl/strres/tests/StringBundleTest.cpp b/intl/strres/tests/StringBundleTest.cpp index ae2ba0f5a450..bc7f1665d5df 100644 --- a/intl/strres/tests/StringBundleTest.cpp +++ b/intl/strres/tests/StringBundleTest.cpp @@ -55,9 +55,6 @@ // #define TEST_URL "resource:/res/strres.properties" -static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); - //////////////////////////////////////////////////////////////////////////////////////////////////// // // let add some locale stuff diff --git a/intl/uconv/src/nsCharsetConverterManager.cpp b/intl/uconv/src/nsCharsetConverterManager.cpp index 96da18687839..2d4c32e8d52e 100644 --- a/intl/uconv/src/nsCharsetConverterManager.cpp +++ b/intl/uconv/src/nsCharsetConverterManager.cpp @@ -65,7 +65,6 @@ #include "nsNativeUConvService.h" static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); -static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID); static NS_DEFINE_CID(kCharsetAliasCID, NS_CHARSETALIAS_CID); // Pattern of cached, commonly used, single byte decoder diff --git a/intl/uconv/src/nsScriptableUConv.cpp b/intl/uconv/src/nsScriptableUConv.cpp index ae589a6adab2..236bf4b4fec3 100644 --- a/intl/uconv/src/nsScriptableUConv.cpp +++ b/intl/uconv/src/nsScriptableUConv.cpp @@ -49,9 +49,6 @@ #include "nsIPlatformCharset.h" -static NS_DEFINE_CID(kIScriptableUnicodeConverterCID, NS_ISCRIPTABLEUNICODECONVERTER_CID); -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); - static PRInt32 gInstanceCount = 0; /* Implementation file */ diff --git a/intl/uconv/src/nsTextToSubURI.cpp b/intl/uconv/src/nsTextToSubURI.cpp index 17e526c346fc..e2b60ff3e579 100644 --- a/intl/uconv/src/nsTextToSubURI.cpp +++ b/intl/uconv/src/nsTextToSubURI.cpp @@ -48,7 +48,6 @@ #include "nsTextToSubURI.h" #include "nsCRT.h" -static NS_DEFINE_CID(kITextToSubURIIID, NS_ITEXTTOSUBURI_IID); static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); nsTextToSubURI::nsTextToSubURI() diff --git a/intl/uconv/src/nsUConvDll.cpp b/intl/uconv/src/nsUConvDll.cpp index eadf2319da55..c24ac9c0bf48 100644 --- a/intl/uconv/src/nsUConvDll.cpp +++ b/intl/uconv/src/nsUConvDll.cpp @@ -57,6 +57,3 @@ //---------------------------------------------------------------------- // Global functions and data [declaration] -static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); -static NS_DEFINE_CID(kTextToSubURICID, NS_TEXTTOSUBURI_CID); diff --git a/intl/uconv/src/nsUConvModule.cpp b/intl/uconv/src/nsUConvModule.cpp index 12f5fbbf0b06..db359854f73a 100644 --- a/intl/uconv/src/nsUConvModule.cpp +++ b/intl/uconv/src/nsUConvModule.cpp @@ -534,8 +534,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsISO2022CNToUnicode); //---------------------------------------------------------------------------- // Global functions and data [declaration] -static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); - #define DECODER_NAME_BASE "Unicode Decoder-" #define ENCODER_NAME_BASE "Unicode Encoder-" diff --git a/intl/uconv/tests/nsTestUConv.cpp b/intl/uconv/tests/nsTestUConv.cpp index 6f1dfc8c3719..10cbb4b62dce 100644 --- a/intl/uconv/tests/nsTestUConv.cpp +++ b/intl/uconv/tests/nsTestUConv.cpp @@ -51,7 +51,6 @@ static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); -static NS_DEFINE_IID(kICharsetConverterManagerIID, NS_ICHARSETCONVERTERMANAGER_IID); static NS_DEFINE_CID(kPlatformCharsetCID, NS_PLATFORMCHARSET_CID); //#define TEST_IS_REPRESENTABLE diff --git a/intl/uconv/ucvmath/nsUCvMathModule.cpp b/intl/uconv/ucvmath/nsUCvMathModule.cpp index e8f491b0419b..7f64c5e1d2af 100644 --- a/intl/uconv/ucvmath/nsUCvMathModule.cpp +++ b/intl/uconv/ucvmath/nsUCvMathModule.cpp @@ -73,8 +73,6 @@ //---------------------------------------------------------------------------- // Global functions and data [declaration] -static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); - #define DECODER_NAME_BASE "Unicode Decoder-" #define ENCODER_NAME_BASE "Unicode Encoder-" diff --git a/intl/unicharutil/src/nsHankakuToZenkaku.cpp b/intl/unicharutil/src/nsHankakuToZenkaku.cpp index 5841bbe84e4c..00513ee2b95b 100644 --- a/intl/unicharutil/src/nsHankakuToZenkaku.cpp +++ b/intl/unicharutil/src/nsHankakuToZenkaku.cpp @@ -39,11 +39,8 @@ #include "nsITextTransform.h" #include "pratom.h" #include "nsUUDll.h" -#include "nsHankakuToZenkakuCID.h" #include "nsTextTransformFactory.h" -NS_DEFINE_CID(kHankakuToZenkakuCID, NS_HANKAKUTOZENKAKU_CID); - // Basic mapping from Hankaku to Zenkaku // Nigori and Maru is take care out side this basic mapping static const PRUnichar gBasicMapping[0x40] = diff --git a/intl/unicharutil/tests/UnicharSelfTest.cpp b/intl/unicharutil/tests/UnicharSelfTest.cpp index 7d352b4c04e6..e8eec8e30315 100644 --- a/intl/unicharutil/tests/UnicharSelfTest.cpp +++ b/intl/unicharutil/tests/UnicharSelfTest.cpp @@ -59,7 +59,6 @@ NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID); NS_DEFINE_IID(kCaseConversionIID, NS_ICASECONVERSION_IID); NS_DEFINE_CID(kEntityConverterCID, NS_ENTITYCONVERTER_CID); NS_DEFINE_CID(kSaveAsCharsetCID, NS_SAVEASCHARSET_CID); -NS_DEFINE_IID(kIPersistentPropertiesIID,NS_IPERSISTENTPROPERTIES_IID); NS_DEFINE_CID(kUnicodeNormalizerCID, NS_UNICODE_NORMALIZER_CID); #define TESTLEN 29 diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp index c8f4718ba9ce..d904172af0f3 100644 --- a/layout/base/nsCaret.cpp +++ b/layout/base/nsCaret.cpp @@ -79,8 +79,6 @@ //------------------------------END OF IBM BIDI-------------------------------- #endif //IBMBIDI -static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); - //----------------------------------------------------------------------------- nsCaret::nsCaret() diff --git a/layout/base/src/nsCaret.cpp b/layout/base/src/nsCaret.cpp index c8f4718ba9ce..d904172af0f3 100644 --- a/layout/base/src/nsCaret.cpp +++ b/layout/base/src/nsCaret.cpp @@ -79,8 +79,6 @@ //------------------------------END OF IBM BIDI-------------------------------- #endif //IBMBIDI -static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); - //----------------------------------------------------------------------------- nsCaret::nsCaret() diff --git a/layout/base/src/nsCopySupport.cpp b/layout/base/src/nsCopySupport.cpp index 389f607510f7..2058933638f8 100644 --- a/layout/base/src/nsCopySupport.cpp +++ b/layout/base/src/nsCopySupport.cpp @@ -68,7 +68,6 @@ #include "nsHTMLAtoms.h" #ifdef IBMBIDI #include "nsBidiUtils.h" -//static NS_DEFINE_CID(kUBidiUtilCID, NS_UNICHARBIDIUTIL_CID); #endif // image copy stuff diff --git a/layout/build/nsContentDLF.cpp b/layout/build/nsContentDLF.cpp index 5a01d886e475..f432ef630394 100644 --- a/layout/build/nsContentDLF.cpp +++ b/layout/build/nsContentDLF.cpp @@ -568,8 +568,6 @@ nsContentDLF::CreateXULDocumentFromStream(nsIInputStream& aXULStream, return status; } -static NS_DEFINE_IID(kDocumentFactoryImplCID, NS_CONTENT_DOCUMENT_LOADER_FACTORY_CID); - static nsresult RegisterTypes(nsICategoryManager* aCatMgr, const char* const* aTypes) diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp index 07ef6ba9b6a8..d94272e050e4 100644 --- a/layout/generic/nsContainerFrame.cpp +++ b/layout/generic/nsContainerFrame.cpp @@ -64,8 +64,6 @@ #include "nsRegion.h" #include "nsLayoutErrors.h" -static NS_DEFINE_CID(kRegionCID, NS_REGION_CID); - #ifdef NS_DEBUG #undef NOISY #else diff --git a/layout/generic/nsSimplePageSequence.cpp b/layout/generic/nsSimplePageSequence.cpp index a74b0b0d84a5..5e0645da33ee 100644 --- a/layout/generic/nsSimplePageSequence.cpp +++ b/layout/generic/nsSimplePageSequence.cpp @@ -84,7 +84,6 @@ static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID); static const char sPrintOptionsContractID[] = "@mozilla.org/gfx/printsettings-service;1"; // -static NS_DEFINE_CID(kRegionCID, NS_REGION_CID); #include "prlog.h" #ifdef PR_LOGGING diff --git a/layout/html/base/src/nsContainerFrame.cpp b/layout/html/base/src/nsContainerFrame.cpp index 07ef6ba9b6a8..d94272e050e4 100644 --- a/layout/html/base/src/nsContainerFrame.cpp +++ b/layout/html/base/src/nsContainerFrame.cpp @@ -64,8 +64,6 @@ #include "nsRegion.h" #include "nsLayoutErrors.h" -static NS_DEFINE_CID(kRegionCID, NS_REGION_CID); - #ifdef NS_DEBUG #undef NOISY #else diff --git a/layout/html/base/src/nsSimplePageSequence.cpp b/layout/html/base/src/nsSimplePageSequence.cpp index a74b0b0d84a5..5e0645da33ee 100644 --- a/layout/html/base/src/nsSimplePageSequence.cpp +++ b/layout/html/base/src/nsSimplePageSequence.cpp @@ -84,7 +84,6 @@ static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID); static const char sPrintOptionsContractID[] = "@mozilla.org/gfx/printsettings-service;1"; // -static NS_DEFINE_CID(kRegionCID, NS_REGION_CID); #include "prlog.h" #ifdef PR_LOGGING diff --git a/mailnews/addrbook/src/nsAbRDFResource.cpp b/mailnews/addrbook/src/nsAbRDFResource.cpp index 9a1200403e9d..672d614a2762 100644 --- a/mailnews/addrbook/src/nsAbRDFResource.cpp +++ b/mailnews/addrbook/src/nsAbRDFResource.cpp @@ -45,8 +45,6 @@ #include "nsAddrDatabase.h" #include "nsIAddrBookSession.h" -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - nsAbRDFResource::nsAbRDFResource(void) { mDatabase = nsnull; diff --git a/mailnews/base/search/src/nsMsgSearchAdapter.cpp b/mailnews/base/search/src/nsMsgSearchAdapter.cpp index 87f684fe475f..318d2aba16c0 100644 --- a/mailnews/base/search/src/nsMsgSearchAdapter.cpp +++ b/mailnews/base/search/src/nsMsgSearchAdapter.cpp @@ -78,7 +78,6 @@ const char *nsMsgSearchAdapter::m_kImapNotSeen = " UNSEEN "; const char *nsMsgSearchAdapter::m_kImapNotAnswered = " UNANSWERED "; const char *nsMsgSearchAdapter::m_kImapCharset = " CHARSET "; -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #define PREF_CUSTOM_HEADERS "mailnews.customHeaders" NS_IMETHODIMP nsMsgSearchAdapter::FindTargetFolder(const nsMsgResultElement *,nsIMsgFolder * *) diff --git a/mailnews/base/src/nsCopyMessageStreamListener.cpp b/mailnews/base/src/nsCopyMessageStreamListener.cpp index 8ecbcdea44fa..540745a2c6b8 100644 --- a/mailnews/base/src/nsCopyMessageStreamListener.cpp +++ b/mailnews/base/src/nsCopyMessageStreamListener.cpp @@ -49,9 +49,6 @@ #include "nsMsgUtils.h" #include "netCore.h" -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); - NS_IMPL_THREADSAFE_ADDREF(nsCopyMessageStreamListener) NS_IMPL_THREADSAFE_RELEASE(nsCopyMessageStreamListener) diff --git a/mailnews/base/src/nsMessenger.cpp b/mailnews/base/src/nsMessenger.cpp index c5a8732b9651..0cf5c05d10fc 100644 --- a/mailnews/base/src/nsMessenger.cpp +++ b/mailnews/base/src/nsMessenger.cpp @@ -144,7 +144,6 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); static NS_DEFINE_CID(kMsgSendLaterCID, NS_MSGSENDLATER_CID); -static NS_DEFINE_CID(kMsgPrintEngineCID, NS_MSG_PRINTENGINE_CID); #define FOUR_K 4096 #define MESSENGER_SAVE_DIR_PREF_NAME "messenger.save.dir" diff --git a/mailnews/base/src/nsMessengerBootstrap.cpp b/mailnews/base/src/nsMessengerBootstrap.cpp index 2cd5527ffa47..9b2f60c9b6c1 100644 --- a/mailnews/base/src/nsMessengerBootstrap.cpp +++ b/mailnews/base/src/nsMessengerBootstrap.cpp @@ -54,7 +54,6 @@ #include "nsString.h" #include "nsIURI.h" #include "nsIDialogParamBlock.h" -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); NS_IMPL_THREADSAFE_ADDREF(nsMessengerBootstrap); diff --git a/mailnews/base/src/nsMsgAccount.cpp b/mailnews/base/src/nsMsgAccount.cpp index 2a151a7ecf0a..e08c98a61726 100644 --- a/mailnews/base/src/nsMsgAccount.cpp +++ b/mailnews/base/src/nsMsgAccount.cpp @@ -55,7 +55,6 @@ #include "nsIMsgAccountManager.h" #include "nsIMsgMailSession.h" -static NS_DEFINE_CID(kMsgIdentityCID, NS_MSGIDENTITY_CID); static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); NS_IMPL_ISUPPORTS1(nsMsgAccount, nsIMsgAccount) diff --git a/mailnews/base/src/nsMsgAccountManager.cpp b/mailnews/base/src/nsMsgAccountManager.cpp index 8aacf299769d..531fdf494aab 100644 --- a/mailnews/base/src/nsMsgAccountManager.cpp +++ b/mailnews/base/src/nsMsgAccountManager.cpp @@ -97,7 +97,6 @@ static NS_DEFINE_CID(kMsgAccountCID, NS_MSGACCOUNT_CID); static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); -static NS_DEFINE_CID(kMsgBiffManagerCID, NS_MSGBIFFMANAGER_CID); static NS_DEFINE_CID(kMsgFolderCacheCID, NS_MSGFOLDERCACHE_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); diff --git a/mailnews/base/src/nsMsgFolderCompactor.cpp b/mailnews/base/src/nsMsgFolderCompactor.cpp index 0ed716cb1e84..27f5c93740fc 100644 --- a/mailnews/base/src/nsMsgFolderCompactor.cpp +++ b/mailnews/base/src/nsMsgFolderCompactor.cpp @@ -60,7 +60,6 @@ #include "nsMsgLocalFolderHdrs.h" static NS_DEFINE_CID(kCMailDB, NS_MAILDB_CID); -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); ////////////////////////////////////////////////////////////////////////////// // nsFolderCompactState ////////////////////////////////////////////////////////////////////////////// diff --git a/mailnews/base/src/nsMsgFolderDataSource.cpp b/mailnews/base/src/nsMsgFolderDataSource.cpp index fb9f2db07027..9d9c9a1a9ada 100644 --- a/mailnews/base/src/nsMsgFolderDataSource.cpp +++ b/mailnews/base/src/nsMsgFolderDataSource.cpp @@ -64,8 +64,6 @@ #include "nsIMsgFolder.h" // TO include biffState enum. Change to bool later... #include "nsArray.h" -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - nsIRDFResource* nsMsgFolderDataSource::kNC_Child = nsnull; nsIRDFResource* nsMsgFolderDataSource::kNC_Folder= nsnull; nsIRDFResource* nsMsgFolderDataSource::kNC_Name= nsnull; diff --git a/mailnews/base/util/nsMsgFolder.cpp b/mailnews/base/util/nsMsgFolder.cpp index 8cb98f28ae31..6a0c91131eeb 100644 --- a/mailnews/base/util/nsMsgFolder.cpp +++ b/mailnews/base/util/nsMsgFolder.cpp @@ -83,7 +83,6 @@ #define PREF_MAIL_WARN_FILTER_CHANGED "mail.warn_filter_changed" static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kCollationFactoryCID, NS_COLLATIONFACTORY_CID); nsrefcnt nsMsgFolder::gInstanceCount = 0; diff --git a/mailnews/base/util/nsMsgProtocol.cpp b/mailnews/base/util/nsMsgProtocol.cpp index ec96e75ec20c..6c1acd14b478 100644 --- a/mailnews/base/util/nsMsgProtocol.cpp +++ b/mailnews/base/util/nsMsgProtocol.cpp @@ -63,7 +63,6 @@ static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID); static NS_DEFINE_CID(kStreamTransportServiceCID, NS_STREAMTRANSPORTSERVICE_CID); -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); NS_IMPL_THREADSAFE_ADDREF(nsMsgProtocol) NS_IMPL_THREADSAFE_RELEASE(nsMsgProtocol) diff --git a/mailnews/base/util/nsMsgTxn.cpp b/mailnews/base/util/nsMsgTxn.cpp index 36f0cf40ce37..710a4ab86a20 100644 --- a/mailnews/base/util/nsMsgTxn.cpp +++ b/mailnews/base/util/nsMsgTxn.cpp @@ -37,7 +37,6 @@ #include "nsMsgTxn.h" #include "nsIMsgHdr.h" -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); NS_IMPL_THREADSAFE_ADDREF(nsMsgTxn) NS_IMPL_THREADSAFE_RELEASE(nsMsgTxn) diff --git a/mailnews/build/nsMailModule.cpp b/mailnews/build/nsMailModule.cpp index 15ed51ffd0ca..902a1209510a 100644 --- a/mailnews/build/nsMailModule.cpp +++ b/mailnews/build/nsMailModule.cpp @@ -439,13 +439,6 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsLocalStringService) //////////////////////////////////////////////////////////////////////////////// // msgdb factories //////////////////////////////////////////////////////////////////////////////// -static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); -static NS_DEFINE_CID(kCMailDB, NS_MAILDB_CID); -static NS_DEFINE_CID(kCNewsDB, NS_NEWSDB_CID); -static NS_DEFINE_CID(kCImapDB, NS_IMAPDB_CID); -static NS_DEFINE_CID(kCMsgRetentionSettings, NS_MSG_RETENTIONSETTINGS_CID); -static NS_DEFINE_CID(kCMsgDownloadSettings, NS_MSG_DOWNLOADSETTINGS_CID); - NS_GENERIC_FACTORY_CONSTRUCTOR(nsMailDatabase) NS_GENERIC_FACTORY_CONSTRUCTOR(nsNewsDatabase) NS_GENERIC_FACTORY_CONSTRUCTOR(nsImapMailDatabase) diff --git a/mailnews/compose/src/nsMsgCompose.cpp b/mailnews/compose/src/nsMsgCompose.cpp index 8c024acc4ae5..4e36f409cafd 100644 --- a/mailnews/compose/src/nsMsgCompose.cpp +++ b/mailnews/compose/src/nsMsgCompose.cpp @@ -117,7 +117,6 @@ #include "nsIMsgMdnGenerator.h" // Defines.... -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); static PRInt32 GetReplyOnTop() @@ -278,8 +277,6 @@ NS_IMPL_ISUPPORTS2(nsMsgCompose, nsIMsgCompose, nsISupportsWeakReference) // Once we are here, convert the data which we know to be UTF-8 to UTF-16 // for insertion into the editor // -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); - nsresult GetChildOffset(nsIDOMNode *aChild, nsIDOMNode *aParent, PRInt32 &aOffset) { diff --git a/mailnews/compose/src/nsMsgCreate.cpp b/mailnews/compose/src/nsMsgCreate.cpp index e8b4d141a4ac..2ec3494ef9d4 100644 --- a/mailnews/compose/src/nsMsgCreate.cpp +++ b/mailnews/compose/src/nsMsgCreate.cpp @@ -68,9 +68,6 @@ #include "nsMsgBaseCID.h" -// CID's needed -static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); - // // Implementation... // diff --git a/mailnews/compose/src/nsSmtpService.cpp b/mailnews/compose/src/nsSmtpService.cpp index f213eb1d9d9c..ba180d362a05 100644 --- a/mailnews/compose/src/nsSmtpService.cpp +++ b/mailnews/compose/src/nsSmtpService.cpp @@ -82,7 +82,6 @@ typedef struct _findServerByHostnameEntry { static NS_DEFINE_CID(kCSmtpUrlCID, NS_SMTPURL_CID); static NS_DEFINE_CID(kCMailtoUrlCID, NS_MAILTOURL_CID); -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); // foward declarations... nsresult diff --git a/mailnews/compose/src/nsURLFetcher.cpp b/mailnews/compose/src/nsURLFetcher.cpp index a14a3694ea22..c3c866f9e126 100644 --- a/mailnews/compose/src/nsURLFetcher.cpp +++ b/mailnews/compose/src/nsURLFetcher.cpp @@ -59,8 +59,6 @@ #include "nsMsgSend.h" #include "nsIStreamConverterService.h" -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); - NS_IMPL_ISUPPORTS6(nsURLFetcher, nsIURLFetcher, nsIStreamListener, nsIURIContentListener, nsIInterfaceRequestor, nsIWebProgressListener, nsISupportsWeakReference) diff --git a/mailnews/db/msgdb/build/nsMsgDBFactory.cpp b/mailnews/db/msgdb/build/nsMsgDBFactory.cpp index 7cfe1c60121e..472af16e0367 100644 --- a/mailnews/db/msgdb/build/nsMsgDBFactory.cpp +++ b/mailnews/db/msgdb/build/nsMsgDBFactory.cpp @@ -47,13 +47,6 @@ #include "nsNewsDatabase.h" #include "nsImapMailDatabase.h" -static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); -static NS_DEFINE_CID(kCMailDB, NS_MAILDB_CID); -static NS_DEFINE_CID(kCNewsDB, NS_NEWSDB_CID); -static NS_DEFINE_CID(kCImapDB, NS_IMAPDB_CID); -static NS_DEFINE_CID(kCMsgRetentionSettings, NS_MSG_RETENTIONSETTINGS_CID); -static NS_DEFINE_CID(kCMsgDownloadSettings, NS_MSG_DOWNLOADSETTINGS_CID); - NS_GENERIC_FACTORY_CONSTRUCTOR(nsMailDatabase) NS_GENERIC_FACTORY_CONSTRUCTOR(nsNewsDatabase) NS_GENERIC_FACTORY_CONSTRUCTOR(nsImapMailDatabase) diff --git a/mailnews/extensions/palmsync/src/nsAbPalmSync.cpp b/mailnews/extensions/palmsync/src/nsAbPalmSync.cpp index cd3bdfe1a966..f18b910bcbc5 100644 --- a/mailnews/extensions/palmsync/src/nsAbPalmSync.cpp +++ b/mailnews/extensions/palmsync/src/nsAbPalmSync.cpp @@ -48,8 +48,6 @@ #include "nsAbCardProperty.h" #include "prdtoa.h" -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); - #define PREVIOUS_EXTENSION ".prev" #define kPABDirectory 2 // defined in nsDirPrefs.h #define kMAPIDirectory 3 // defined in nsDirPrefs.h diff --git a/mailnews/imap/src/nsImapIncomingServer.cpp b/mailnews/imap/src/nsImapIncomingServer.cpp index 06dfba5ac44e..1cb5d40c1248 100644 --- a/mailnews/imap/src/nsImapIncomingServer.cpp +++ b/mailnews/imap/src/nsImapIncomingServer.cpp @@ -98,11 +98,9 @@ #define PREF_TRASH_FOLDER_NAME "trash_folder_name" #define DEFAULT_TRASH_FOLDER_NAME "Trash" -static NS_DEFINE_CID(kCImapHostSessionList, NS_IIMAPHOSTSESSIONLIST_CID); static NS_DEFINE_CID(kImapProtocolCID, NS_IMAPPROTOCOL_CID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_CID(kMsgLogonRedirectorServiceCID, NS_MSGLOGONREDIRECTORSERVICE_CID); static NS_DEFINE_CID(kImapServiceCID, NS_IMAPSERVICE_CID); static NS_DEFINE_CID(kSubscribableServerCID, NS_SUBSCRIBABLESERVER_CID); static NS_DEFINE_CID(kCImapHostSessionListCID, NS_IIMAPHOSTSESSIONLIST_CID); diff --git a/mailnews/imap/src/nsImapMailFolder.cpp b/mailnews/imap/src/nsImapMailFolder.cpp index b122c7d3cc09..4c119052687c 100644 --- a/mailnews/imap/src/nsImapMailFolder.cpp +++ b/mailnews/imap/src/nsImapMailFolder.cpp @@ -109,7 +109,6 @@ static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); static NS_DEFINE_CID(kCMailDB, NS_MAILDB_CID); -static NS_DEFINE_CID(kImapProtocolCID, NS_IMAPPROTOCOL_CID); static NS_DEFINE_CID(kCImapDB, NS_IMAPDB_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_CID(kParseMailMsgStateCID, NS_PARSEMAILMSGSTATE_CID); diff --git a/mailnews/imap/src/nsImapService.cpp b/mailnews/imap/src/nsImapService.cpp index d5a7bc074139..745ff4c72009 100644 --- a/mailnews/imap/src/nsImapService.cpp +++ b/mailnews/imap/src/nsImapService.cpp @@ -103,7 +103,6 @@ #define PREF_MAIL_ROOT_IMAP "mail.root.imap" -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_CID(kImapUrlCID, NS_IMAPURL_CID); static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID); diff --git a/mailnews/imap/src/nsImapUndoTxn.cpp b/mailnews/imap/src/nsImapUndoTxn.cpp index 9fa8419e355a..ea172a99015a 100644 --- a/mailnews/imap/src/nsImapUndoTxn.cpp +++ b/mailnews/imap/src/nsImapUndoTxn.cpp @@ -45,8 +45,6 @@ #include "nsIMsgIncomingServer.h" #include "nsIDBFolderInfo.h" -static NS_DEFINE_CID(kCImapHostSessionList, NS_IIMAPHOSTSESSIONLIST_CID); - nsImapMoveCopyMsgTxn::nsImapMoveCopyMsgTxn() : m_idsAreUids(PR_FALSE), m_isMove(PR_FALSE), m_srcIsPop3(PR_FALSE) { diff --git a/mailnews/import/comm4x/src/nsComm4xMail.cpp b/mailnews/import/comm4x/src/nsComm4xMail.cpp index 469762805f4f..f47b0348042d 100644 --- a/mailnews/import/comm4x/src/nsComm4xMail.cpp +++ b/mailnews/import/comm4x/src/nsComm4xMail.cpp @@ -52,7 +52,6 @@ #define kCopyBufferSize 8192 #define kMailReadBufferSize 16384 -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static PRBool nsStringEndsWith(nsString& name, const char *ending) diff --git a/mailnews/import/eudora/src/nsEudoraAddress.cpp b/mailnews/import/eudora/src/nsEudoraAddress.cpp index fab3bb3bc243..0e2555b70c01 100644 --- a/mailnews/import/eudora/src/nsEudoraAddress.cpp +++ b/mailnews/import/eudora/src/nsEudoraAddress.cpp @@ -26,8 +26,6 @@ #include "nsEudoraImport.h" #include "nsReadableUtils.h" -static NS_DEFINE_CID(kAbCardPropertyCID, NS_ABCARDPROPERTY_CID); - #include "EudoraDebugLog.h" #define kWhitespace " \t\b\r\n" diff --git a/mailnews/import/eudora/src/nsEudoraMac.cpp b/mailnews/import/eudora/src/nsEudoraMac.cpp index 78d9565fda26..5ee68a891cb3 100644 --- a/mailnews/import/eudora/src/nsEudoraMac.cpp +++ b/mailnews/import/eudora/src/nsEudoraMac.cpp @@ -68,7 +68,6 @@ static nsresult NS_FileSpecToILocalFileMac(nsFileSpec *aSpec, nsILocalFileMac ** #endif static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); static const char * kWhitespace = "\b\t\r\n "; diff --git a/mailnews/import/eudora/src/nsEudoraWin32.cpp b/mailnews/import/eudora/src/nsEudoraWin32.cpp index bff63c0bbced..4e53979f3dd6 100644 --- a/mailnews/import/eudora/src/nsEudoraWin32.cpp +++ b/mailnews/import/eudora/src/nsEudoraWin32.cpp @@ -40,7 +40,6 @@ #include "EudoraDebugLog.h" static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); static const char * kWhitespace = "\b\t\r\n "; diff --git a/mailnews/import/oexpress/nsOEAddressIterator.cpp b/mailnews/import/oexpress/nsOEAddressIterator.cpp index 9c1a79807564..ae33bc64bc0c 100644 --- a/mailnews/import/oexpress/nsOEAddressIterator.cpp +++ b/mailnews/import/oexpress/nsOEAddressIterator.cpp @@ -58,8 +58,6 @@ #include "OEDebugLog.h" -static NS_DEFINE_CID(kAbCardPropertyCID, NS_ABCARDPROPERTY_CID); - typedef struct { PRInt32 mozField; PRInt32 multiLine; diff --git a/mailnews/import/oexpress/nsOESettings.cpp b/mailnews/import/oexpress/nsOESettings.cpp index 64fbfd6ae41e..5ab651c8e700 100644 --- a/mailnews/import/oexpress/nsOESettings.cpp +++ b/mailnews/import/oexpress/nsOESettings.cpp @@ -62,9 +62,6 @@ #include "OEDebugLog.h" #include "nsIPop3IncomingServer.h" -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); - class OESettings { public: static HKEY Find50Key( void); diff --git a/mailnews/import/outlook/src/nsOutlookSettings.cpp b/mailnews/import/outlook/src/nsOutlookSettings.cpp index deec4ceac3f8..86cf6285f95b 100644 --- a/mailnews/import/outlook/src/nsOutlookSettings.cpp +++ b/mailnews/import/outlook/src/nsOutlookSettings.cpp @@ -62,9 +62,6 @@ #include "OutlookDebugLog.h" #include "nsIPop3IncomingServer.h" -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); - class OutlookSettings { public: static HKEY FindAccountsKey( void); diff --git a/mailnews/import/src/nsImportAddressBooks.cpp b/mailnews/import/src/nsImportAddressBooks.cpp index 0f243a6b549e..106d969f0570 100644 --- a/mailnews/import/src/nsImportAddressBooks.cpp +++ b/mailnews/import/src/nsImportAddressBooks.cpp @@ -69,7 +69,6 @@ #include "ImportDebug.h" -static NS_DEFINE_CID(kAbDirectoryCID, NS_ABDIRECTORY_CID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); static NS_DEFINE_CID(kSupportsWStringCID, NS_SUPPORTS_STRING_CID); static NS_DEFINE_CID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); diff --git a/mailnews/import/src/nsImportMail.cpp b/mailnews/import/src/nsImportMail.cpp index 1bdefb162344..5be15e13bc51 100644 --- a/mailnews/import/src/nsImportMail.cpp +++ b/mailnews/import/src/nsImportMail.cpp @@ -78,9 +78,6 @@ #define IMPORT_MSGS_URL "chrome://messenger/locale/importMsgs.properties" -static NS_DEFINE_CID(kMsgAccountCID, NS_MSGACCOUNT_CID); -static NS_DEFINE_CID(kMsgIdentityCID, NS_MSGIDENTITY_CID); -static NS_DEFINE_CID(kMsgBiffManagerCID, NS_MSGBIFFMANAGER_CID); static NS_DEFINE_CID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); static NS_DEFINE_CID(kSupportsWStringCID, NS_SUPPORTS_STRING_CID); diff --git a/mailnews/import/src/nsImportService.cpp b/mailnews/import/src/nsImportService.cpp index 56bc19f5723b..31dee490e2af 100644 --- a/mailnews/import/src/nsImportService.cpp +++ b/mailnews/import/src/nsImportService.cpp @@ -71,7 +71,6 @@ PRLogModuleInfo *IMPORTLOGMODULE = nsnull; static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); -static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); static nsIImportService * gImportService = nsnull; static const char * kWhitespace = "\b\t\r\n "; diff --git a/mailnews/import/text/src/nsTextAddress.cpp b/mailnews/import/text/src/nsTextAddress.cpp index 68631d43bb44..8619e4b7c83d 100644 --- a/mailnews/import/text/src/nsTextAddress.cpp +++ b/mailnews/import/text/src/nsTextAddress.cpp @@ -28,8 +28,6 @@ #include "nsIPrefService.h" #include "nsIPrefBranch.h" -static NS_DEFINE_CID(kAbCardPropertyCID, NS_ABCARDPROPERTY_CID); - #include "TextDebugLog.h" #define kWhitespace " \t\b\r\n" diff --git a/mailnews/local/src/nsLocalUndoTxn.cpp b/mailnews/local/src/nsLocalUndoTxn.cpp index 903c386505a0..51752f51fb03 100644 --- a/mailnews/local/src/nsLocalUndoTxn.cpp +++ b/mailnews/local/src/nsLocalUndoTxn.cpp @@ -47,7 +47,6 @@ #include "nsIEventQueueService.h" #include "nsIMsgMailSession.h" -static NS_DEFINE_CID(kMailboxServiceCID, NS_IMAILBOXSERVICE_IID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); nsLocalMoveCopyMsgTxn::nsLocalMoveCopyMsgTxn() : diff --git a/mailnews/local/src/nsMailboxProtocol.cpp b/mailnews/local/src/nsMailboxProtocol.cpp index 286bb8684870..84287028de09 100644 --- a/mailnews/local/src/nsMailboxProtocol.cpp +++ b/mailnews/local/src/nsMailboxProtocol.cpp @@ -72,9 +72,6 @@ PRLogModuleInfo *MAILBOX; #include "nsIMsgMdnGenerator.h" -static NS_DEFINE_CID(kCMailDB, NS_MAILDB_CID); -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); - /* the output_buffer_size must be larger than the largest possible line * 2000 seems good for news * diff --git a/mailnews/local/src/nsMailboxService.cpp b/mailnews/local/src/nsMailboxService.cpp index f08bbb29f7df..a07d18e0bfd0 100644 --- a/mailnews/local/src/nsMailboxService.cpp +++ b/mailnews/local/src/nsMailboxService.cpp @@ -62,7 +62,6 @@ #include "nsIMsgHdr.h" static NS_DEFINE_CID(kCMailboxUrl, NS_MAILBOXURL_CID); -static NS_DEFINE_CID(kCMailDB, NS_MAILDB_CID); static NS_DEFINE_CID(kCPop3ServiceCID, NS_POP3SERVICE_CID); nsMailboxService::nsMailboxService() diff --git a/mailnews/local/src/nsMailboxUrl.cpp b/mailnews/local/src/nsMailboxUrl.cpp index 2b542ea5d1f4..6ca8429d3e29 100644 --- a/mailnews/local/src/nsMailboxUrl.cpp +++ b/mailnews/local/src/nsMailboxUrl.cpp @@ -62,7 +62,6 @@ // we need this because of an egcs 1.0 (and possibly gcc) compiler bug // that doesn't allow you to call ::nsISupports::GetIID() inside of a class // that multiply inherits from nsISupports -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_CID(kCMailDB, NS_MAILDB_CID); // this is totally lame and MUST be removed by M6 diff --git a/mailnews/local/src/nsParseMailbox.cpp b/mailnews/local/src/nsParseMailbox.cpp index 451a5212895e..dccd00cdfa18 100644 --- a/mailnews/local/src/nsParseMailbox.cpp +++ b/mailnews/local/src/nsParseMailbox.cpp @@ -75,7 +75,6 @@ #include "nsMsgSearchCore.h" static NS_DEFINE_CID(kCMailDB, NS_MAILDB_CID); -static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); diff --git a/mailnews/local/src/nsPop3Protocol.cpp b/mailnews/local/src/nsPop3Protocol.cpp index 5f1caec8d93a..b15bdfd77c1f 100644 --- a/mailnews/local/src/nsPop3Protocol.cpp +++ b/mailnews/local/src/nsPop3Protocol.cpp @@ -64,8 +64,6 @@ static PRLogModuleInfo *POP3LOGMODULE = nsnull; -static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); - /* km * * diff --git a/mailnews/mime/src/mimedrft.cpp b/mailnews/mime/src/mimedrft.cpp index 36e9da3eaa8d..9dd0786bcf79 100644 --- a/mailnews/mime/src/mimedrft.cpp +++ b/mailnews/mime/src/mimedrft.cpp @@ -93,7 +93,6 @@ static NS_DEFINE_CID(kCMsgComposeServiceCID, NS_MSGCOMPOSESERVICE_CID); //////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////// // Define CIDs... -static NS_DEFINE_CID(kMsgCompFieldsCID, NS_MSGCOMPFIELDS_CID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); // safe filename for all OSes diff --git a/mailnews/mime/src/mimei.cpp b/mailnews/mime/src/mimei.cpp index 991e08a31977..7ca060cbb848 100644 --- a/mailnews/mime/src/mimei.cpp +++ b/mailnews/mime/src/mimei.cpp @@ -96,8 +96,6 @@ void getMsgHdrForCurrentURL(MimeDisplayOptions *opts, nsIMsgDBHdr ** aMsgHdr); #define IMAP_EXTERNAL_CONTENT_HEADER "X-Mozilla-IMAP-Part" -static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); - /* ========================================================================== Allocation and destruction ========================================================================== diff --git a/mailnews/mime/src/mimemalt.cpp b/mailnews/mime/src/mimemalt.cpp index 11032d2ffd9f..a3c2a3a59cb0 100644 --- a/mailnews/mime/src/mimemalt.cpp +++ b/mailnews/mime/src/mimemalt.cpp @@ -46,8 +46,6 @@ #include "mimemoz2.h" // for prefs #include "nsCRT.h" -static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); - extern "C" MimeObjectClass mimeMultipartRelatedClass; #define MIME_SUPERCLASS mimeMultipartClass diff --git a/mailnews/mime/src/mimetpfl.cpp b/mailnews/mime/src/mimetpfl.cpp index 9d8db692a05d..a1b74f0a3f52 100644 --- a/mailnews/mime/src/mimetpfl.cpp +++ b/mailnews/mime/src/mimetpfl.cpp @@ -50,8 +50,6 @@ #include "prprf.h" #include "nsMsgI18N.h" -static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); - static const PRUint32 kSpacesForATab = 4; // Must be at least 1. static const PRUint32 kInitialBufferSize = 100; diff --git a/mailnews/mime/src/mimetpla.cpp b/mailnews/mime/src/mimetpla.cpp index 588fcb55a031..98f87209a7ec 100644 --- a/mailnews/mime/src/mimetpla.cpp +++ b/mailnews/mime/src/mimetpla.cpp @@ -53,8 +53,6 @@ #include "prprf.h" #include "nsMsgI18N.h" -static NS_DEFINE_CID(kCPrefServiceCID, NS_PREF_CID); - #define MIME_SUPERCLASS mimeInlineTextClass MimeDefClass(MimeInlineTextPlain, MimeInlineTextPlainClass, mimeInlineTextPlainClass, &MIME_SUPERCLASS); diff --git a/mailnews/news/src/nsNNTPNewsgroupList.cpp b/mailnews/news/src/nsNNTPNewsgroupList.cpp index ffe0ff424d81..b17a215d53c2 100644 --- a/mailnews/news/src/nsNNTPNewsgroupList.cpp +++ b/mailnews/news/src/nsNNTPNewsgroupList.cpp @@ -95,7 +95,6 @@ // update status on header download once per second #define MIN_STATUS_UPDATE_INTERVAL PR_USEC_PER_SEC -static NS_DEFINE_CID(kCNewsDB, NS_NEWSDB_CID); nsNNTPNewsgroupList::nsNNTPNewsgroupList() : m_finishingXover(PR_FALSE), diff --git a/mailnews/news/src/nsNewsDownloader.cpp b/mailnews/news/src/nsNewsDownloader.cpp index 58a639f14a7d..4bfb8dcdce85 100644 --- a/mailnews/news/src/nsNewsDownloader.cpp +++ b/mailnews/news/src/nsNewsDownloader.cpp @@ -345,7 +345,6 @@ DownloadMatchingNewsArticlesToNewsDB::~DownloadMatchingNewsArticlesToNewsDB() { } -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); NS_IMPL_ISUPPORTS1(nsMsgDownloadAllNewsgroups, nsIUrlListener) diff --git a/mailnews/news/src/nsNewsFolder.cpp b/mailnews/news/src/nsNewsFolder.cpp index f93eba940272..be9289386f22 100644 --- a/mailnews/news/src/nsNewsFolder.cpp +++ b/mailnews/news/src/nsNewsFolder.cpp @@ -98,7 +98,6 @@ // we need this because of an egcs 1.0 (and possibly gcc) compiler bug // that doesn't allow you to call ::nsISupports::GetIID() inside of a class // that multiply inherits from nsISupports -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); static NS_DEFINE_CID(kCNewsDB, NS_NEWSDB_CID); diff --git a/mailnews/news/src/nsNntpService.cpp b/mailnews/news/src/nsNntpService.cpp index 1f45b98c18f7..d42a7c599431 100644 --- a/mailnews/news/src/nsNntpService.cpp +++ b/mailnews/news/src/nsNntpService.cpp @@ -91,7 +91,6 @@ #define PREF_NETWORK_HOSTS_NNTP_SERVER "network.hosts.nntp_server" #define PREF_MAIL_ROOT_NNTP "mail.root.nntp" -static NS_DEFINE_CID(kCNewsDB, NS_NEWSDB_CID); static NS_DEFINE_CID(kMessengerMigratorCID, NS_MESSENGERMIGRATOR_CID); static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID); diff --git a/mailnews/news/src/nsNntpUrl.cpp b/mailnews/news/src/nsNntpUrl.cpp index 7c54271973ad..899c9775bf5c 100644 --- a/mailnews/news/src/nsNntpUrl.cpp +++ b/mailnews/news/src/nsNntpUrl.cpp @@ -65,7 +65,6 @@ #include "nsINntpService.h" #include "nsIMsgMessageService.h" -static NS_DEFINE_CID(kCNewsDB, NS_NEWSDB_CID); nsNntpUrl::nsNntpUrl() { diff --git a/modules/libjar/nsJARChannel.cpp b/modules/libjar/nsJARChannel.cpp index 4f0a55735d89..5b6cc816ed18 100644 --- a/modules/libjar/nsJARChannel.cpp +++ b/modules/libjar/nsJARChannel.cpp @@ -28,7 +28,6 @@ #include "nsIJAR.h" static NS_DEFINE_CID(kScriptSecurityManagerCID, NS_SCRIPTSECURITYMANAGER_CID); -static NS_DEFINE_CID(kInputStreamChannelCID, NS_INPUTSTREAMCHANNEL_CID); static NS_DEFINE_CID(kZipReaderCID, NS_ZIPREADER_CID); //----------------------------------------------------------------------------- diff --git a/modules/oji/src/jvmmgr.cpp b/modules/oji/src/jvmmgr.cpp index 99d9652995c9..de1b5a4aea85 100644 --- a/modules/oji/src/jvmmgr.cpp +++ b/modules/oji/src/jvmmgr.cpp @@ -45,11 +45,9 @@ #include "nsISecurityContext.h" static NS_DEFINE_CID(kJVMManagerCID, NS_JVMMANAGER_CID); -static NS_DEFINE_IID(kIJVMManagerIID, NS_IJVMMANAGER_IID); static NS_DEFINE_IID(kIJVMConsoleIID, NS_IJVMCONSOLE_IID); static NS_DEFINE_IID(kIJVMPrefsWindowIID, NS_IJVMPREFSWINDOW_IID); static NS_DEFINE_IID(kISymantecDebuggerIID, NS_ISYMANTECDEBUGGER_IID); -static NS_DEFINE_IID(kISecurityContextIID, NS_ISECURITYCONTEXT_IID); PR_BEGIN_EXTERN_C diff --git a/modules/oji/src/nsJVMManager.cpp b/modules/oji/src/nsJVMManager.cpp index daa79b73571c..3412fec23932 100644 --- a/modules/oji/src/nsJVMManager.cpp +++ b/modules/oji/src/nsJVMManager.cpp @@ -90,11 +90,8 @@ static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); static NS_DEFINE_CID(kJVMManagerCID, NS_JVMMANAGER_CID); static NS_DEFINE_CID(kPluginManagerCID, NS_PLUGINMANAGER_CID); -static NS_DEFINE_IID(kPluginHostIID, NS_IPLUGINHOST_IID); -static NS_DEFINE_IID(kPluginManagerIID, NS_IPLUGINMANAGER_IID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); // FIXME -- need prototypes for these functions!!! XXX #ifdef XP_MAC @@ -110,9 +107,6 @@ static NS_DEFINE_IID(kIJVMManagerIID, NS_IJVMMANAGER_IID); static NS_DEFINE_IID(kIThreadManagerIID, NS_ITHREADMANAGER_IID); static NS_DEFINE_IID(kILiveConnectManagerIID, NS_ILIVECONNECTMANAGER_IID); static NS_DEFINE_IID(kIJVMPluginIID, NS_IJVMPLUGIN_IID); -static NS_DEFINE_IID(kIPluginIID, NS_IPLUGIN_IID); -static NS_DEFINE_IID(kISymantecDebugManagerIID, NS_ISYMANTECDEBUGMANAGER_IID); -static NS_DEFINE_IID(kIPluginManagerIID, NS_IPLUGINMANAGER_IID); #define PLUGIN_REGIONAL_URL "chrome://global-region/locale/region.properties" diff --git a/modules/plugin/base/src/ns4xPlugin.cpp b/modules/plugin/base/src/ns4xPlugin.cpp index 3172ca3696c3..1ab16427020a 100644 --- a/modules/plugin/base/src/ns4xPlugin.cpp +++ b/modules/plugin/base/src/ns4xPlugin.cpp @@ -87,11 +87,6 @@ enum eNPPStreamTypeInternal { //////////////////////////////////////////////////////////////////////// // CID's && IID's static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); -static NS_DEFINE_IID(kCPluginManagerCID, NS_PLUGINMANAGER_CID); -static NS_DEFINE_IID(kIPluginIID, NS_IPLUGIN_IID); -static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIWindowlessPluginInstancePeerIID, NS_IWINDOWLESSPLUGININSTANCEPEER_IID); static NS_DEFINE_IID(kPluginManagerCID, NS_PLUGINMANAGER_CID); static NS_DEFINE_IID(kIPluginManagerIID, NS_IPLUGINMANAGER_IID); static NS_DEFINE_IID(kMemoryCID, NS_MEMORY_CID); diff --git a/modules/plugin/base/src/ns4xPluginInstance.cpp b/modules/plugin/base/src/ns4xPluginInstance.cpp index fce236ede6f6..bbd04de13c02 100644 --- a/modules/plugin/base/src/ns4xPluginInstance.cpp +++ b/modules/plugin/base/src/ns4xPluginInstance.cpp @@ -69,12 +69,7 @@ //////////////////////////////////////////////////////////////////////// // CID's && IID's -static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); // needed for NS_TRY_SAFE_CALL_* -static NS_DEFINE_IID(kCPluginManagerCID, NS_PLUGINMANAGER_CID); static NS_DEFINE_IID(kIPluginStreamListenerIID, NS_IPLUGINSTREAMLISTENER_IID); -static NS_DEFINE_IID(kIPluginInstanceIID, NS_IPLUGININSTANCE_IID); -static NS_DEFINE_IID(kIPluginTagInfoIID, NS_IPLUGINTAGINFO_IID); -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); /////////////////////////////////////////////////////////////////////////////// // ns4xPluginStreamListener Methods diff --git a/modules/plugin/base/src/nsPluginHostImpl.cpp b/modules/plugin/base/src/nsPluginHostImpl.cpp index acfebeb03150..92be398f881b 100644 --- a/modules/plugin/base/src/nsPluginHostImpl.cpp +++ b/modules/plugin/base/src/nsPluginHostImpl.cpp @@ -201,19 +201,14 @@ static NS_DEFINE_IID(kIPluginTagInfo2IID, NS_IPLUGINTAGINFO2_IID); static NS_DEFINE_CID(kProtocolProxyServiceCID, NS_PROTOCOLPROXYSERVICE_CID); static NS_DEFINE_CID(kCookieServiceCID, NS_COOKIESERVICE_CID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIRequestObserverIID, NS_IREQUESTOBSERVER_IID); static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kHttpHandlerCID, NS_HTTPPROTOCOLHANDLER_CID); -static NS_DEFINE_CID(kIHttpHeaderVisitorIID, NS_IHTTPHEADERVISITOR_IID); static NS_DEFINE_CID(kStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID); -static NS_DEFINE_IID(kIFileUtilitiesIID, NS_IFILEUTILITIES_IID); -static NS_DEFINE_IID(kIOutputStreamIID, NS_IOUTPUTSTREAM_IID); static const char kDirectoryServiceContractID[] = "@mozilla.org/file/directory_service;1"; // for the dialog static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_IID(kCPluginManagerCID, NS_PLUGINMANAGER_CID); //////////////////////////////////////////////////////////////////////// // Registry keys for caching plugin info diff --git a/modules/plugin/base/src/nsPluginNativeWindowOS2.cpp b/modules/plugin/base/src/nsPluginNativeWindowOS2.cpp index 7eabb2818640..4687122a1393 100644 --- a/modules/plugin/base/src/nsPluginNativeWindowOS2.cpp +++ b/modules/plugin/base/src/nsPluginNativeWindowOS2.cpp @@ -50,7 +50,6 @@ #include "nsPluginNativeWindow.h" static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_CID(kCPluginManagerCID, NS_PLUGINMANAGER_CID); // needed for NS_TRY_SAFE_CALL #define NS_PLUGIN_WINDOW_PROPERTY_ASSOCIATION "MozillaPluginWindowPropertyAssociation" diff --git a/modules/plugin/base/src/nsPluginNativeWindowWin.cpp b/modules/plugin/base/src/nsPluginNativeWindowWin.cpp index 87777ff567a0..b05d5b92319c 100644 --- a/modules/plugin/base/src/nsPluginNativeWindowWin.cpp +++ b/modules/plugin/base/src/nsPluginNativeWindowWin.cpp @@ -51,7 +51,6 @@ #include "nsPluginNativeWindow.h" static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_CID(kCPluginManagerCID, NS_PLUGINMANAGER_CID); // needed for NS_TRY_SAFE_CALL #define NS_PLUGIN_WINDOW_PROPERTY_ASSOCIATION "MozillaPluginWindowPropertyAssociation" diff --git a/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp b/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp index 63e1182451cf..5cbbb8c1f375 100644 --- a/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp +++ b/modules/plugin/samples/SanePlugin/nsSanePlugin.cpp @@ -72,10 +72,6 @@ static unsigned char * scale_image(unsigned char *rgb_data, int rgb_width, static PRInt32 gPluginObjectCount = 0; -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID ); -static NS_DEFINE_IID(kIPluginInstanceIID, NS_IPLUGININSTANCE_IID ); -static NS_DEFINE_IID(knsSanePluginControlIID, NS_ISANEPLUGININSTANCE_IID ); -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID ); static NS_DEFINE_IID(kIPluginManagerIID, NS_IPLUGINMANAGER_IID ); static NS_DEFINE_CID(kCPluginManagerCID, NS_PLUGINMANAGER_CID ); static NS_DEFINE_CID(kEventQueueService, NS_EVENTQUEUESERVICE_CID ); diff --git a/netwerk/base/src/nsIOService.cpp b/netwerk/base/src/nsIOService.cpp index a7306cb91525..1288aae6eeeb 100644 --- a/netwerk/base/src/nsIOService.cpp +++ b/netwerk/base/src/nsIOService.cpp @@ -76,7 +76,6 @@ static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID); static NS_DEFINE_CID(kDNSServiceCID, NS_DNSSERVICE_CID); static NS_DEFINE_CID(kErrorServiceCID, NS_ERRORSERVICE_CID); static NS_DEFINE_CID(kProtocolProxyServiceCID, NS_PROTOCOLPROXYSERVICE_CID); -static NS_DEFINE_CID(kStdURLParserCID, NS_STDURLPARSER_CID); // A general port blacklist. Connections to these ports will not be avoided unless // the protocol overrides. diff --git a/netwerk/base/src/nsInputStreamChannel.cpp b/netwerk/base/src/nsInputStreamChannel.cpp index 20ae6ca1322a..ea743e705419 100644 --- a/netwerk/base/src/nsInputStreamChannel.cpp +++ b/netwerk/base/src/nsInputStreamChannel.cpp @@ -45,8 +45,6 @@ #include "nsCOMPtr.h" #include "prlog.h" -static NS_DEFINE_CID(kStreamTransportServiceCID, NS_STREAMTRANSPORTSERVICE_CID); -static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); #if defined(PR_LOGGING) // diff --git a/netwerk/base/tests/urltest.cpp b/netwerk/base/tests/urltest.cpp index c77192ce6bec..2be7ada0587f 100644 --- a/netwerk/base/tests/urltest.cpp +++ b/netwerk/base/tests/urltest.cpp @@ -72,7 +72,6 @@ #endif #endif -static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID); #ifdef XP_UNIX extern "C" char *fe_GetConfigDir(void) { diff --git a/netwerk/protocol/file/src/nsFileProtocolHandler.cpp b/netwerk/protocol/file/src/nsFileProtocolHandler.cpp index fdd4c2ed80af..7cfa541f895e 100644 --- a/netwerk/protocol/file/src/nsFileProtocolHandler.cpp +++ b/netwerk/protocol/file/src/nsFileProtocolHandler.cpp @@ -47,8 +47,6 @@ #include "nsIServiceManager.h" #include "nsIDirectoryListing.h" -static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID); - //----------------------------------------------------------------------------- nsFileProtocolHandler::nsFileProtocolHandler() diff --git a/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp b/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp index 456fe809f564..783574d19e2c 100644 --- a/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp +++ b/netwerk/protocol/ftp/src/nsFtpProtocolHandler.cpp @@ -72,7 +72,6 @@ PRLogModuleInfo* gFTPLog = nsnull; #define IDLE_TIMEOUT_PREF "network.ftp.idleConnectionTimeout" #define IDLE_CONNECTION_LIMIT 8 /* XXX pref me */ -static NS_DEFINE_IID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID); static NS_DEFINE_CID(kErrorServiceCID, NS_ERRORSERVICE_CID); static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID); diff --git a/netwerk/protocol/gopher/src/nsGopherHandler.cpp b/netwerk/protocol/gopher/src/nsGopherHandler.cpp index 7d889045968d..7fe04a33532f 100644 --- a/netwerk/protocol/gopher/src/nsGopherHandler.cpp +++ b/netwerk/protocol/gopher/src/nsGopherHandler.cpp @@ -43,7 +43,6 @@ PRLogModuleInfo* gGopherLog = nsnull; #endif static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID); -//static NS_DEFINE_CID(kHTTPHandlerCID, NS_IHTTPHANDLER_CID); //////////////////////////////////////////////////////////////////////////////// diff --git a/netwerk/protocol/http/src/nsHttpHandler.cpp b/netwerk/protocol/http/src/nsHttpHandler.cpp index cb5760be1817..31c8e03f501b 100644 --- a/netwerk/protocol/http/src/nsHttpHandler.cpp +++ b/netwerk/protocol/http/src/nsHttpHandler.cpp @@ -75,7 +75,6 @@ extern PRThread *gSocketThread; #endif static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); -static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID); static NS_DEFINE_CID(kNetModuleMgrCID, NS_NETMODULEMGR_CID); static NS_DEFINE_CID(kStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID); static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID); diff --git a/netwerk/protocol/jar/src/nsJARChannel.cpp b/netwerk/protocol/jar/src/nsJARChannel.cpp index 4f0a55735d89..5b6cc816ed18 100644 --- a/netwerk/protocol/jar/src/nsJARChannel.cpp +++ b/netwerk/protocol/jar/src/nsJARChannel.cpp @@ -28,7 +28,6 @@ #include "nsIJAR.h" static NS_DEFINE_CID(kScriptSecurityManagerCID, NS_SCRIPTSECURITYMANAGER_CID); -static NS_DEFINE_CID(kInputStreamChannelCID, NS_INPUTSTREAMCHANNEL_CID); static NS_DEFINE_CID(kZipReaderCID, NS_ZIPREADER_CID); //----------------------------------------------------------------------------- diff --git a/netwerk/streamconv/converters/mozTXTToHTMLConv.h b/netwerk/streamconv/converters/mozTXTToHTMLConv.h index 9370f9f72af2..e07b7a116eb2 100644 --- a/netwerk/streamconv/converters/mozTXTToHTMLConv.h +++ b/netwerk/streamconv/converters/mozTXTToHTMLConv.h @@ -46,7 +46,6 @@ #include "nsTimer.h" #include "nsCOMPtr.h" -static NS_DEFINE_CID(kTXTToHTMLConvCID, MOZITXTTOHTMLCONV_CID); class mozTXTToHTMLConv : public mozITXTToHTMLConv { diff --git a/netwerk/streamconv/converters/nsBinHexDecoder.cpp b/netwerk/streamconv/converters/nsBinHexDecoder.cpp index 9c62a56a935f..9a6d4a521871 100644 --- a/netwerk/streamconv/converters/nsBinHexDecoder.cpp +++ b/netwerk/streamconv/converters/nsBinHexDecoder.cpp @@ -51,7 +51,6 @@ #include "nsIMIMEService.h" #include "nsMimeTypes.h" -static NS_DEFINE_CID(kStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID); #define DATA_BUFFER_SIZE (4096*2) diff --git a/netwerk/streamconv/converters/nsFTPDirListingConv.h b/netwerk/streamconv/converters/nsFTPDirListingConv.h index 2d93a06ffe62..59646e75d218 100644 --- a/netwerk/streamconv/converters/nsFTPDirListingConv.h +++ b/netwerk/streamconv/converters/nsFTPDirListingConv.h @@ -51,7 +51,6 @@ 0x11d3, \ {0xa1, 0x78, 0x00, 0x50, 0x04, 0x1c, 0xaf, 0x44} \ } -static NS_DEFINE_CID(kFTPDirListingConverterCID, NS_FTPDIRLISTINGCONVERTER_CID); class nsFTPDirListingConv : public nsIStreamConverter { public: diff --git a/netwerk/streamconv/converters/nsGopherDirListingConv.h b/netwerk/streamconv/converters/nsGopherDirListingConv.h index 624d650e310a..afe42c457219 100644 --- a/netwerk/streamconv/converters/nsGopherDirListingConv.h +++ b/netwerk/streamconv/converters/nsGopherDirListingConv.h @@ -43,8 +43,6 @@ 0x4efd, \ { 0xa2, 0xc4, 0xfc, 0x39, 0xbf, 0xab, 0x80, 0x9d} \ } -static NS_DEFINE_CID(kGopherDirListingConverterCID, - NS_GOPHERDIRLISTINGCONVERTER_CID); #define GOPHER_PORT 70 diff --git a/netwerk/streamconv/converters/nsHTTPCompressConv.h b/netwerk/streamconv/converters/nsHTTPCompressConv.h index 8b0fb2c9b84e..6b9cc6455b1d 100644 --- a/netwerk/streamconv/converters/nsHTTPCompressConv.h +++ b/netwerk/streamconv/converters/nsHTTPCompressConv.h @@ -54,7 +54,6 @@ {0xab, 0xf4, 0x07, 0x98, 0x61, 0x51, 0x02, 0x2d}\ } -static NS_DEFINE_CID(kHTTPCompressConverterCID, NS_HTTPCOMPRESSCONVERTER_CID); #define HTTP_DEFLATE_TYPE "deflate" #define HTTP_GZIP_TYPE "gzip" diff --git a/netwerk/streamconv/converters/nsMultiMixedConv.h b/netwerk/streamconv/converters/nsMultiMixedConv.h index 3d9ae14a262f..1ce5c94a8f68 100644 --- a/netwerk/streamconv/converters/nsMultiMixedConv.h +++ b/netwerk/streamconv/converters/nsMultiMixedConv.h @@ -52,7 +52,6 @@ 0x11d3, \ {0xa1, 0x75, 0x0, 0x50, 0x4, 0x1c, 0xaf, 0x44} \ } -static NS_DEFINE_CID(kMultiMixedConverterCID, NS_MULTIMIXEDCONVERTER_CID); // The nsMultiMixedConv stream converter converts a stream of type "multipart/x-mixed-replace" // to it's subparts. There was some debate as to whether or not the functionality desired diff --git a/netwerk/streamconv/src/nsStreamConvServiceFactory.cpp b/netwerk/streamconv/src/nsStreamConvServiceFactory.cpp index 44b6f38bb624..a64459569670 100644 --- a/netwerk/streamconv/src/nsStreamConvServiceFactory.cpp +++ b/netwerk/streamconv/src/nsStreamConvServiceFactory.cpp @@ -41,7 +41,6 @@ #include "nsIStreamConverterService.h" #include "nsStreamConverterService.h" -static NS_DEFINE_CID(kStreamConvServiceCID, NS_STREAMCONVERTERSERVICE_CID); nsresult NS_NewStreamConv(nsStreamConverterService** aStreamConv); diff --git a/netwerk/streamconv/test/TestStreamConv.cpp b/netwerk/streamconv/test/TestStreamConv.cpp index 4528c6be2005..038c994ddee4 100644 --- a/netwerk/streamconv/test/TestStreamConv.cpp +++ b/netwerk/streamconv/test/TestStreamConv.cpp @@ -76,7 +76,6 @@ static nsIEventQueue* gEventQ = nsnull; // CID setup static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_CID(kStreamConverterServiceCID, NS_STREAMCONVERTERSERVICE_CID); -static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); //////////////////////////////////////////////////////////////////////// // EndListener - This listener is the final one in the chain. It diff --git a/netwerk/test/PropertiesTest.cpp b/netwerk/test/PropertiesTest.cpp index 26dca4b492d3..3d222e95bf57 100644 --- a/netwerk/test/PropertiesTest.cpp +++ b/netwerk/test/PropertiesTest.cpp @@ -56,7 +56,6 @@ static NS_DEFINE_CID(kPersistentPropertiesCID, NS_IPERSISTENTPROPERTIES_CID); static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); -static NS_DEFINE_CID(kEventQueueCID, NS_EVENTQUEUE_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); /***************************************************************************/ diff --git a/netwerk/test/TestCacheService.cpp b/netwerk/test/TestCacheService.cpp index f28cdb1e2fdb..0f686a1d308e 100644 --- a/netwerk/test/TestCacheService.cpp +++ b/netwerk/test/TestCacheService.cpp @@ -40,7 +40,6 @@ static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_CID(kDNSServiceCID, NS_DNSSERVICE_CID); static NS_DEFINE_CID(kCacheServiceCID, NS_CACHESERVICE_CID); nsCOMPtr gEventQ; diff --git a/netwerk/test/TestFileTransport.cpp b/netwerk/test/TestFileTransport.cpp index 2cedeed58780..3c3947e8af33 100644 --- a/netwerk/test/TestFileTransport.cpp +++ b/netwerk/test/TestFileTransport.cpp @@ -71,7 +71,6 @@ static PRLogModuleInfo *gTestFileTransportLog = nsnull; static NS_DEFINE_CID(kFileTransportServiceCID, NS_FILETRANSPORTSERVICE_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_CID(kEventQueueCID, NS_EVENTQUEUE_CID); PRBool gDone = PR_FALSE; nsIEventQueue* gEventQ = nsnull; diff --git a/netwerk/test/TestMCTransport.cpp b/netwerk/test/TestMCTransport.cpp index 779ae804f2b9..c8bd4c5825e6 100644 --- a/netwerk/test/TestMCTransport.cpp +++ b/netwerk/test/TestMCTransport.cpp @@ -69,7 +69,6 @@ static nsICacheEntryDescriptor *desc = nsnull; */ static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_IID(kEventQueueCID, NS_EVENTQUEUE_CID); static nsIEventQueue *gEventQ = nsnull; class TestListener : public nsIStreamListener diff --git a/netwerk/test/TestOverlappedIO.cpp b/netwerk/test/TestOverlappedIO.cpp index 12c7ef8df132..be89089983e8 100644 --- a/netwerk/test/TestOverlappedIO.cpp +++ b/netwerk/test/TestOverlappedIO.cpp @@ -69,7 +69,6 @@ static PRLogModuleInfo *gTestSocketIOLog; static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_IID(kEventQueueCID, NS_EVENTQUEUE_CID); static PRTime gElapsedTime; static int gKeepRunning = 1; diff --git a/netwerk/test/TestSocketIO.cpp b/netwerk/test/TestSocketIO.cpp index 9d6bbcd28adc..90c6c5eb140e 100644 --- a/netwerk/test/TestSocketIO.cpp +++ b/netwerk/test/TestSocketIO.cpp @@ -69,7 +69,6 @@ static PRLogModuleInfo *gTestSocketIOLog; static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_IID(kEventQueueCID, NS_EVENTQUEUE_CID); static PRTime gElapsedTime; static int gKeepRunning = 1; diff --git a/netwerk/test/TestSocketTransport.cpp b/netwerk/test/TestSocketTransport.cpp index cb217b559333..ec83145b7249 100644 --- a/netwerk/test/TestSocketTransport.cpp +++ b/netwerk/test/TestSocketTransport.cpp @@ -73,7 +73,6 @@ static PRLogModuleInfo *gTestLog = nsnull; static NS_DEFINE_CID(kSocketTransportServiceCID, NS_SOCKETTRANSPORTSERVICE_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_CID(kEventQueueCID, NS_EVENTQUEUE_CID); PRBool gDone = PR_FALSE; nsIEventQueue* gEventQ = nsnull; diff --git a/netwerk/test/TestStreamChannel.cpp b/netwerk/test/TestStreamChannel.cpp index b340e0b3e9f2..475dc9aa11c7 100644 --- a/netwerk/test/TestStreamChannel.cpp +++ b/netwerk/test/TestStreamChannel.cpp @@ -73,7 +73,6 @@ static PRLogModuleInfo *gTestLog = nsnull; static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_CID(kEventQueueCID, NS_EVENTQUEUE_CID); PRBool gDone = PR_FALSE; nsIEventQueue *gEventQ = nsnull; diff --git a/netwerk/test/TestStreamPump.cpp b/netwerk/test/TestStreamPump.cpp index 556803dd14df..1dd818a5f0ff 100644 --- a/netwerk/test/TestStreamPump.cpp +++ b/netwerk/test/TestStreamPump.cpp @@ -72,9 +72,7 @@ static PRLogModuleInfo *gTestLog = nsnull; //////////////////////////////////////////////////////////////////////////////// -static NS_DEFINE_CID(kSimpleURICID, NS_SIMPLEURI_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_CID(kEventQueueCID, NS_EVENTQUEUE_CID); PRBool gDone = PR_FALSE; nsIEventQueue *gEventQ = nsnull; diff --git a/netwerk/test/TestStreamTransport.cpp b/netwerk/test/TestStreamTransport.cpp index d97c23e3a4b5..189cb9cce1fd 100644 --- a/netwerk/test/TestStreamTransport.cpp +++ b/netwerk/test/TestStreamTransport.cpp @@ -72,7 +72,6 @@ static PRLogModuleInfo *gTestLog = nsnull; static NS_DEFINE_CID(kStreamTransportServiceCID, NS_STREAMTRANSPORTSERVICE_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_CID(kEventQueueCID, NS_EVENTQUEUE_CID); PRBool gDone = PR_FALSE; nsIEventQueue* gEventQ = nsnull; diff --git a/parser/htmlparser/src/CNavDTD.cpp b/parser/htmlparser/src/CNavDTD.cpp index 25ac56ca9a80..151bb5011977 100644 --- a/parser/htmlparser/src/CNavDTD.cpp +++ b/parser/htmlparser/src/CNavDTD.cpp @@ -74,7 +74,6 @@ #endif -static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIDTDIID, NS_IDTD_IID); static NS_DEFINE_IID(kClassIID, NS_INAVHTML_DTD_IID); diff --git a/parser/htmlparser/src/COtherDTD.cpp b/parser/htmlparser/src/COtherDTD.cpp index 02df54aa77fe..5a36beb7078c 100644 --- a/parser/htmlparser/src/COtherDTD.cpp +++ b/parser/htmlparser/src/COtherDTD.cpp @@ -68,7 +68,6 @@ static NS_DEFINE_IID(kIHTMLContentSinkIID, NS_IHTML_CONTENT_SINK_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIDTDIID, NS_IDTD_IID); static NS_DEFINE_IID(kClassIID, NS_IOTHERHTML_DTD_IID); - static NS_DEFINE_IID(kParserServiceCID, NS_PARSERSERVICE_CID); static const char kVerificationDir[] = "c:/temp"; diff --git a/parser/htmlparser/src/nsParser.cpp b/parser/htmlparser/src/nsParser.cpp index 793f9b78ac7c..2fe9163b8497 100644 --- a/parser/htmlparser/src/nsParser.cpp +++ b/parser/htmlparser/src/nsParser.cpp @@ -79,9 +79,6 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_CID(kCParserCID, NS_PARSER_CID); static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID); -static NS_DEFINE_IID(kExpatDriverCID, NS_EXPAT_DRIVER_CID); -static NS_DEFINE_CID(kNavDTDCID, NS_CNAVDTD_CID); -static NS_DEFINE_CID(kViewSourceDTDCID, NS_VIEWSOURCE_DTD_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); //------------------------------------------------------------------- diff --git a/parser/htmlparser/src/nsParserNode.cpp b/parser/htmlparser/src/nsParserNode.cpp index ec8040d3b90f..611bc0596ebb 100644 --- a/parser/htmlparser/src/nsParserNode.cpp +++ b/parser/htmlparser/src/nsParserNode.cpp @@ -44,9 +44,6 @@ #include "nsITokenizer.h" #include "nsDTDUtils.h" -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kClassIID, NS_PARSER_NODE_IID); -static NS_DEFINE_IID(kIParserNodeIID, NS_IPARSER_NODE_IID); static const nsString& GetEmptyString() { diff --git a/parser/htmlparser/tests/logparse/logparse.cpp b/parser/htmlparser/tests/logparse/logparse.cpp index 576fd3bc09cc..5ff0ead5961e 100644 --- a/parser/htmlparser/tests/logparse/logparse.cpp +++ b/parser/htmlparser/tests/logparse/logparse.cpp @@ -54,8 +54,6 @@ static NS_DEFINE_IID(kLoggingSinkCID, NS_LOGGING_SINK_CID); static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); // Interface IID's -static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID); -static NS_DEFINE_IID(kILoggingSinkIID, NS_ILOGGING_SINK_IID); //---------------------------------------------------------------------- diff --git a/profile/pref-migrator/src/nsPrefMigration.cpp b/profile/pref-migrator/src/nsPrefMigration.cpp index 72a836f94d32..129ebb17a08b 100644 --- a/profile/pref-migrator/src/nsPrefMigration.cpp +++ b/profile/pref-migrator/src/nsPrefMigration.cpp @@ -242,11 +242,7 @@ typedef struct /*----------------------------------------------------------------- * Globals *-----------------------------------------------------------------*/ -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); static NS_DEFINE_IID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); -static NS_DEFINE_IID(kIPrefMigrationIID, NS_IPREFMIGRATION_IID); -static NS_DEFINE_IID(kPrefMigrationCID, NS_PREFMIGRATION_CID); static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); diff --git a/profile/src/nsProfile.cpp b/profile/src/nsProfile.cpp index 8567a7d7d31c..ca92646586dd 100644 --- a/profile/src/nsProfile.cpp +++ b/profile/src/nsProfile.cpp @@ -153,17 +153,9 @@ static nsHashtable *gLocaleProfiles = nsnull; static nsProfileDirServiceProvider *gDirServiceProvider = nsnull; // IID and CIDs of all the services needed -static NS_DEFINE_CID(kIProfileIID, NS_IPROFILE_IID); -static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); -static NS_DEFINE_CID(kRegistryCID, NS_REGISTRY_CID); -static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); -static NS_DEFINE_IID(kIIOServiceIID, NS_IIOSERVICE_IID); -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kPrefMigrationCID, NS_PREFMIGRATION_CID); static NS_DEFINE_CID(kPrefConverterCID, NS_PREFCONVERTER_CID); -static NS_DEFINE_IID(kCookieServiceCID, NS_COOKIESERVICE_CID); -static NS_DEFINE_CID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); /* diff --git a/profile/src/nsProfileAccess.cpp b/profile/src/nsProfileAccess.cpp index 6ee2709dd1af..1b0b296d2d3a 100644 --- a/profile/src/nsProfileAccess.cpp +++ b/profile/src/nsProfileAccess.cpp @@ -76,7 +76,6 @@ #endif // IID and CIDs of all the services needed -static NS_DEFINE_CID(kRegistryCID, NS_REGISTRY_CID); static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); // Registry Keys diff --git a/rdf/base/src/nsContainerEnumerator.cpp b/rdf/base/src/nsContainerEnumerator.cpp index bc047a4e3aed..52f57d2e8ecf 100644 --- a/rdf/base/src/nsContainerEnumerator.cpp +++ b/rdf/base/src/nsContainerEnumerator.cpp @@ -69,7 +69,6 @@ //////////////////////////////////////////////////////////////////////// -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID); diff --git a/rdf/base/src/nsInMemoryDataSource.cpp b/rdf/base/src/nsInMemoryDataSource.cpp index bd15879f80fe..5a9586315713 100644 --- a/rdf/base/src/nsInMemoryDataSource.cpp +++ b/rdf/base/src/nsInMemoryDataSource.cpp @@ -84,7 +84,6 @@ #include "prlog.h" #include "rdf.h" -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); #if defined(MOZ_THREADSAFE_RDF) #define NS_AUTOLOCK(_lock) nsAutoLock _autolock(_lock) diff --git a/rdf/base/src/nsRDFContentSink.cpp b/rdf/base/src/nsRDFContentSink.cpp index 26f76e7a6c23..7cbc4668e775 100644 --- a/rdf/base/src/nsRDFContentSink.cpp +++ b/rdf/base/src/nsRDFContentSink.cpp @@ -108,7 +108,6 @@ static const char kNCNameSpaceURI[] = NC_NAMESPACE_URI; static NS_DEFINE_IID(kIContentSinkIID, NS_ICONTENT_SINK_IID); // XXX grr... static NS_DEFINE_IID(kIExpatSinkIID, NS_IEXPATSINK_IID); -static NS_DEFINE_IID(kIRDFDataSourceIID, NS_IRDFDATASOURCE_IID); static NS_DEFINE_IID(kIRDFServiceIID, NS_IRDFSERVICE_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIXMLContentSinkIID, NS_IXMLCONTENT_SINK_IID); @@ -116,7 +115,6 @@ static NS_DEFINE_IID(kIRDFContentSinkIID, NS_IRDFCONTENTSINK_IID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); static NS_DEFINE_CID(kRDFContainerUtilsCID, NS_RDFCONTAINERUTILS_CID); -static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID); //////////////////////////////////////////////////////////////////////// diff --git a/rdf/base/src/nsRDFService.cpp b/rdf/base/src/nsRDFService.cpp index ed3ae7b9e762..f5f6316b39d6 100644 --- a/rdf/base/src/nsRDFService.cpp +++ b/rdf/base/src/nsRDFService.cpp @@ -75,11 +75,9 @@ static NS_DEFINE_CID(kRDFXMLDataSourceCID, NS_RDFXMLDATASOURCE_CID); static NS_DEFINE_CID(kRDFDefaultResourceCID, NS_RDFDEFAULTRESOURCE_CID); -static NS_DEFINE_IID(kIRDFServiceIID, NS_IRDFSERVICE_IID); static NS_DEFINE_IID(kIRDFLiteralIID, NS_IRDFLITERAL_IID); static NS_DEFINE_IID(kIRDFDateIID, NS_IRDFDATE_IID); static NS_DEFINE_IID(kIRDFIntIID, NS_IRDFINT_IID); -static NS_DEFINE_IID(kIRDFResourceIID, NS_IRDFRESOURCE_IID); static NS_DEFINE_IID(kIRDFNodeIID, NS_IRDFNODE_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); diff --git a/rdf/datasource/src/nsFileSystemDataSource.cpp b/rdf/datasource/src/nsFileSystemDataSource.cpp index 29a5bdc35844..ce1a458d9a3e 100644 --- a/rdf/datasource/src/nsFileSystemDataSource.cpp +++ b/rdf/datasource/src/nsFileSystemDataSource.cpp @@ -95,7 +95,6 @@ #endif static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); #define NS_MOZICON_SCHEME "moz-icon:" diff --git a/rdf/tests/localfile/localfile.cpp b/rdf/tests/localfile/localfile.cpp index 918e8624c132..7cb1e3d67041 100644 --- a/rdf/tests/localfile/localfile.cpp +++ b/rdf/tests/localfile/localfile.cpp @@ -82,14 +82,9 @@ // CIDs // netlib -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); // rdf -static NS_DEFINE_CID(kRDFBookMarkDataSourceCID, NS_RDFBOOKMARKDATASOURCE_CID); -static NS_DEFINE_CID(kRDFInMemoryDataSourceCID, NS_RDFINMEMORYDATASOURCE_CID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); -static NS_DEFINE_CID(kRDFCompositeDataSourceCID, NS_RDFCOMPOSITEDATASOURCE_CID); -static NS_DEFINE_CID(kRDFContentSinkCID, NS_RDFCONTENTSINK_CID); static NS_DEFINE_CID(kRDFXMLDataSourceCID, NS_RDFXMLDATASOURCE_CID); // xpcom @@ -100,8 +95,6 @@ static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); // IIDs NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); -NS_DEFINE_IID(kIOutputStreamIID, NS_IOUTPUTSTREAM_IID); -NS_DEFINE_IID(kIRDFDataSourceIID, NS_IRDFDATASOURCE_IID); NS_DEFINE_IID(kIRDFServiceIID, NS_IRDFSERVICE_IID); NS_DEFINE_IID(kIRDFXMLDataSourceIID, NS_IRDFXMLDATASOURCE_IID); diff --git a/rdf/tests/rdfcat/rdfcat.cpp b/rdf/tests/rdfcat/rdfcat.cpp index acf848d5ee20..3dbc0980fa10 100644 --- a/rdf/tests/rdfcat/rdfcat.cpp +++ b/rdf/tests/rdfcat/rdfcat.cpp @@ -72,7 +72,6 @@ // CIDs // rdf -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); static NS_DEFINE_CID(kRDFXMLDataSourceCID, NS_RDFXMLDATASOURCE_CID); // xpcom diff --git a/rdf/tests/rdfpoll/rdfpoll.cpp b/rdf/tests/rdfpoll/rdfpoll.cpp index 6fdadb6b2943..9eaa0e57c9a6 100644 --- a/rdf/tests/rdfpoll/rdfpoll.cpp +++ b/rdf/tests/rdfpoll/rdfpoll.cpp @@ -76,7 +76,6 @@ // CIDs // rdf -static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); static NS_DEFINE_CID(kRDFXMLDataSourceCID, NS_RDFXMLDATASOURCE_CID); // xpcom @@ -85,7 +84,6 @@ static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); //////////////////////////////////////////////////////////////////////// // IIDs -NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); #include "nsIMemory.h" // for the CID diff --git a/rdf/tests/rdfsink/rdfsink.cpp b/rdf/tests/rdfsink/rdfsink.cpp index d17b8d1549d2..07f520d7de24 100644 --- a/rdf/tests/rdfsink/rdfsink.cpp +++ b/rdf/tests/rdfsink/rdfsink.cpp @@ -70,7 +70,6 @@ static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); NS_DEFINE_IID(kIRDFXMLDataSourceIID, NS_IRDFXMLDATASOURCE_IID); -NS_DEFINE_IID(kIRDFServiceIID, NS_IRDFSERVICE_IID); NS_DEFINE_IID(kIRDFXMLSourceIID, NS_IRDFXMLSOURCE_IID); //////////////////////////////////////////////////////////////////////// diff --git a/rdf/util/src/nsRDFResource.cpp b/rdf/util/src/nsRDFResource.cpp index 360602da1326..9b8c0d0768ef 100644 --- a/rdf/util/src/nsRDFResource.cpp +++ b/rdf/util/src/nsRDFResource.cpp @@ -45,7 +45,6 @@ #include "nsXPIDLString.h" #include "prlog.h" -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); nsIRDFService* nsRDFResource::gRDFService = nsnull; diff --git a/security/manager/ssl/src/nsKeygenHandler.cpp b/security/manager/ssl/src/nsKeygenHandler.cpp index 8688f5c4cf19..552c24c5ea1f 100644 --- a/security/manager/ssl/src/nsKeygenHandler.cpp +++ b/security/manager/ssl/src/nsKeygenHandler.cpp @@ -99,7 +99,6 @@ const SEC_ASN1Template SECKEY_PQGParamsTemplate[] = { }; -static NS_DEFINE_IID(kFormProcessorIID, NS_IFORMPROCESSOR_IID); static NS_DEFINE_IID(kIDOMHTMLSelectElementIID, NS_IDOMHTMLSELECTELEMENT_IID); static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID); diff --git a/security/manager/ssl/src/nsNSSCertificate.cpp b/security/manager/ssl/src/nsNSSCertificate.cpp index 1d821342f1f2..190eddea06e8 100644 --- a/security/manager/ssl/src/nsNSSCertificate.cpp +++ b/security/manager/ssl/src/nsNSSCertificate.cpp @@ -85,7 +85,6 @@ extern PRLogModuleInfo* gPIPNSSLog; static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID); static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); -static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID); /* nsNSSCertificate */ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp index bdec2f4946bd..79d45d1a752b 100644 --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp @@ -91,7 +91,6 @@ extern "C" { PRLogModuleInfo* gPIPNSSLog = nsnull; #endif -static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID); int nsNSSComponent::mInstanceCount = 0; diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp index 966ca5ecbbc1..535c9541e767 100644 --- a/security/manager/ssl/src/nsNSSIOLayer.cpp +++ b/security/manager/ssl/src/nsNSSIOLayer.cpp @@ -133,7 +133,6 @@ void MyLogFunction(const char *fmt, ...) #define PR_LOG(module,level,args) MyLogFunction args #endif -static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID); nsNSSSocketInfo::nsNSSSocketInfo() : mFd(nsnull), diff --git a/uriloader/exthandler/mac/nsInternetConfigService.cpp b/uriloader/exthandler/mac/nsInternetConfigService.cpp index f85277cda234..536a79c14a5d 100644 --- a/uriloader/exthandler/mac/nsInternetConfigService.cpp +++ b/uriloader/exthandler/mac/nsInternetConfigService.cpp @@ -74,7 +74,6 @@ static void ConvertCharStringToStr255(const char* inString, Str255& outString) } /* Define Class IDs */ -static NS_DEFINE_CID(kICServiceCID, NS_INTERNETCONFIGSERVICE_CID); nsInternetConfigService::nsInternetConfigService() { diff --git a/uriloader/exthandler/nsExternalHelperAppService.cpp b/uriloader/exthandler/nsExternalHelperAppService.cpp index 600e3a944b14..9558cea4432a 100644 --- a/uriloader/exthandler/nsExternalHelperAppService.cpp +++ b/uriloader/exthandler/nsExternalHelperAppService.cpp @@ -96,8 +96,6 @@ static const char NEVER_ASK_FOR_SAVE_TO_DISK_PREF[] = "saveToDisk"; static const char NEVER_ASK_FOR_OPEN_FILE_PREF[] = "openFile"; static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); -static NS_DEFINE_CID(kRDFXMLDataSourceCID, NS_RDFXMLDATASOURCE_CID); -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); static NS_DEFINE_CID(kPluginManagerCID, NS_PLUGINMANAGER_CID); // The following static table lists all of the "default" content type mappings we are going to use. diff --git a/view/src/nsScrollPortView.cpp b/view/src/nsScrollPortView.cpp index b86c75f6031c..47852d1dbd68 100644 --- a/view/src/nsScrollPortView.cpp +++ b/view/src/nsScrollPortView.cpp @@ -58,7 +58,6 @@ #include static NS_DEFINE_IID(kWidgetCID, NS_CHILD_CID); -static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); #define SMOOTH_SCROLL_MSECS_PER_FRAME 10 #define SMOOTH_SCROLL_FRAMES 10 diff --git a/view/src/nsView.cpp b/view/src/nsView.cpp index 0c58d8fd0ba9..9ff2b89bf309 100644 --- a/view/src/nsView.cpp +++ b/view/src/nsView.cpp @@ -52,7 +52,6 @@ #include "nsGfxCIID.h" #include "nsIRegion.h" -static NS_DEFINE_IID(kRegionCID, NS_REGION_CID); //mmptemp diff --git a/webshell/tests/viewer/nsBrowserWindow.cpp b/webshell/tests/viewer/nsBrowserWindow.cpp index dd7e9a90bec9..29014433056b 100644 --- a/webshell/tests/viewer/nsBrowserWindow.cpp +++ b/webshell/tests/viewer/nsBrowserWindow.cpp @@ -173,23 +173,14 @@ static NS_DEFINE_CID(kWalletServiceCID, NS_WALLETSERVICE_CID); static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); static NS_DEFINE_CID(kButtonCID, NS_BUTTON_CID); static NS_DEFINE_CID(kTextFieldCID, NS_TEXTFIELD_CID); -static NS_DEFINE_CID(kWebShellCID, NS_WEB_SHELL_CID); static NS_DEFINE_CID(kWindowCID, NS_WINDOW_CID); -static NS_DEFINE_CID(kDialogCID, NS_DIALOG_CID); -static NS_DEFINE_CID(kCheckButtonCID, NS_CHECKBUTTON_CID); -static NS_DEFINE_CID(kLabelCID, NS_LABEL_CID); static NS_DEFINE_IID(kIXPBaseWindowIID, NS_IXPBASE_WINDOW_IID); static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); static NS_DEFINE_IID(kIButtonIID, NS_IBUTTON_IID); static NS_DEFINE_IID(kIDOMDocumentIID, NS_IDOMDOCUMENT_IID); -static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kITextWidgetIID, NS_ITEXTWIDGET_IID); -static NS_DEFINE_IID(kIWebShellContainerIID, NS_IWEB_SHELL_CONTAINER_IID); static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID); -static NS_DEFINE_IID(kICheckButtonIID, NS_ICHECKBUTTON_IID); -static NS_DEFINE_IID(kILabelIID, NS_ILABEL_IID); static NS_DEFINE_IID(kIDocumentViewerIID, NS_IDOCUMENT_VIEWER_IID); static NS_DEFINE_CID(kXPBaseWindowCID, NS_XPBASE_WINDOW_CID); static NS_DEFINE_IID(kIStringBundleServiceIID, NS_ISTRINGBUNDLESERVICE_IID); diff --git a/webshell/tests/viewer/nsEditorMode.cpp b/webshell/tests/viewer/nsEditorMode.cpp index f81f29b06517..80ab99edb481 100644 --- a/webshell/tests/viewer/nsEditorMode.cpp +++ b/webshell/tests/viewer/nsEditorMode.cpp @@ -59,7 +59,6 @@ static nsIEditor *gEditor; static NS_DEFINE_CID(kHTMLEditorCID, NS_HTMLEDITOR_CID); -static NS_DEFINE_CID(kEditorCID, NS_EDITOR_CID); nsresult NS_InitEditorMode(nsIDOMDocument *aDOMDocument, nsIPresShell* aPresShell) { diff --git a/webshell/tests/viewer/nsImageInspectorDialog.cpp b/webshell/tests/viewer/nsImageInspectorDialog.cpp index fc72bbf74c2b..e8bd6e3129cd 100644 --- a/webshell/tests/viewer/nsImageInspectorDialog.cpp +++ b/webshell/tests/viewer/nsImageInspectorDialog.cpp @@ -45,7 +45,6 @@ #include "nsIDOMHTMLInputElement.h" #include "nsIDOMHTMLDocument.h" -static NS_DEFINE_IID(kIDOMHTMLInputElementIID, NS_IDOMHTMLINPUTELEMENT_IID); //------------------------------------------------------------------------- diff --git a/webshell/tests/viewer/nsPhMain.cpp b/webshell/tests/viewer/nsPhMain.cpp index 2379e09f3c92..e4e13bcbd69a 100644 --- a/webshell/tests/viewer/nsPhMain.cpp +++ b/webshell/tests/viewer/nsPhMain.cpp @@ -94,13 +94,6 @@ nsNativeBrowserWindow::InitNativeWindow() return NS_OK; } -static NS_DEFINE_IID( kMenuBarCID, NS_MENUBAR_CID ); -static NS_DEFINE_IID( kIMenuBarIID, NS_IMENUBAR_IID ); -static NS_DEFINE_IID( kMenuCID, NS_MENU_CID ); -static NS_DEFINE_IID( kIMenuIID, NS_IMENU_IID ); -static NS_DEFINE_IID( kMenuItemCID, NS_MENUITEM_CID ); -static NS_DEFINE_IID( kIMenuItemIID,NS_IMENUITEM_IID ); - extern void CreateViewerMenus(PtWidget_t*, void *); nsresult diff --git a/webshell/tests/viewer/nsPrintSetupDialog.cpp b/webshell/tests/viewer/nsPrintSetupDialog.cpp index ec0ef333cd2b..c3028c52a6ef 100644 --- a/webshell/tests/viewer/nsPrintSetupDialog.cpp +++ b/webshell/tests/viewer/nsPrintSetupDialog.cpp @@ -44,7 +44,6 @@ #include "nsIDOMHTMLInputElement.h" #include "nsIDOMHTMLDocument.h" -static NS_DEFINE_IID(kIDOMHTMLInputElementIID, NS_IDOMHTMLINPUTELEMENT_IID); PrintSetupInfo::PrintSetupInfo(const PrintSetupInfo & aPSI) : mPortrait(aPSI.mPortrait), diff --git a/webshell/tests/viewer/nsTableInspectorDialog.cpp b/webshell/tests/viewer/nsTableInspectorDialog.cpp index cce1cfb9fde2..c0cc74c74c78 100644 --- a/webshell/tests/viewer/nsTableInspectorDialog.cpp +++ b/webshell/tests/viewer/nsTableInspectorDialog.cpp @@ -45,7 +45,6 @@ #include "nsIDOMHTMLInputElement.h" #include "nsIDOMHTMLDocument.h" -static NS_DEFINE_IID(kIDOMHTMLInputElementIID, NS_IDOMHTMLINPUTELEMENT_IID); //------------------------------------------------------------------------- diff --git a/webshell/tests/viewer/nsThrobber.cpp b/webshell/tests/viewer/nsThrobber.cpp index ca47983f885a..f40684c05105 100644 --- a/webshell/tests/viewer/nsThrobber.cpp +++ b/webshell/tests/viewer/nsThrobber.cpp @@ -55,7 +55,6 @@ static NS_DEFINE_IID(kChildCID, NS_CHILD_CID); static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID); -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); #define THROB_NUM 14 diff --git a/webshell/tests/viewer/nsViewerApp.cpp b/webshell/tests/viewer/nsViewerApp.cpp index 062506e563db..d63dd6cd40a6 100644 --- a/webshell/tests/viewer/nsViewerApp.cpp +++ b/webshell/tests/viewer/nsViewerApp.cpp @@ -116,19 +116,14 @@ extern nsresult NS_NewXPBaseWindowFactory(nsIFactory** aFactory); -static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_IID(kAppShellCID, NS_APPSHELL_CID); static NS_DEFINE_IID(kXPBaseWindowCID, NS_XPBASE_WINDOW_CID); static NS_DEFINE_IID(kCookieServiceCID, NS_COOKIESERVICE_CID); -static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); static NS_DEFINE_IID(kIAppShellIID, NS_IAPPSHELL_IID); -static NS_DEFINE_IID(kIPrefIID, NS_IPREF_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIXPBaseWindowIID, NS_IXPBASE_WINDOW_IID); static NS_DEFINE_CID(kFormProcessorCID, NS_FORMPROCESSOR_CID); -static NS_DEFINE_IID(kIDOMHTMLSelectElementIID, NS_IDOMHTMLSELECTELEMENT_IID); #define DEFAULT_WIDTH 620 #define DEFAULT_HEIGHT 400 diff --git a/webshell/tests/viewer/nsWebCrawler.cpp b/webshell/tests/viewer/nsWebCrawler.cpp index d0515e156638..7f2941aba456 100644 --- a/webshell/tests/viewer/nsWebCrawler.cpp +++ b/webshell/tests/viewer/nsWebCrawler.cpp @@ -64,7 +64,6 @@ static NS_DEFINE_IID(kFrameUtilCID, NS_FRAME_UTIL_CID); static NS_DEFINE_IID(kIFrameUtilIID, NS_IFRAME_UTIL_IID); -static NS_DEFINE_IID(kIXMLContentIID, NS_IXMLCONTENT_IID); static PLHashNumber HashKey(nsIAtom* key) diff --git a/webshell/tests/viewer/nsWidgetSupport.cpp b/webshell/tests/viewer/nsWidgetSupport.cpp index e5a84d605e0f..3f7f7221ac0c 100644 --- a/webshell/tests/viewer/nsWidgetSupport.cpp +++ b/webshell/tests/viewer/nsWidgetSupport.cpp @@ -45,12 +45,7 @@ #include "nsITextWidget.h" -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID); -static NS_DEFINE_IID(kIButtonIID, NS_IBUTTON_IID); -static NS_DEFINE_IID(kITextWidgetIID, NS_ITEXTWIDGET_IID); -static NS_DEFINE_IID(kICheckButtonIID, NS_ICHECKBUTTON_IID); -static NS_DEFINE_IID(kILabelIID, NS_ILABEL_IID); #ifdef XP_MAC #define WIDGET_SUPPORT_EXPORT(returnType) PR_PUBLIC_API(returnType) diff --git a/webshell/tests/viewer/nsXPBaseWindow.cpp b/webshell/tests/viewer/nsXPBaseWindow.cpp index 398477cf97ce..7de1a664617e 100644 --- a/webshell/tests/viewer/nsXPBaseWindow.cpp +++ b/webshell/tests/viewer/nsXPBaseWindow.cpp @@ -81,14 +81,12 @@ //#include "nsUnitConversion.h" //#include "nsIDeviceContext.h" -static NS_DEFINE_IID(kXPBaseWindowCID, NS_XPBASE_WINDOW_CID); static NS_DEFINE_IID(kWebShellCID, NS_WEB_SHELL_CID); static NS_DEFINE_IID(kWindowCID, NS_WINDOW_CID); static NS_DEFINE_IID(kIXPBaseWindowIID, NS_IXPBASE_WINDOW_IID); static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIDOMDocumentIID, NS_IDOMDOCUMENT_IID); static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); static NS_DEFINE_IID(kIWebShellIID, NS_IWEB_SHELL_IID); static NS_DEFINE_IID(kIWebShellContainerIID, NS_IWEB_SHELL_CONTAINER_IID); @@ -97,7 +95,6 @@ static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID); static NS_DEFINE_IID(kIDOMMouseListenerIID, NS_IDOMMOUSELISTENER_IID); static NS_DEFINE_IID(kIDOMEventReceiverIID, NS_IDOMEVENTRECEIVER_IID); -static NS_DEFINE_IID(kIDOMElementIID, NS_IDOMELEMENT_IID); static NS_DEFINE_IID(kIDOMHTMLDocumentIID, NS_IDOMHTMLDOCUMENT_IID); //---------------------------------------------------------------------- diff --git a/widget/src/beos/nsDragService.cpp b/widget/src/beos/nsDragService.cpp index f159b1a76805..d08f46395803 100644 --- a/widget/src/beos/nsDragService.cpp +++ b/widget/src/beos/nsDragService.cpp @@ -42,7 +42,6 @@ #include "nsWidgetsCID.h" -static NS_DEFINE_IID(kIDragServiceIID, NS_IDRAGSERVICE_IID); static NS_DEFINE_CID(kCDragServiceCID, NS_DRAGSERVICE_CID); // The class statics: diff --git a/widget/src/beos/nsWindow.cpp b/widget/src/beos/nsWindow.cpp index 219ef35afa5d..2a8a90271c1f 100644 --- a/widget/src/beos/nsWindow.cpp +++ b/widget/src/beos/nsWindow.cpp @@ -97,7 +97,6 @@ static PRBool gGotQuitShortcut = PR_FALSE; // Tracking last activated BWindow //////////////////////////////////////////////////// static BWindow * gLastActiveWindow = NULL; -static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID); // BCursor objects can't be created until they are used. Some mozilla utilities, // such as regxpcom, do not create a BApplication object, and therefor fail to run., diff --git a/widget/src/build/nsWidgetSupport.cpp b/widget/src/build/nsWidgetSupport.cpp index c7ab7b4c5f7e..a0333059b6b2 100644 --- a/widget/src/build/nsWidgetSupport.cpp +++ b/widget/src/build/nsWidgetSupport.cpp @@ -50,14 +50,7 @@ #include "nsITextWidget.h" -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); -static NS_DEFINE_IID(kIButtonIID, NS_IBUTTON_IID); -static NS_DEFINE_IID(kITextWidgetIID, NS_ITEXTWIDGET_IID); -static NS_DEFINE_IID(kICheckButtonIID, NS_ICHECKBUTTON_IID); -static NS_DEFINE_IID(kIRadioButtonIID, NS_IRADIOBUTTON_IID); -static NS_DEFINE_IID(kILabelIID, NS_ILABEL_IID); NS_WIDGET nsresult diff --git a/widget/src/cocoa/nsMenuBarX.cpp b/widget/src/cocoa/nsMenuBarX.cpp index 56e3625c86d6..f244ec2e482e 100644 --- a/widget/src/cocoa/nsMenuBarX.cpp +++ b/widget/src/cocoa/nsMenuBarX.cpp @@ -71,9 +71,7 @@ // CIDs #include "nsWidgetsCID.h" -static NS_DEFINE_CID(kMenuBarCID, NS_MENUBAR_CID); static NS_DEFINE_CID(kMenuCID, NS_MENU_CID); -static NS_DEFINE_CID(kMenuItemCID, NS_MENUITEM_CID); NS_IMPL_ISUPPORTS6(nsMenuBarX, nsIMenuBar, nsIMenuListener, nsIDocumentObserver, nsIChangeManager, nsIMenuCommandDispatcher, nsISupportsWeakReference) diff --git a/widget/src/gtk/nsAppShell.cpp b/widget/src/gtk/nsAppShell.cpp index f0dcc64d7b9d..59ef75a4fa65 100644 --- a/widget/src/gtk/nsAppShell.cpp +++ b/widget/src/gtk/nsAppShell.cpp @@ -125,7 +125,6 @@ static unsigned long getNextRequest (void *aClosure) { //------------------------------------------------------------------------- static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID); -static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); //------------------------------------------------------------------------- diff --git a/widget/src/gtk/nsDragService.cpp b/widget/src/gtk/nsDragService.cpp index e77009b72615..f61d0e40b90e 100644 --- a/widget/src/gtk/nsDragService.cpp +++ b/widget/src/gtk/nsDragService.cpp @@ -34,7 +34,6 @@ #include #include "nsCRT.h" -static NS_DEFINE_IID(kCDragServiceCID, NS_DRAGSERVICE_CID); #ifdef PR_LOGGING static PRLogModuleInfo *sDragLm = NULL; diff --git a/widget/src/gtk/nsWidget.cpp b/widget/src/gtk/nsWidget.cpp index d5ba18f4419f..2986c052a828 100644 --- a/widget/src/gtk/nsWidget.cpp +++ b/widget/src/gtk/nsWidget.cpp @@ -65,7 +65,6 @@ static inline PRBool IsContextMenuKey(const nsKeyEvent& inKeyEvent); static NS_DEFINE_CID(kRegionCID, NS_REGION_CID); -static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); static NS_DEFINE_IID(kCDragServiceCID, NS_DRAGSERVICE_CID); // this is the nsWindow with the focus diff --git a/widget/src/gtk2/nsDragService.cpp b/widget/src/gtk2/nsDragService.cpp index 38c604fd2f3e..ff99f3b87731 100644 --- a/widget/src/gtk2/nsDragService.cpp +++ b/widget/src/gtk2/nsDragService.cpp @@ -41,7 +41,6 @@ #include #include "nsCRT.h" -static NS_DEFINE_IID(kCDragServiceCID, NS_DRAGSERVICE_CID); static PRLogModuleInfo *sDragLm = NULL; diff --git a/widget/src/mac/nsMacMessagePump.cpp b/widget/src/mac/nsMacMessagePump.cpp index b9c5c4f58a45..ad0dfe48537b 100644 --- a/widget/src/mac/nsMacMessagePump.cpp +++ b/widget/src/mac/nsMacMessagePump.cpp @@ -209,7 +209,6 @@ static pascal void EventFilter (EventRecord *ev) #pragma mark - #endif -static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); //================================================================= /* Constructor diff --git a/widget/src/mac/nsMenu.cpp b/widget/src/mac/nsMenu.cpp index d425d07dacee..c193443187bc 100644 --- a/widget/src/mac/nsMenu.cpp +++ b/widget/src/mac/nsMenu.cpp @@ -102,7 +102,6 @@ nsInstanceCounter gMenuCounter("nsMenu"); // CIDs #include "nsWidgetsCID.h" -static NS_DEFINE_CID(kMenuBarCID, NS_MENUBAR_CID); static NS_DEFINE_CID(kMenuCID, NS_MENU_CID); static NS_DEFINE_CID(kMenuItemCID, NS_MENUITEM_CID); diff --git a/widget/src/mac/nsMenuBar.cpp b/widget/src/mac/nsMenuBar.cpp index 0552343330c7..842f8a88011d 100644 --- a/widget/src/mac/nsMenuBar.cpp +++ b/widget/src/mac/nsMenuBar.cpp @@ -92,9 +92,7 @@ extern PRInt16 gCurrentMenuDepth; // CIDs #include "nsWidgetsCID.h" -static NS_DEFINE_CID(kMenuBarCID, NS_MENUBAR_CID); static NS_DEFINE_CID(kMenuCID, NS_MENU_CID); -static NS_DEFINE_CID(kMenuItemCID, NS_MENUITEM_CID); void InstallDefProc( short dpPath, ResType dpType, short dpID, Ptr dpAddr); diff --git a/widget/src/mac/nsMenuBarX.cpp b/widget/src/mac/nsMenuBarX.cpp index c934d284791a..39123be392a6 100644 --- a/widget/src/mac/nsMenuBarX.cpp +++ b/widget/src/mac/nsMenuBarX.cpp @@ -76,9 +76,7 @@ // CIDs #include "nsWidgetsCID.h" -static NS_DEFINE_CID(kMenuBarCID, NS_MENUBAR_CID); static NS_DEFINE_CID(kMenuCID, NS_MENU_CID); -static NS_DEFINE_CID(kMenuItemCID, NS_MENUITEM_CID); NS_IMPL_ISUPPORTS6(nsMenuBarX, nsIMenuBar, nsIMenuListener, nsIDocumentObserver, nsIChangeManager, nsIMenuCommandDispatcher, nsISupportsWeakReference) diff --git a/widget/src/mac/nsToolkit.cpp b/widget/src/mac/nsToolkit.cpp index 3d759f8ce104..068355589f0d 100644 --- a/widget/src/mac/nsToolkit.cpp +++ b/widget/src/mac/nsToolkit.cpp @@ -54,7 +54,6 @@ // Class IDs... -static NS_DEFINE_CID(kEventQueueCID, NS_EVENTQUEUE_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static nsMacNSPREventQueueHandler* gEventQueueHandler = nsnull; diff --git a/widget/src/os2/nsAppShell.cpp b/widget/src/os2/nsAppShell.cpp index bd51a9056f95..fb7613161015 100644 --- a/widget/src/os2/nsAppShell.cpp +++ b/widget/src/os2/nsAppShell.cpp @@ -28,7 +28,6 @@ #include "nsIServiceManager.h" #include "nsWidgetsCID.h" -static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); // Appshell manager. Same threads must get the same appshell object, // or else the message queue will be taken over by the second (nested) diff --git a/widget/src/photon/nsAppShell.cpp b/widget/src/photon/nsAppShell.cpp index 185f64f3579b..e3d2be26a773 100644 --- a/widget/src/photon/nsAppShell.cpp +++ b/widget/src/photon/nsAppShell.cpp @@ -65,7 +65,6 @@ static PLHashTable *sCountHashTable = nsnull; //------------------------------------------------------------------------- static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID); -static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); //------------------------------------------------------------------------- // diff --git a/widget/src/photon/nsButton.cpp b/widget/src/photon/nsButton.cpp index 21dc27ac3975..5fcb234ebaa3 100644 --- a/widget/src/photon/nsButton.cpp +++ b/widget/src/photon/nsButton.cpp @@ -51,8 +51,6 @@ #include "nsPhWidgetLog.h" -static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); NS_IMPL_ISUPPORTS_INHERITED1(nsButton, nsWidget, nsIButton) diff --git a/widget/src/photon/nsCheckButton.cpp b/widget/src/photon/nsCheckButton.cpp index 8d57ad0601fb..f93e0421cd47 100644 --- a/widget/src/photon/nsCheckButton.cpp +++ b/widget/src/photon/nsCheckButton.cpp @@ -51,8 +51,6 @@ #include "nsPhWidgetLog.h" -static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); NS_IMPL_ADDREF(nsCheckButton) diff --git a/widget/src/photon/nsTextWidget.cpp b/widget/src/photon/nsTextWidget.cpp index e830a73aca23..7ab2cb5ee531 100644 --- a/widget/src/photon/nsTextWidget.cpp +++ b/widget/src/photon/nsTextWidget.cpp @@ -51,8 +51,6 @@ #include #include "nsPhWidgetLog.h" -static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); NS_IMPL_ADDREF(nsTextWidget) NS_IMPL_RELEASE(nsTextWidget) diff --git a/widget/src/photon/nsWidget.cpp b/widget/src/photon/nsWidget.cpp index a7b54195de10..37f9dfe72511 100644 --- a/widget/src/photon/nsWidget.cpp +++ b/widget/src/photon/nsWidget.cpp @@ -64,8 +64,6 @@ #include static NS_DEFINE_CID(kLookAndFeelCID, NS_LOOKANDFEEL_CID); -static NS_DEFINE_CID(kRegionCID, NS_REGION_CID); -static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); // BGR, not RGB - REVISIT #define NSCOLOR_TO_PHCOLOR(g,n) \ diff --git a/widget/src/support/nsWidgetSupport.cpp b/widget/src/support/nsWidgetSupport.cpp index efba7ea3b666..f9d1fbca4825 100644 --- a/widget/src/support/nsWidgetSupport.cpp +++ b/widget/src/support/nsWidgetSupport.cpp @@ -50,13 +50,7 @@ #include "nsICheckButton.h" -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kIWidgetIID, NS_IWIDGET_IID); -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); -static NS_DEFINE_IID(kIButtonIID, NS_IBUTTON_IID); -static NS_DEFINE_IID(kITextWidgetIID, NS_ITEXTWIDGET_IID); -static NS_DEFINE_IID(kICheckButtonIID, NS_ICHECKBUTTON_IID); -static NS_DEFINE_IID(kILabelIID, NS_ILABEL_IID); #ifdef XP_MAC #define WIDGET_SUPPORT_EXPORT(returnType) PR_PUBLIC_API(returnType) diff --git a/widget/src/windows/nsAppShell.cpp b/widget/src/windows/nsAppShell.cpp index 5fd45b5ff4af..70cc3e6b7452 100644 --- a/widget/src/windows/nsAppShell.cpp +++ b/widget/src/windows/nsAppShell.cpp @@ -49,7 +49,6 @@ #include "nsWidgetsCID.h" #include "aimm.h" -static NS_DEFINE_IID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); NS_IMPL_ISUPPORTS1(nsAppShell, nsIAppShell) diff --git a/widget/src/xlib/nsAppShell.cpp b/widget/src/xlib/nsAppShell.cpp index 517e2a5c938b..45b134617c67 100644 --- a/widget/src/xlib/nsAppShell.cpp +++ b/widget/src/xlib/nsAppShell.cpp @@ -68,7 +68,6 @@ #define CHAR_BUF_SIZE 80 static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); -static NS_DEFINE_IID(kIEventQueueServiceIID, NS_IEVENTQUEUESERVICE_IID); static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID); static NS_DEFINE_IID(kCDragServiceCID, NS_DRAGSERVICE_CID); diff --git a/widget/src/xpwidgets/nsXPLookAndFeel.cpp b/widget/src/xpwidgets/nsXPLookAndFeel.cpp index b3c54ae031c4..2aed3698c5b8 100644 --- a/widget/src/xpwidgets/nsXPLookAndFeel.cpp +++ b/widget/src/xpwidgets/nsXPLookAndFeel.cpp @@ -48,7 +48,6 @@ static int PR_CALLBACK colorPrefChanged(const char* aPref, void* aData); #include "nsSize.h" #endif -static NS_DEFINE_IID(kILookAndFeelIID, NS_ILOOKANDFEEL_IID); static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID); NS_IMPL_ISUPPORTS1(nsXPLookAndFeel, nsILookAndFeel) diff --git a/xpcom/ds/nsObserverService.cpp b/xpcom/ds/nsObserverService.cpp index 11246a1709bf..ad08b807f9b0 100644 --- a/xpcom/ds/nsObserverService.cpp +++ b/xpcom/ds/nsObserverService.cpp @@ -49,7 +49,6 @@ #define NS_WEAK_OBSERVERS -static NS_DEFINE_CID(kObserverServiceCID, NS_OBSERVERSERVICE_CID); #if defined(PR_LOGGING) diff --git a/xpcom/ds/nsPersistentProperties.h b/xpcom/ds/nsPersistentProperties.h index 752ddb340331..0dbeb9f4ad3c 100644 --- a/xpcom/ds/nsPersistentProperties.h +++ b/xpcom/ds/nsPersistentProperties.h @@ -45,8 +45,6 @@ class nsIUnicharInputStream; -static NS_DEFINE_CID(kPropertyElementCID, NS_IPROPERTYELEMENT_CID); -static NS_DEFINE_CID(kPersistentPropertiesCID, NS_IPERSISTENTPROPERTIES_CID); class nsPersistentProperties : public nsIPersistentProperties { diff --git a/xpcom/proxy/src/nsProxyEventClass.cpp b/xpcom/proxy/src/nsProxyEventClass.cpp index bc7d949b664d..75ec1f487892 100644 --- a/xpcom/proxy/src/nsProxyEventClass.cpp +++ b/xpcom/proxy/src/nsProxyEventClass.cpp @@ -57,7 +57,6 @@ static uint32 zero_methods_descriptor; -static NS_DEFINE_IID(kProxyEventClassIID, NS_PROXYEVENT_CLASS_IID); /* ssc@netscape.com wishes he could get rid of this instance of * |NS_DEFINE_IID|, but |ProxyEventClassIdentity| is not visible from diff --git a/xpfe/appshell/src/nsAppShellService.cpp b/xpfe/appshell/src/nsAppShellService.cpp index 592ba1b797a8..34e138438e2c 100644 --- a/xpfe/appshell/src/nsAppShellService.cpp +++ b/xpfe/appshell/src/nsAppShellService.cpp @@ -97,7 +97,6 @@ static PRBool OnMacOSX(); static NS_DEFINE_CID(kAppShellCID, NS_APPSHELL_CID); static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID); -static NS_DEFINE_CID(kXPConnectCID, NS_XPCONNECT_CID); #define gEQActivatedNotification "nsIEventQueueActivated" #define gEQDestroyedNotification "nsIEventQueueDestroyed" diff --git a/xpfe/bootstrap/appleevents/nsAEApplicationClass.cpp b/xpfe/bootstrap/appleevents/nsAEApplicationClass.cpp index ae9de8f24604..49df3943aab3 100644 --- a/xpfe/bootstrap/appleevents/nsAEApplicationClass.cpp +++ b/xpfe/bootstrap/appleevents/nsAEApplicationClass.cpp @@ -55,7 +55,6 @@ #include "nsAppShellCIDs.h" #include "nsIAppShellService.h" -static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID); static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID); /*---------------------------------------------------------------------------- diff --git a/xpfe/bootstrap/nsAppRunner.cpp b/xpfe/bootstrap/nsAppRunner.cpp index 14c2ea8d5c7f..07320fa6cdca 100644 --- a/xpfe/bootstrap/nsAppRunner.cpp +++ b/xpfe/bootstrap/nsAppRunner.cpp @@ -120,7 +120,6 @@ #define DEBUG_CMD_LINE #endif -static NS_DEFINE_CID(kWindowMediatorCID, NS_WINDOWMEDIATOR_CID); static NS_DEFINE_CID(kIProcessCID, NS_PROCESS_CID); #define UILOCALE_CMD_LINE_ARG "-UILocale" diff --git a/xpfe/bootstrap/nsNativeAppSupportMac.cpp b/xpfe/bootstrap/nsNativeAppSupportMac.cpp index 825574d06424..1433f2969297 100644 --- a/xpfe/bootstrap/nsNativeAppSupportMac.cpp +++ b/xpfe/bootstrap/nsNativeAppSupportMac.cpp @@ -60,7 +60,6 @@ #include "nsIWidget.h" #include "nsIWindowMediator.h" -static NS_DEFINE_CID(kCmdLineServiceCID, NS_COMMANDLINE_SERVICE_CID); static NS_DEFINE_CID(kAppShellServiceCID, NS_APPSHELL_SERVICE_CID); #define rSplashDialog 512 diff --git a/xpinstall/src/nsInstall.cpp b/xpinstall/src/nsInstall.cpp index b616154b45d1..2098eb98699d 100644 --- a/xpinstall/src/nsInstall.cpp +++ b/xpinstall/src/nsInstall.cpp @@ -170,8 +170,6 @@ nsInstallInfo::~nsInstallInfo() static NS_DEFINE_IID(kISoftwareUpdateIID, NS_ISOFTWAREUPDATE_IID); static NS_DEFINE_IID(kSoftwareUpdateCID, NS_SoftwareUpdate_CID); -static NS_DEFINE_IID(kIZipReaderIID, NS_IZIPREADER_IID); -static NS_DEFINE_IID(kZipReaderCID, NS_ZIPREADER_CID); MOZ_DECL_CTOR_COUNTER(nsInstall) diff --git a/xpinstall/src/nsInstallTrigger.cpp b/xpinstall/src/nsInstallTrigger.cpp index 054649c78139..96f3020d824b 100644 --- a/xpinstall/src/nsInstallTrigger.cpp +++ b/xpinstall/src/nsInstallTrigger.cpp @@ -60,12 +60,7 @@ #include "nsIChannel.h" #include "nsIURI.h" -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); -static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); -static NS_DEFINE_IID(kIInstallTrigger_IID, NS_IDOMINSTALLTRIGGERGLOBAL_IID); -static NS_DEFINE_IID(kIInstallTrigger_CID, NS_SoftwareUpdateInstallTrigger_CID); nsInstallTrigger::nsInstallTrigger() { diff --git a/xpinstall/src/nsInstallVersion.cpp b/xpinstall/src/nsInstallVersion.cpp index c97f0a896a33..08406b05f402 100644 --- a/xpinstall/src/nsInstallVersion.cpp +++ b/xpinstall/src/nsInstallVersion.cpp @@ -49,7 +49,6 @@ #include "prmem.h" static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); -static NS_DEFINE_IID(kIFactoryIID, NS_IFACTORY_IID); static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID); static NS_DEFINE_IID(kIInstallVersion_IID, NS_IDOMINSTALLVERSION_IID); diff --git a/xpinstall/src/nsSoftwareUpdate.cpp b/xpinstall/src/nsSoftwareUpdate.cpp index 527af9a09cde..17fad5aeaaa6 100644 --- a/xpinstall/src/nsSoftwareUpdate.cpp +++ b/xpinstall/src/nsSoftwareUpdate.cpp @@ -76,12 +76,8 @@ extern "C" void RunChromeInstallOnThread(void *data); //////////////////////////////////////////////////////////////////////////////// // Globals //////////////////////////////////////////////////////////////////////////////// -static NS_DEFINE_CID(kComponentManagerCID, NS_COMPONENTMANAGER_CID); -static NS_DEFINE_CID(kCScriptNameSetRegistryCID, NS_SCRIPT_NAMESET_REGISTRY_CID); -static NS_DEFINE_CID(kInstallTrigger_CID, NS_SoftwareUpdateInstallTrigger_CID); -static NS_DEFINE_CID(kInstallVersion_CID, NS_SoftwareUpdateInstallVersion_CID); static NS_DEFINE_CID(kIProcessCID, NS_PROCESS_CID); diff --git a/xpinstall/src/nsXPInstallManager.cpp b/xpinstall/src/nsXPInstallManager.cpp index a1a7371852ed..abf1775d3818 100644 --- a/xpinstall/src/nsXPInstallManager.cpp +++ b/xpinstall/src/nsXPInstallManager.cpp @@ -64,13 +64,11 @@ #include "CertReader.h" -static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID); static NS_DEFINE_IID(kProxyObjectManagerCID, NS_PROXYEVENT_MANAGER_CID); static NS_DEFINE_IID(kStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); #include "nsIEventQueueService.h" -static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); #define UPDATE_DLG(x) (((x) - mLastUpdate) > 250000)