From 68b0319c10742b9c6586229c89ceb894f8e6b22a Mon Sep 17 00:00:00 2001 From: "rods%netscape.com" Date: Tue, 14 May 2002 14:32:42 +0000 Subject: [PATCH] Changing CID to ContractID and const char* to const char xxx[] As part of Bug 144128 --- content/base/src/nsDocumentViewer.cpp | 12 ++++++------ .../printingui/src/os2/nsPrintingPromptService.cpp | 4 ++-- gfx/src/nsPrintOptionsImpl.cpp | 3 +-- layout/base/nsDocumentViewer.cpp | 12 ++++++------ layout/generic/nsSimplePageSequence.cpp | 4 ++-- layout/html/base/src/nsSimplePageSequence.cpp | 4 ++-- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/content/base/src/nsDocumentViewer.cpp b/content/base/src/nsDocumentViewer.cpp index e9d3f181fbbc..fd81ecbf4699 100644 --- a/content/base/src/nsDocumentViewer.cpp +++ b/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 printOptions = do_GetService(kPrintOptionsCID, &rv); + nsCOMPtr 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 printSettingsService = do_GetService(kPrintSettingsServiceCID, &rv); + nsCOMPtr printSettingsService = do_GetService(sPrintSettingsServiceContractID, &rv); if (NS_SUCCEEDED(rv)) { rv = printSettingsService->GetGlobalPrintSettings(aGlobalPrintSettings); } diff --git a/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp b/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp index 55ee415f6ca5..679e628eb3c8 100644 --- a/embedding/components/printingui/src/os2/nsPrintingPromptService.cpp +++ b/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 printService = do_GetService(kPrintOptionsCID, &rv); + nsCOMPtr printService = do_GetService(sPrintOptionsContractID, &rv); if (NS_SUCCEEDED(rv)) { PRBool displayed; rv = printService->DisplayJobProperties(printerName, printSettings, &displayed); diff --git a/gfx/src/nsPrintOptionsImpl.cpp b/gfx/src/nsPrintOptionsImpl.cpp index 7de55975edad..0101523de00f 100644 --- a/gfx/src/nsPrintOptionsImpl.cpp +++ b/gfx/src/nsPrintOptionsImpl.cpp @@ -1172,10 +1172,9 @@ public: }; Tester::Tester() { - static const char* kPrintOptionsCID = "@mozilla.org/gfx/printsettings-service;1"; nsCOMPtr ps; nsresult rv; - nsCOMPtr printService = do_GetService(kPrintOptionsCID, &rv); + nsCOMPtr printService = do_GetService("@mozilla.org/gfx/printsettings-service;1", &rv); if (NS_SUCCEEDED(rv)) { rv = printService->CreatePrintSettings(getter_AddRefs(ps)); } diff --git a/layout/base/nsDocumentViewer.cpp b/layout/base/nsDocumentViewer.cpp index e9d3f181fbbc..fd81ecbf4699 100644 --- a/layout/base/nsDocumentViewer.cpp +++ b/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 printOptions = do_GetService(kPrintOptionsCID, &rv); + nsCOMPtr 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 printSettingsService = do_GetService(kPrintSettingsServiceCID, &rv); + nsCOMPtr printSettingsService = do_GetService(sPrintSettingsServiceContractID, &rv); if (NS_SUCCEEDED(rv)) { rv = printSettingsService->GetGlobalPrintSettings(aGlobalPrintSettings); } diff --git a/layout/generic/nsSimplePageSequence.cpp b/layout/generic/nsSimplePageSequence.cpp index 6214801a20ac..81e15184e7dd 100644 --- a/layout/generic/nsSimplePageSequence.cpp +++ b/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); diff --git a/layout/html/base/src/nsSimplePageSequence.cpp b/layout/html/base/src/nsSimplePageSequence.cpp index 6214801a20ac..81e15184e7dd 100644 --- a/layout/html/base/src/nsSimplePageSequence.cpp +++ b/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);