From f38fde0cc7e0711314eeaffff39b0e4d8060facc Mon Sep 17 00:00:00 2001 From: Jonathan Watt Date: Tue, 19 Dec 2017 11:05:37 +0000 Subject: [PATCH] Bug 144114 part 3 - Clean up the headers of the nsPrintSettingsService subclasses. r=bobowen * * * [mq]: dtor MozReview-Commit-ID: 8ghrXxeKiHF --- .../android/nsPrintSettingsServiceAndroid.h | 1 - widget/cocoa/nsPrintSettingsServiceX.h | 28 +++++++++++-------- widget/gtk/nsPrintSettingsServiceGTK.h | 20 ++++++------- widget/nsPrintSettingsImpl.cpp | 12 -------- widget/nsPrintSettingsService.cpp | 4 --- widget/nsPrintSettingsService.h | 21 ++++++++------ widget/windows/nsPrintSettingsServiceWin.h | 12 ++++---- 7 files changed, 41 insertions(+), 57 deletions(-) diff --git a/widget/android/nsPrintSettingsServiceAndroid.h b/widget/android/nsPrintSettingsServiceAndroid.h index 1a03c2ca253e..de9271ef9fa9 100644 --- a/widget/android/nsPrintSettingsServiceAndroid.h +++ b/widget/android/nsPrintSettingsServiceAndroid.h @@ -12,7 +12,6 @@ class nsPrintSettingsServiceAndroid final : public nsPrintSettingsService { public: nsPrintSettingsServiceAndroid() {} - virtual ~nsPrintSettingsServiceAndroid() {} nsresult _CreatePrintSettings(nsIPrintSettings** _retval) override; }; diff --git a/widget/cocoa/nsPrintSettingsServiceX.h b/widget/cocoa/nsPrintSettingsServiceX.h index 72cb1bcdd1bf..2d7563305191 100644 --- a/widget/cocoa/nsPrintSettingsServiceX.h +++ b/widget/cocoa/nsPrintSettingsServiceX.h @@ -8,11 +8,9 @@ #include "nsPrintSettingsService.h" -namespace mozilla -{ -namespace embedding -{ - class PrintData; +namespace mozilla { +namespace embedding { +class PrintData; } // namespace embedding } // namespace mozilla @@ -20,9 +18,8 @@ class nsPrintSettingsServiceX final : public nsPrintSettingsService { public: nsPrintSettingsServiceX() {} - virtual ~nsPrintSettingsServiceX() {} - /* + /** * These serialize and deserialize methods are not symmetrical in that * printSettingsX != deserialize(serialize(printSettingsX)). This is because * the native print settings stored in the nsPrintSettingsX's NSPrintInfo @@ -31,14 +28,21 @@ public: */ NS_IMETHODIMP SerializeToPrintData(nsIPrintSettings* aSettings, nsIWebBrowserPrint* aWBP, - mozilla::embedding::PrintData* data); + mozilla::embedding::PrintData* data) override; + NS_IMETHODIMP DeserializeToPrintSettings(const mozilla::embedding::PrintData& data, - nsIPrintSettings* settings); + nsIPrintSettings* settings) override; protected: - nsresult _CreatePrintSettings(nsIPrintSettings **_retval); - nsresult ReadPrefs(nsIPrintSettings* aPS, const nsAString& aPrinterName, uint32_t aFlags); - nsresult WritePrefs(nsIPrintSettings* aPS, const nsAString& aPrinterName, uint32_t aFlags); + nsresult ReadPrefs(nsIPrintSettings* aPS, + const nsAString& aPrinterName, + uint32_t aFlags) override; + + nsresult WritePrefs(nsIPrintSettings* aPS, + const nsAString& aPrinterName, + uint32_t aFlags) override; + + nsresult _CreatePrintSettings(nsIPrintSettings** _retval) override; private: /* Serialization done in child to be deserialized in the parent */ diff --git a/widget/gtk/nsPrintSettingsServiceGTK.h b/widget/gtk/nsPrintSettingsServiceGTK.h index c5bdc45ef3b0..6e951a1d1329 100644 --- a/widget/gtk/nsPrintSettingsServiceGTK.h +++ b/widget/gtk/nsPrintSettingsServiceGTK.h @@ -9,11 +9,9 @@ #include "nsPrintSettingsService.h" -namespace mozilla -{ -namespace embedding -{ - class PrintData; +namespace mozilla { +namespace embedding { +class PrintData; } // namespace embedding } // namespace mozilla @@ -21,17 +19,15 @@ class nsPrintSettingsServiceGTK final : public nsPrintSettingsService { public: nsPrintSettingsServiceGTK() {} - virtual ~nsPrintSettingsServiceGTK() {} NS_IMETHODIMP SerializeToPrintData(nsIPrintSettings* aSettings, nsIWebBrowserPrint* aWBP, - mozilla::embedding::PrintData* data); - NS_IMETHODIMP DeserializeToPrintSettings(const mozilla::embedding::PrintData& data, - nsIPrintSettings* settings); + mozilla::embedding::PrintData* data) override; - virtual nsresult _CreatePrintSettings(nsIPrintSettings **_retval); + NS_IMETHODIMP DeserializeToPrintSettings(const mozilla::embedding::PrintData& data, + nsIPrintSettings* settings) override; + + virtual nsresult _CreatePrintSettings(nsIPrintSettings** _retval) override; }; - - #endif // nsPrintSettingsServiceGTK_h diff --git a/widget/nsPrintSettingsImpl.cpp b/widget/nsPrintSettingsImpl.cpp index fd998708a872..9cbb6e3f992a 100644 --- a/widget/nsPrintSettingsImpl.cpp +++ b/widget/nsPrintSettingsImpl.cpp @@ -12,10 +12,6 @@ NS_IMPL_ISUPPORTS(nsPrintSettings, nsIPrintSettings) -/** --------------------------------------------------- - * See documentation in nsPrintSettingsImpl.h - * @update 6/21/00 dwc - */ nsPrintSettings::nsPrintSettings() : mPrintOptions(0L), mPrintRange(kRangeAllPages), @@ -63,19 +59,11 @@ nsPrintSettings::nsPrintSettings() : } -/** --------------------------------------------------- - * See documentation in nsPrintSettingsImpl.h - * @update 6/21/00 dwc - */ nsPrintSettings::nsPrintSettings(const nsPrintSettings& aPS) { *this = aPS; } -/** --------------------------------------------------- - * See documentation in nsPrintSettingsImpl.h - * @update 6/21/00 dwc - */ nsPrintSettings::~nsPrintSettings() { } diff --git a/widget/nsPrintSettingsService.cpp b/widget/nsPrintSettingsService.cpp index c687df1d3bb2..ad50088a4808 100644 --- a/widget/nsPrintSettingsService.cpp +++ b/widget/nsPrintSettingsService.cpp @@ -666,10 +666,6 @@ nsPrintSettingsService::ReadPrefs(nsIPrintSettings* aPS, return NS_OK; } -/** --------------------------------------------------- - * See documentation in nsPrintSettingsService.h - * @update 1/12/01 rods - */ nsresult nsPrintSettingsService::WritePrefs(nsIPrintSettings* aPS, const nsAString& aPrinterName, diff --git a/widget/nsPrintSettingsService.h b/widget/nsPrintSettingsService.h index 9670c91991da..6fb556c50918 100644 --- a/widget/nsPrintSettingsService.h +++ b/widget/nsPrintSettingsService.h @@ -35,6 +35,11 @@ public: */ virtual nsresult Init(); +private: + // Copying is not supported. + nsPrintSettingsService(const nsPrintSettingsService& x) = delete; + nsPrintSettingsService& operator=(const nsPrintSettingsService& x) = delete; + protected: virtual ~nsPrintSettingsService() {} @@ -59,17 +64,20 @@ protected: * @param aPrinterName the name of the printer for which to read prefs * @param aFlags flag specifying which prefs to read */ - virtual nsresult ReadPrefs(nsIPrintSettings* aPS, const nsAString& - aPrinterName, uint32_t aFlags); + virtual nsresult ReadPrefs(nsIPrintSettings* aPS, + const nsAString& aPrinterName, + uint32_t aFlags); /** * method WritePrefs * @param aPS a pointer to the printer settings * @param aPrinterName the name of the printer for which to write prefs * @param aFlags flag specifying which prefs to read */ - virtual nsresult WritePrefs(nsIPrintSettings* aPS, const nsAString& aPrefName, + virtual nsresult WritePrefs(nsIPrintSettings* aPS, + const nsAString& aPrinterName, uint32_t aFlags); - const char* GetPrefName(const char * aPrefName, + + const char* GetPrefName(const char* aPrefName, const nsAString& aPrinterName); /** @@ -84,11 +92,6 @@ protected: nsCOMPtr mGlobalPrintSettings; nsCString mPrefName; - -private: - // These are not supported and are not implemented! - nsPrintSettingsService(const nsPrintSettingsService& x) = delete; - nsPrintSettingsService& operator=(const nsPrintSettingsService& x) = delete; }; #endif // nsPrintSettingsService_h diff --git a/widget/windows/nsPrintSettingsServiceWin.h b/widget/windows/nsPrintSettingsServiceWin.h index 4275cdc065ec..2b36f314754c 100644 --- a/widget/windows/nsPrintSettingsServiceWin.h +++ b/widget/windows/nsPrintSettingsServiceWin.h @@ -17,17 +17,15 @@ class nsPrintSettingsServiceWin final : public nsPrintSettingsService { public: nsPrintSettingsServiceWin() {} - virtual ~nsPrintSettingsServiceWin() {} NS_IMETHODIMP SerializeToPrintData(nsIPrintSettings* aSettings, nsIWebBrowserPrint* aWBP, - mozilla::embedding::PrintData* data); - NS_IMETHODIMP DeserializeToPrintSettings(const mozilla::embedding::PrintData& data, - nsIPrintSettings* settings); + mozilla::embedding::PrintData* data) override; - virtual nsresult _CreatePrintSettings(nsIPrintSettings **_retval); + NS_IMETHODIMP DeserializeToPrintSettings(const mozilla::embedding::PrintData& data, + nsIPrintSettings* settings) override; + + nsresult _CreatePrintSettings(nsIPrintSettings** _retval) override; }; - - #endif // nsPrintSettingsServiceWin_h