Bug 144114 part 1 - Rename the files for nsPrintOptions and its subclasses. r=bobowen

MozReview-Commit-ID: EcotGH6pXCR

--HG--
rename : widget/android/nsPrintOptionsAndroid.cpp => widget/android/nsPrintSettingsServiceAndroid.cpp
rename : widget/android/nsPrintOptionsAndroid.h => widget/android/nsPrintSettingsServiceAndroid.h
rename : widget/cocoa/nsPrintOptionsX.h => widget/cocoa/nsPrintSettingsServiceX.h
rename : widget/cocoa/nsPrintOptionsX.mm => widget/cocoa/nsPrintSettingsServiceX.mm
rename : widget/gtk/nsPrintOptionsGTK.cpp => widget/gtk/nsPrintSettingsServiceGTK.cpp
rename : widget/gtk/nsPrintOptionsGTK.h => widget/gtk/nsPrintSettingsServiceGTK.h
rename : widget/nsPrintOptionsImpl.cpp => widget/nsPrintSettingsService.cpp
rename : widget/nsPrintOptionsImpl.h => widget/nsPrintSettingsService.h
rename : widget/windows/nsPrintOptionsWin.cpp => widget/windows/nsPrintSettingsServiceWin.cpp
rename : widget/windows/nsPrintOptionsWin.h => widget/windows/nsPrintSettingsServiceWin.h

toolkit/components/printingui/ipc/nsPrintingProxy.cpp

@@ -16,7 +16,7 @@
 #include "nsIPrintingPromptService.h"
 #include "nsIPrintSession.h"
 #include "nsPIDOMWindow.h"
-#include "nsPrintOptionsImpl.h"
+#include "nsPrintSettingsService.h"
 #include "nsServiceManagerUtils.h"
 #include "PrintDataUtils.h"
 #include "PrintProgressDialogChild.h"

widget/android/moz.build

@@ -51,7 +51,7 @@ UNIFIED_SOURCES += [
     'nsIdleServiceAndroid.cpp',
     'nsLookAndFeel.cpp',
     'nsNativeThemeAndroid.cpp',
-    'nsPrintOptionsAndroid.cpp',
+    'nsPrintSettingsServiceAndroid.cpp',
     'nsScreenManagerAndroid.cpp',
     'nsWidgetFactory.cpp',
     'nsWindow.cpp',

widget/android/nsPrintSettingsServiceAndroid.cpp

@@ -2,7 +2,7 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include "nsPrintOptionsAndroid.h"
+#include "nsPrintSettingsServiceAndroid.h"
 
 #include "nsPrintSettingsImpl.h"
 

widget/android/nsPrintSettingsServiceAndroid.h

@@ -5,7 +5,7 @@
 #ifndef nsPrintOptionsAndroid_h__
 #define nsPrintOptionsAndroid_h__
 
-#include "nsPrintOptionsImpl.h"
+#include "nsPrintSettingsService.h"
 #include "nsIPrintSettings.h"
 
 //*****************************************************************************

widget/android/nsWidgetFactory.cpp

@@ -20,8 +20,8 @@
 #include "nsClipboard.h"
 #include "nsClipboardHelper.h"
 #include "nsTransferable.h"
-#include "nsPrintOptionsAndroid.h"
 #include "nsPrintSession.h"
+#include "nsPrintSettingsServiceAndroid.h"
 #include "nsDeviceContextAndroid.h"
 #include "nsHTMLFormatConverter.h"
 #include "nsXULAppAPI.h"

widget/cocoa/moz.build

@@ -47,7 +47,7 @@ UNIFIED_SOURCES += [
     'nsMenuUtilsX.mm',
     'nsMenuX.mm',
     'nsPrintDialogX.mm',
-    'nsPrintOptionsX.mm',
+    'nsPrintSettingsServiceX.mm',
     'nsPrintSettingsX.mm',
     'nsSound.mm',
     'nsStandaloneNativeMenu.mm',

widget/cocoa/nsPrintSettingsServiceX.h

@@ -6,7 +6,7 @@
 #ifndef nsPrintOptionsX_h_
 #define nsPrintOptionsX_h_
 
-#include "nsPrintOptionsImpl.h"
+#include "nsPrintSettingsService.h"
 
 namespace mozilla
 {

widget/cocoa/nsPrintSettingsServiceX.mm

@@ -3,10 +3,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#include "nsPrintSettingsServiceX.h"
+
 #include "nsCOMPtr.h"
 #include "nsQueryObject.h"
 #include "nsIServiceManager.h"
-#include "nsPrintOptionsX.h"
 #include "nsPrintSettingsX.h"
 #include "nsIWebBrowserPrint.h"
 #include "nsCocoaUtils.h"

widget/cocoa/nsWidgetFactory.mm

@@ -35,7 +35,7 @@
 #include "OSXNotificationCenter.h"
 
 #include "nsDeviceContextSpecX.h"
-#include "nsPrintOptionsX.h"
+#include "nsPrintSettingsServiceX.h"
 #include "nsPrintDialogX.h"
 #include "nsPrintSession.h"
 #include "nsToolkitCompsCID.h"

widget/gtk/moz.build

@@ -71,8 +71,8 @@ if CONFIG['NS_PRINTING']:
         'nsCUPSShim.cpp',
         'nsDeviceContextSpecG.cpp',
         'nsPrintDialogGTK.cpp',
-        'nsPrintOptionsGTK.cpp',
         'nsPrintSettingsGTK.cpp',
+        'nsPrintSettingsServiceGTK.cpp',
         'nsPSPrinters.cpp',
     ]
 

widget/gtk/nsPrintSettingsServiceGTK.cpp

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsPrintOptionsGTK.h"
+#include "nsPrintSettingsServiceGTK.h"
 #include "nsPrintSettingsGTK.h"
 
 using namespace mozilla::embedding;

widget/gtk/nsPrintSettingsServiceGTK.h

@@ -7,7 +7,7 @@
 #ifndef nsPrintOptionsGTK_h__
 #define nsPrintOptionsGTK_h__
 
-#include "nsPrintOptionsImpl.h"
+#include "nsPrintSettingsService.h"
 
 namespace mozilla
 {

widget/gtk/nsWidgetFactory.cpp

@@ -34,7 +34,7 @@
 #include "WakeLockListener.h"
 
 #ifdef NS_PRINTING
-#include "nsPrintOptionsGTK.h"
+#include "nsPrintSettingsServiceGTK.h"
 #include "nsPrintSession.h"
 #include "nsDeviceContextSpecG.h"
 #endif

widget/moz.build

@@ -214,12 +214,12 @@ if CONFIG['OS_ARCH'] == 'Linux':
 if CONFIG['MOZ_XUL'] and CONFIG['NS_PRINTING']:
     EXPORTS += [
         'nsDeviceContextSpecProxy.h',
-        'nsPrintOptionsImpl.h',
+        'nsPrintSettingsService.h',
     ]
     UNIFIED_SOURCES += [
         'nsDeviceContextSpecProxy.cpp',
-        'nsPrintOptionsImpl.cpp',
         'nsPrintSession.cpp',
+        'nsPrintSettingsService.cpp',
     ]
 
 # nsBaseWidget.cpp needs to be built separately because of name clashes in the OS X headers

widget/nsPrintSettingsService.cpp

@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "nsPrintOptionsImpl.h"
+#include "nsPrintSettingsService.h"
 
 #include "mozilla/embedding/PPrinting.h"
 #include "mozilla/layout/RemotePrintJobChild.h"

widget/windows/moz.build

@@ -98,7 +98,7 @@ if CONFIG['NS_PRINTING']:
         'nsDeviceContextSpecWin.cpp',
         'nsPrintDialogUtil.cpp',
         'nsPrintDialogWin.cpp',
-        'nsPrintOptionsWin.cpp',
+        'nsPrintSettingsServiceWin.cpp',
         'nsPrintSettingsWin.cpp',
     ]
 

widget/windows/nsPrintSettingsServiceWin.cpp

@@ -2,8 +2,10 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "nsPrintSettingsServiceWin.h"
+
 #include "nsCOMPtr.h"
-#include "nsPrintOptionsWin.h"
 #include "nsPrintSettingsWin.h"
 #include "nsPrintDialogUtil.h"
 

widget/windows/nsPrintSettingsServiceWin.h

@@ -8,7 +8,7 @@
 #define nsPrintOptionsWin_h__
 
 #include "mozilla/embedding/PPrinting.h"
-#include "nsPrintOptionsImpl.h"  
+#include "nsPrintSettingsService.h"
 
 class nsIPrintSettings;
 class nsIWebBrowserPrint;

widget/windows/nsWidgetFactory.cpp

@@ -50,7 +50,7 @@
 #ifdef NS_PRINTING
 #include "nsDeviceContextSpecWin.h"
 #include "nsPrintDialogWin.h"
-#include "nsPrintOptionsWin.h"
+#include "nsPrintSettingsServiceWin.h"
 #include "nsPrintSession.h"
 #endif