Bug 25886: Get rid of a bunch of unused NS_DEFINE_IID, NS_DEFINE_CID. r=caillon, sr=dbaron

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

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()
 {

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);
 

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)
 {

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)
 {

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)

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)
 {

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);
 

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

embedding/browser/photon/src/EmbedPrivate.cpp

@@ -30,9 +30,6 @@
 #include "nsReadableUtils.h"
 #include "nsIWidget.h"
 
-// for NS_APPSHELL_CID
-#include <nsWidgetsCID.h>
-
 // for do_GetInterface
 #include <nsIInterfaceRequestor.h>
 #include <nsIInterfaceRequestorUtils.h>
@@ -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 <nsIFocusController.h>
@@ -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;

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}}

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 <InternetConfig.h>
 
-static NS_DEFINE_IID(kWindowCID, NS_WINDOW_CID);
-
 const nsCString CBrowserShell::kEmptyCString;
 nsCOMPtr<nsIDragHelperService> CBrowserShell::sDragHelper;
 

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

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()

extensions/pics/src/nsPICSElementObserver.cpp

@@ -1,269 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Pierre Phaneuf <pp@ludusdesign.com>
- *
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "pratom.h"
-#include "nsIFactory.h"
-#include "nsIServiceManager.h"
-#include "nsIComponentManager.h"
-//#include "nsIObserver.h"
-#include "nsIURL.h"
-#include "nsIIOService.h"
-#include "nsIURL.h"
-#include "nsIServiceManager.h"
-static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
-#include "nsPICSElementObserver.h"
-#include "nsString.h"
-#include "nsReadableUtils.h"
-#include "nsIPICS.h"
-#include "nspics.h"
-#include "nsIWebShellServices.h"
-#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);
-
-
-
-
-////////////////////////////////////////////////////////////////////////////////
-// nsPICSElementObserver Implementation
-
-
-NS_IMPL_ADDREF(nsPICSElementObserver)                       \
-NS_IMPL_RELEASE(nsPICSElementObserver)
-
-
-NS_INTERFACE_MAP_BEGIN(nsPICSElementObserver)
-		/*
-			Slight problem here: there is no |class nsIPICSElementObserver|,
-			so, this is a slightly un-orthodox entry, which will have to be
-			fixed before we could switch over to the table-driven mechanism.
-		 */
-	if ( aIID.Equals(kIPICSElementObserverIID) )
-	  foundInterface = NS_STATIC_CAST(nsIElementObserver*, this);
-	else
-
-	NS_INTERFACE_MAP_ENTRY(nsIElementObserver)
-	NS_INTERFACE_MAP_ENTRY(nsIObserver)
-	NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference)
-	NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIElementObserver)
-NS_INTERFACE_MAP_END
-
-
-NS_PICS nsresult NS_NewPICSElementObserver(nsIObserver** anObserver)
-{
-    if (anObserver == NULL)
-    {
-        return NS_ERROR_NULL_POINTER;
-    } 
-    
-    nsPICSElementObserver* it = new nsPICSElementObserver();
-
-    if (it == 0) {
-        return NS_ERROR_OUT_OF_MEMORY;
-    }
-
-    return it->QueryInterface(kIPICSElementObserverIID, (void **) anObserver);
-}
-
-nsPICSElementObserver::nsPICSElementObserver()
-{
-}
-
-nsPICSElementObserver::~nsPICSElementObserver(void)
-{
-
-}
-
-const char* nsPICSElementObserver::GetTagNameAt(PRUint32 aTagIndex)
-{
-  if (aTagIndex == 0) {
-    return "META";
-  } if (aTagIndex == 1) {
-    return "BODY";
-  }else {
-    return nsnull;
-  }
-}
-
-NS_IMETHODIMP nsPICSElementObserver::Notify(PRUint32 aDocumentID, eHTMLTags aTag, 
-                    PRUint32 numOfAttributes, const PRUnichar* nameArray[], 
-                    const PRUnichar* valueArray[]) 
-{
-  if(aTag == eHTMLTag_meta) {
-      return Notify(aDocumentID, numOfAttributes, nameArray, valueArray);
-  }
-  return NS_OK;
-}
-NS_IMETHODIMP nsPICSElementObserver::Notify(PRUint32 aDocumentID, const PRUnichar* aTag, 
-                    PRUint32 numOfAttributes, const PRUnichar* nameArray[], 
-                    const PRUnichar* valueArray[]) 
-{
-  return Notify(aDocumentID, numOfAttributes, nameArray, valueArray);
-}
-NS_IMETHODIMP nsPICSElementObserver::Notify(PRUint32 aDocumentID,  
-                    PRUint32 numOfAttributes, const PRUnichar* nameArray[], 
-                    const PRUnichar* valueArray[]) 
-{
-  nsresult rv;
-  int status;
-  nsIWebShellServices* ws;
-//  nsString theURL(aSpec);
-// char* url = ToNewCString(aSpec);
-  nsIURI* uaURL = nsnull;
-//  rv = NS_NewURL(&uaURL, nsString(aSpec));
- 
-    if(numOfAttributes >= 2) {
-      const nsString& theValue1=valueArray[0];
-      char *val1 = ToNewCString(theValue1);
-      if(theValue1.EqualsIgnoreCase("\"PICS-LABEL\"")) {
-#ifdef DEBUG
-        printf("\nReceived notification for a PICS-LABEl\n");
-#endif
-        const nsString& theValue2=valueArray[1];
-        char *label = ToNewCString(theValue2);
-        if (valueArray[numOfAttributes]) {
-          const nsString& theURLValue=valueArray[numOfAttributes];
-          nsCOMPtr<nsIIOService> service(do_GetService(kIOServiceCID, &rv));
-          if (NS_FAILED(rv)) return rv;
-
-          nsIURI *uri = nsnull;
-          const char *uriStr = theURLValue.GetBuffer();
-          rv = service->NewURI(uriStr, nsnull, &uri);
-          if (NS_FAILED(rv)) return rv;
-
-          rv = uri->QueryInterface(NS_GET_IID(nsIURI), (void**)&uaURL);
-          NS_RELEASE(uri);
-          if (NS_FAILED(rv)) return rv;
-        }
-        nsIPICS *pics = NULL;
-        rv = nsRepository::CreateInstance(kPICSCID,
-								        NULL,
-								        kIPICSIID,
-								        (void **) &pics);
-        if(rv == NS_OK) {
-          pics->GetWebShell(aDocumentID, ws);
-          if(ws) {
-            status = pics->ProcessPICSLabel(label);
-            if(uaURL)
-              pics->SetNotified(ws, uaURL, PR_TRUE);
-
-            if(status) {
-              if(ws) {
-                char * text = PR_GetEnv("NGLAYOUT_HOME");
-                nsString mtemplateURL(text ? text : "resource:/res/samples/picstest1.html");
-                //  ws->LoadURL(mtemplateURL, nsnull, nsnull);
-                PRInt32 s;
-                ws->SetRendering(PR_TRUE);
-                ws->StopDocumentLoad();
-                ws->LoadDocument("resource:/res/samples/picstest1.html", nsnull, s);
-              }
-            }
-          }
-        } 
-      }
-    }
-  return NS_OK;
-    
-}
-
-NS_IMETHODIMP nsPICSElementObserver::Observe(nsISupports*, const PRUnichar*, const PRUnichar*) 
-{
-    return NS_ERROR_NOT_IMPLEMENTED;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////
-// nsPICSElementObserverFactory Implementation
-
-NS_IMPL_ISUPPORTS1(nsPICSElementObserverFactory, nsIFactory)
-
-nsPICSElementObserverFactory::nsPICSElementObserverFactory(void)
-{
-}
-
-nsPICSElementObserverFactory::~nsPICSElementObserverFactory(void)
-{
-
-}
-
-nsresult
-nsPICSElementObserverFactory::CreateInstance(nsISupports *aOuter, REFNSIID aIID, void **aResult)
-{
-    if (! aResult)
-        return NS_ERROR_NULL_POINTER;
-    
-    if (aOuter)
-        return NS_ERROR_NO_AGGREGATION;
-
-    *aResult = nsnull;
-
-    nsresult rv;
-    nsIObserver* inst = nsnull;
-
-    if (NS_FAILED(rv = NS_NewPICSElementObserver(&inst)))
-        return rv;
-
-    if (!inst)
-        return NS_ERROR_OUT_OF_MEMORY;
-
-    rv = inst->QueryInterface(aIID, aResult);
-
-    if (NS_FAILED(rv)) {
-        *aResult = NULL;
-    }
-    return rv;
-}
-
-nsresult
-nsPICSElementObserverFactory::LockFactory(PRBool aLock)
-{
-    return NS_OK;
-}
-
-
-////////////////////////////////////////////////////////////////////////////////

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;

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);

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;

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"

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

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
 /////////////////////////////////////////////////////////////////////////

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

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)

gfx/src/beos/nsRegionBeOS.cpp

@@ -45,7 +45,6 @@
 static int nRegions; 
 #endif 
 
-static NS_DEFINE_IID(kRegionIID, NS_IREGION_IID);
 
 nsRegionBeOS :: nsRegionBeOS()
 {

gfx/src/beos/nsRenderingContextBeOS.cpp

@@ -47,7 +47,6 @@
 #include <Polygon.h>
 #include <math.h>
 
-static NS_DEFINE_IID(kRenderingContextIID, NS_IRENDERING_CONTEXT_IID);
 
 NS_IMPL_THREADSAFE_ISUPPORTS1(nsRenderingContextBeOS, nsIRenderingContext)
 

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); 

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)
 

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();

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()

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)
 

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

gfx/src/photon/nsRenderingContextPh.cpp

@@ -50,9 +50,6 @@
 #include <mem.h>
 #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;

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

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

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;
 

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-*-*-*-*-*-*"

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,

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()
 {

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); 

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";
  
 

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);
 
 //-------------------------------------------------------------------

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() {

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);
 
 //----------------------------------------------------------------------
 

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);

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(

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() 

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,

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);
-
  
 ///////////////////////////////////////////////////////////////////////////////////////////
 

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)

intl/locale/src/mac/nsMacLocale.cpp

@@ -46,8 +46,6 @@
 #include "prprf.h"
 #include <Script.h>
 
-NS_DEFINE_IID(kMacLocaleCID, NS_MACLOCALE_CID);
-
 struct iso_lang_map
 {
 	char*	iso_code;

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)
 

intl/locale/src/windows/nsIWin32LocaleImpl.cpp

@@ -47,8 +47,6 @@
 #include <Windows.h>
 #include "nsCRT.h"
 
-NS_DEFINE_IID(kIWin32LocaleImplCID, NS_WIN32LOCALE_CID);
-
 #define USER_DEFINED_PRIMARYLANG	0x0200
 #define USER_DEFINED_SUBLANGUAGE	0x20
 

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);

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);
 

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);
 
 

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

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

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 */

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()

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);

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-"
 

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

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-"
 

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] =

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

layout/base/nsCaret.cpp

@@ -79,8 +79,6 @@
 //------------------------------END OF IBM BIDI--------------------------------
 #endif //IBMBIDI
 
-static NS_DEFINE_CID(kLookAndFeelCID,  NS_LOOKANDFEEL_CID);
-
 //-----------------------------------------------------------------------------
 
 nsCaret::nsCaret()

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()

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

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)

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

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 

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

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 

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;

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 * *)

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)
 

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"

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);

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)

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);
 

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
 //////////////////////////////////////////////////////////////////////////////

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;

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;

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)

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)

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)

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)
 {

mailnews/compose/src/nsMsgCreate.cpp

@@ -68,9 +68,6 @@
 #include "nsMsgBaseCID.h"
 
 
-// CID's needed
-static NS_DEFINE_CID(kPrefCID,            NS_PREF_CID);
-
 //
 // Implementation...
 //

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

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)
 
 

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)

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

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);

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);

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);

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)
 {

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)

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"

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 ";