From 9819e5e8fa35d094f0c420095727bc354ae47c09 Mon Sep 17 00:00:00 2001 From: "jaggernaut%netscape.com" Date: Sun, 20 Jul 2003 07:40:43 +0000 Subject: [PATCH] Bug 25886: Get rid of a bunch of unused NS_DEFINE_IID, NS_DEFINE_CID. r=caillon, sr=dbaron --- content/base/src/nsDocumentEncoder.cpp | 3 --- content/base/src/nsDocumentViewer.cpp | 5 ----- content/base/src/nsPrintEngine.cpp | 5 ----- content/base/src/nsSyncLoadService.cpp | 2 -- content/html/style/src/nsCSSLoader.cpp | 3 --- content/xml/document/src/nsXMLContentSink.cpp | 5 ----- layout/base/nsDocumentViewer.cpp | 5 ----- layout/printing/nsPrintEngine.cpp | 5 ----- layout/style/nsCSSLoader.cpp | 3 --- 9 files changed, 36 deletions(-) diff --git a/content/base/src/nsDocumentEncoder.cpp b/content/base/src/nsDocumentEncoder.cpp index d47c52bb97a7..435ba7718bfa 100644 --- a/content/base/src/nsDocumentEncoder.cpp +++ b/content/base/src/nsDocumentEncoder.cpp @@ -75,9 +75,6 @@ #include "nsUnicharUtils.h" #include "nsReadableUtils.h" -static NS_DEFINE_CID(kCharsetConverterManagerCID, - NS_ICHARSETCONVERTERMANAGER_CID); - nsresult NS_NewDomSelection(nsISelection **aDomSelection); enum nsRangeIterationDirection { diff --git a/content/base/src/nsDocumentViewer.cpp b/content/base/src/nsDocumentViewer.cpp index 3156ce03a181..0a8444c7f32f 100644 --- a/content/base/src/nsDocumentViewer.cpp +++ b/content/base/src/nsDocumentViewer.cpp @@ -146,7 +146,6 @@ #include "nsISimpleEnumerator.h" #include "nsXPCOM.h" #include "nsISupportsPrimitives.h" -static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID); // PrintOptions is now implemented by PrintSettingsService static const char sPrintSettingsServiceContractID[] = "@mozilla.org/gfx/printsettings-service;1"; @@ -195,9 +194,7 @@ static const char sPrintOptionsContractID[] = "@mozilla.org/gfx/printset #include "nsBidiUtils.h" -static NS_DEFINE_CID(kPresShellCID, NS_PRESSHELL_CID); static NS_DEFINE_CID(kGalleyContextCID, NS_GALLEYCONTEXT_CID); -static NS_DEFINE_CID(kPrintContextCID, NS_PRINTCONTEXT_CID); static NS_DEFINE_CID(kStyleSetCID, NS_STYLESET_CID); #ifdef NS_DEBUG @@ -2136,8 +2133,6 @@ NS_IMETHODIMP DocumentViewerImpl::GetCanGetContents(PRBool *aCanGetContents) #pragma mark - #endif -static NS_DEFINE_IID(kDeviceContextSpecFactoryCID, NS_DEVICE_CONTEXT_SPEC_FACTORY_CID); - /* ======================================================================================== * nsIContentViewerFile * ======================================================================================== */ diff --git a/content/base/src/nsPrintEngine.cpp b/content/base/src/nsPrintEngine.cpp index 2d3313d4611d..6c455ad7e041 100644 --- a/content/base/src/nsPrintEngine.cpp +++ b/content/base/src/nsPrintEngine.cpp @@ -58,7 +58,6 @@ #include "nsISimpleEnumerator.h" #include "nsXPCOM.h" #include "nsISupportsPrimitives.h" -static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID); // PrintOptions is now implemented by PrintSettingsService static const char sPrintSettingsServiceContractID[] = "@mozilla.org/gfx/printsettings-service;1"; @@ -180,11 +179,7 @@ static const char kPrintingPromptService[] = "@mozilla.org/embedcomp/printingpro // New PrintPreview static NS_DEFINE_CID(kPrintPreviewContextCID, NS_PRINT_PREVIEW_CONTEXT_CID); - -static NS_DEFINE_CID(kPresShellCID, NS_PRESSHELL_CID); -static NS_DEFINE_CID(kGalleyContextCID, NS_GALLEYCONTEXT_CID); static NS_DEFINE_CID(kPrintContextCID, NS_PRINTCONTEXT_CID); -static NS_DEFINE_CID(kStyleSetCID, NS_STYLESET_CID); //----------------------------------------------------- // PR LOGGING diff --git a/content/base/src/nsSyncLoadService.cpp b/content/base/src/nsSyncLoadService.cpp index 0b5cf113a0c4..fbf702b14a87 100644 --- a/content/base/src/nsSyncLoadService.cpp +++ b/content/base/src/nsSyncLoadService.cpp @@ -68,8 +68,6 @@ static const char kLoadAsData[] = "loadAsData"; -static NS_DEFINE_CID(kIDOMDOMImplementationCID, NS_DOM_IMPLEMENTATION_CID); -static NS_DEFINE_CID(kEventQueueServiceCID, NS_EVENTQUEUESERVICE_CID); static NS_DEFINE_CID(kXMLDocumentCID, NS_XMLDOCUMENT_CID); // This is ugly, but nsXBLContentSink.h isn't exported diff --git a/content/html/style/src/nsCSSLoader.cpp b/content/html/style/src/nsCSSLoader.cpp index 0f278cbe818b..d3f983d687f2 100644 --- a/content/html/style/src/nsCSSLoader.cpp +++ b/content/html/style/src/nsCSSLoader.cpp @@ -99,9 +99,6 @@ static PRLogModuleInfo *gLoaderLog = PR_NewLogModule("nsCSSLoader"); #define LOG_URI(format, uri) #endif // PR_LOGGING -static NS_DEFINE_CID(kCharsetAliasCID, NS_CHARSETALIAS_CID); -static NS_DEFINE_CID(kCStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); - // And some convenience strings... #ifdef PR_LOGGING static const char* const gStateStrings[] = { diff --git a/content/xml/document/src/nsXMLContentSink.cpp b/content/xml/document/src/nsXMLContentSink.cpp index 3d9201af0234..35d7254ea88a 100644 --- a/content/xml/document/src/nsXMLContentSink.cpp +++ b/content/xml/document/src/nsXMLContentSink.cpp @@ -71,18 +71,15 @@ #include "nsHTMLAtoms.h" #include "nsContentUtils.h" #include "nsLayoutAtoms.h" -#include "nsContentCID.h" #include "nsIScriptContext.h" #include "nsINameSpace.h" #include "nsINameSpaceManager.h" #include "nsIServiceManager.h" #include "nsIScriptSecurityManager.h" #include "nsIContentViewer.h" -#include "jsapi.h" // for JSVERSION_* and JS_VersionToString #include "prtime.h" #include "prlog.h" #include "prmem.h" -#include "nsParserCIID.h" #include "nsParserUtils.h" #include "nsIScrollable.h" #include "nsRect.h" @@ -114,8 +111,6 @@ static const char kNameSpaceSeparator = ':'; static const char kLoadAsData[] = "loadAsData"; -static NS_DEFINE_CID(kXMLDocumentCID, NS_XMLDOCUMENT_CID); - class nsScriptLoaderObserverProxy : public nsIScriptLoaderObserver { public: diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp index 3156ce03a181..0a8444c7f32f 100644 --- a/layout/base/nsDocumentViewer.cpp +++ b/layout/base/nsDocumentViewer.cpp @@ -146,7 +146,6 @@ #include "nsISimpleEnumerator.h" #include "nsXPCOM.h" #include "nsISupportsPrimitives.h" -static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID); // PrintOptions is now implemented by PrintSettingsService static const char sPrintSettingsServiceContractID[] = "@mozilla.org/gfx/printsettings-service;1"; @@ -195,9 +194,7 @@ static const char sPrintOptionsContractID[] = "@mozilla.org/gfx/printset #include "nsBidiUtils.h" -static NS_DEFINE_CID(kPresShellCID, NS_PRESSHELL_CID); static NS_DEFINE_CID(kGalleyContextCID, NS_GALLEYCONTEXT_CID); -static NS_DEFINE_CID(kPrintContextCID, NS_PRINTCONTEXT_CID); static NS_DEFINE_CID(kStyleSetCID, NS_STYLESET_CID); #ifdef NS_DEBUG @@ -2136,8 +2133,6 @@ NS_IMETHODIMP DocumentViewerImpl::GetCanGetContents(PRBool *aCanGetContents) #pragma mark - #endif -static NS_DEFINE_IID(kDeviceContextSpecFactoryCID, NS_DEVICE_CONTEXT_SPEC_FACTORY_CID); - /* ======================================================================================== * nsIContentViewerFile * ======================================================================================== */ diff --git a/layout/printing/nsPrintEngine.cpp b/layout/printing/nsPrintEngine.cpp index 2d3313d4611d..6c455ad7e041 100644 --- a/layout/printing/nsPrintEngine.cpp +++ b/layout/printing/nsPrintEngine.cpp @@ -58,7 +58,6 @@ #include "nsISimpleEnumerator.h" #include "nsXPCOM.h" #include "nsISupportsPrimitives.h" -static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID); // PrintOptions is now implemented by PrintSettingsService static const char sPrintSettingsServiceContractID[] = "@mozilla.org/gfx/printsettings-service;1"; @@ -180,11 +179,7 @@ static const char kPrintingPromptService[] = "@mozilla.org/embedcomp/printingpro // New PrintPreview static NS_DEFINE_CID(kPrintPreviewContextCID, NS_PRINT_PREVIEW_CONTEXT_CID); - -static NS_DEFINE_CID(kPresShellCID, NS_PRESSHELL_CID); -static NS_DEFINE_CID(kGalleyContextCID, NS_GALLEYCONTEXT_CID); static NS_DEFINE_CID(kPrintContextCID, NS_PRINTCONTEXT_CID); -static NS_DEFINE_CID(kStyleSetCID, NS_STYLESET_CID); //----------------------------------------------------- // PR LOGGING diff --git a/layout/style/nsCSSLoader.cpp b/layout/style/nsCSSLoader.cpp index 0f278cbe818b..d3f983d687f2 100644 --- a/layout/style/nsCSSLoader.cpp +++ b/layout/style/nsCSSLoader.cpp @@ -99,9 +99,6 @@ static PRLogModuleInfo *gLoaderLog = PR_NewLogModule("nsCSSLoader"); #define LOG_URI(format, uri) #endif // PR_LOGGING -static NS_DEFINE_CID(kCharsetAliasCID, NS_CHARSETALIAS_CID); -static NS_DEFINE_CID(kCStringBundleServiceCID, NS_STRINGBUNDLESERVICE_CID); - // And some convenience strings... #ifdef PR_LOGGING static const char* const gStateStrings[] = {