Changing CID to ContractID and const char* to const char xxx[]

As part of Bug 144128

content/base/src/nsDocumentViewer.cpp

@@ -133,8 +133,8 @@
 static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID);
 
 // PrintOptions is now implemented by PrintSettingsService
-static const char* kPrintSettingsServiceCID = "@mozilla.org/gfx/printsettings-service;1";
-static const char* kPrintOptionsCID         = "@mozilla.org/gfx/printsettings-service;1";
+static const char sPrintSettingsServiceContractID[] = "@mozilla.org/gfx/printsettings-service;1";
+static const char sPrintOptionsContractID[]         = "@mozilla.org/gfx/printsettings-service;1";
 
 // Printing Events
 #include "nsIEventQueue.h"
@@ -6437,7 +6437,7 @@ DocumentViewerImpl::PrintPreview(nsIPrintSettings* aPrintSettings,
     GetGlobalPrintSettings(getter_AddRefs(mPrt->mPrintSettings));
   }
 
-  mPrt->mPrintOptions = do_GetService(kPrintOptionsCID, &rv);
+  mPrt->mPrintOptions = do_GetService(sPrintOptionsContractID, &rv);
   if (NS_SUCCEEDED(rv) && mPrt->mPrintOptions && mPrt->mPrintSettings) {
     // Get the default printer name and set it into the PrintSettings
     rv = CheckForPrinters(mPrt->mPrintOptions, mPrt->mPrintSettings, NS_ERROR_GFX_PRINTER_NO_PRINTER_AVAILABLE, PR_TRUE);
@@ -6746,7 +6746,7 @@ DocumentViewerImpl::Print(PRBool            aSilent,
   // if they don't pass in a PrintSettings, then make one
   // it will have all the default values
   printSettings = aPrintSettings;
-  nsCOMPtr<nsIPrintOptions> printOptions = do_GetService(kPrintOptionsCID, &rv);
+  nsCOMPtr<nsIPrintOptions> printOptions = do_GetService(sPrintOptionsContractID, &rv);
   if (NS_SUCCEEDED(rv)) {
     // if they don't pass in a PrintSettings, then make one
     if (printSettings == nsnull) {
@@ -6831,7 +6831,7 @@ DocumentViewerImpl::Print(nsIPrintSettings*       aPrintSettings,
     GetGlobalPrintSettings(getter_AddRefs(mPrt->mPrintSettings));
   }
 
-  mPrt->mPrintOptions = do_GetService(kPrintOptionsCID, &rv);
+  mPrt->mPrintOptions = do_GetService(sPrintOptionsContractID, &rv);
   if (NS_SUCCEEDED(rv) && mPrt->mPrintOptions && mPrt->mPrintSettings) {
     // Get the default printer name and set it into the PrintSettings
     rv = CheckForPrinters(mPrt->mPrintOptions, mPrt->mPrintSettings, NS_ERROR_GFX_PRINTER_NO_PRINTER_AVAILABLE, PR_TRUE);
@@ -8236,7 +8236,7 @@ DocumentViewerImpl::GetGlobalPrintSettings(nsIPrintSettings * *aGlobalPrintSetti
   NS_ENSURE_ARG_POINTER(aGlobalPrintSettings);
 
   nsresult rv = NS_ERROR_FAILURE;
-  nsCOMPtr<nsIPrintSettingsService> printSettingsService = do_GetService(kPrintSettingsServiceCID, &rv);
+  nsCOMPtr<nsIPrintSettingsService> printSettingsService = do_GetService(sPrintSettingsServiceContractID, &rv);
   if (NS_SUCCEEDED(rv)) {
     rv = printSettingsService->GetGlobalPrintSettings(aGlobalPrintSettings);
   }

embedding/components/printingui/src/os2/nsPrintingPromptService.cpp

@@ -55,7 +55,7 @@
 #include "nsIPrintOptions.h"
 #include "nsIServiceManager.h"
 #include "nsGfxCIID.h"
-static const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
+static const char sPrintOptionsContractID[] = "@mozilla.org/gfx/printsettings-service;1";
 
 static const char *kPrintDialogURL         = "chrome://global/content/printdialog.xul";
 static const char *kPrintProgressDialogURL = "chrome://global/content/printProgress.xul";
@@ -200,7 +200,7 @@ NS_IMETHODIMP
 nsPrintingPromptService::ShowPrinterProperties(nsIDOMWindow *parent, const PRUnichar *printerName, nsIPrintSettings *printSettings)
 {
   nsresult rv = NS_ERROR_FAILURE;
-  nsCOMPtr<nsIPrintOptions> printService = do_GetService(kPrintOptionsCID, &rv);
+  nsCOMPtr<nsIPrintOptions> printService = do_GetService(sPrintOptionsContractID, &rv);
   if (NS_SUCCEEDED(rv)) {
     PRBool displayed;
     rv = printService->DisplayJobProperties(printerName, printSettings, &displayed);

gfx/src/nsPrintOptionsImpl.cpp

@@ -1172,10 +1172,9 @@ public:
 };
 Tester::Tester()
 {
-  static const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
   nsCOMPtr<nsIPrintSettings> ps;
   nsresult rv;
-  nsCOMPtr<nsIPrintOptions> printService = do_GetService(kPrintOptionsCID, &rv);
+  nsCOMPtr<nsIPrintOptions> printService = do_GetService("@mozilla.org/gfx/printsettings-service;1", &rv);
   if (NS_SUCCEEDED(rv)) {
     rv = printService->CreatePrintSettings(getter_AddRefs(ps));
   }

layout/base/nsDocumentViewer.cpp

@@ -133,8 +133,8 @@
 static NS_DEFINE_IID(kPrinterEnumeratorCID, NS_PRINTER_ENUMERATOR_CID);
 
 // PrintOptions is now implemented by PrintSettingsService
-static const char* kPrintSettingsServiceCID = "@mozilla.org/gfx/printsettings-service;1";
-static const char* kPrintOptionsCID         = "@mozilla.org/gfx/printsettings-service;1";
+static const char sPrintSettingsServiceContractID[] = "@mozilla.org/gfx/printsettings-service;1";
+static const char sPrintOptionsContractID[]         = "@mozilla.org/gfx/printsettings-service;1";
 
 // Printing Events
 #include "nsIEventQueue.h"
@@ -6437,7 +6437,7 @@ DocumentViewerImpl::PrintPreview(nsIPrintSettings* aPrintSettings,
     GetGlobalPrintSettings(getter_AddRefs(mPrt->mPrintSettings));
   }
 
-  mPrt->mPrintOptions = do_GetService(kPrintOptionsCID, &rv);
+  mPrt->mPrintOptions = do_GetService(sPrintOptionsContractID, &rv);
   if (NS_SUCCEEDED(rv) && mPrt->mPrintOptions && mPrt->mPrintSettings) {
     // Get the default printer name and set it into the PrintSettings
     rv = CheckForPrinters(mPrt->mPrintOptions, mPrt->mPrintSettings, NS_ERROR_GFX_PRINTER_NO_PRINTER_AVAILABLE, PR_TRUE);
@@ -6746,7 +6746,7 @@ DocumentViewerImpl::Print(PRBool            aSilent,
   // if they don't pass in a PrintSettings, then make one
   // it will have all the default values
   printSettings = aPrintSettings;
-  nsCOMPtr<nsIPrintOptions> printOptions = do_GetService(kPrintOptionsCID, &rv);
+  nsCOMPtr<nsIPrintOptions> printOptions = do_GetService(sPrintOptionsContractID, &rv);
   if (NS_SUCCEEDED(rv)) {
     // if they don't pass in a PrintSettings, then make one
     if (printSettings == nsnull) {
@@ -6831,7 +6831,7 @@ DocumentViewerImpl::Print(nsIPrintSettings*       aPrintSettings,
     GetGlobalPrintSettings(getter_AddRefs(mPrt->mPrintSettings));
   }
 
-  mPrt->mPrintOptions = do_GetService(kPrintOptionsCID, &rv);
+  mPrt->mPrintOptions = do_GetService(sPrintOptionsContractID, &rv);
   if (NS_SUCCEEDED(rv) && mPrt->mPrintOptions && mPrt->mPrintSettings) {
     // Get the default printer name and set it into the PrintSettings
     rv = CheckForPrinters(mPrt->mPrintOptions, mPrt->mPrintSettings, NS_ERROR_GFX_PRINTER_NO_PRINTER_AVAILABLE, PR_TRUE);
@@ -8236,7 +8236,7 @@ DocumentViewerImpl::GetGlobalPrintSettings(nsIPrintSettings * *aGlobalPrintSetti
   NS_ENSURE_ARG_POINTER(aGlobalPrintSettings);
 
   nsresult rv = NS_ERROR_FAILURE;
-  nsCOMPtr<nsIPrintSettingsService> printSettingsService = do_GetService(kPrintSettingsServiceCID, &rv);
+  nsCOMPtr<nsIPrintSettingsService> printSettingsService = do_GetService(sPrintSettingsServiceContractID, &rv);
   if (NS_SUCCEEDED(rv)) {
     rv = printSettingsService->GetGlobalPrintSettings(aGlobalPrintSettings);
   }

layout/generic/nsSimplePageSequence.cpp

@@ -81,7 +81,7 @@ static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID);
 #include "nsGfxCIID.h"
 #include "nsIServiceManager.h"
 
-static const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
+static const char sPrintOptionsContractID[] = "@mozilla.org/gfx/printsettings-service;1";
 
 //
 static NS_DEFINE_CID(kRegionCID, NS_REGION_CID);
@@ -171,7 +171,7 @@ nsSimplePageSequenceFrame::nsSimplePageSequenceFrame() :
   // XXX this code and the object data member "mIsPrintingSelection" is only needed
   // for the hack for printing selection where we make the page the max size
   nsresult rv;
-  mPageData->mPrintOptions = do_GetService(kPrintOptionsCID, &rv);
+  mPageData->mPrintOptions = do_GetService(sPrintOptionsContractID, &rv);
   if (NS_SUCCEEDED(rv) && mPageData->mPrintOptions) {
     // now get the default font form the print options
     mPageData->mPrintOptions->GetDefaultFont(*mPageData->mHeadFootFont);

layout/html/base/src/nsSimplePageSequence.cpp

@@ -81,7 +81,7 @@ static NS_DEFINE_CID(kLocaleServiceCID, NS_LOCALESERVICE_CID);
 #include "nsGfxCIID.h"
 #include "nsIServiceManager.h"
 
-static const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1";
+static const char sPrintOptionsContractID[] = "@mozilla.org/gfx/printsettings-service;1";
 
 //
 static NS_DEFINE_CID(kRegionCID, NS_REGION_CID);
@@ -171,7 +171,7 @@ nsSimplePageSequenceFrame::nsSimplePageSequenceFrame() :
   // XXX this code and the object data member "mIsPrintingSelection" is only needed
   // for the hack for printing selection where we make the page the max size
   nsresult rv;
-  mPageData->mPrintOptions = do_GetService(kPrintOptionsCID, &rv);
+  mPageData->mPrintOptions = do_GetService(sPrintOptionsContractID, &rv);
   if (NS_SUCCEEDED(rv) && mPageData->mPrintOptions) {
     // now get the default font form the print options
     mPageData->mPrintOptions->GetDefaultFont(*mPageData->mHeadFootFont);