Don't keep PMPrint* state separate from NSPrintInfo

When we need to use PMPrintSession, PMPrintSettings, and PMPageLayout,
get these directly from the NSPrintInfo when needed. This avoids us
needing to keep the settings in sync. The native dialogs can then only
rely on getting a pointer to NSPrintInfo (to be done in a future
commit).

Change-Id: I4720284dcf999e454f86766b4291fbda7bf3c537
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/plugins/platforms/cocoa/qprintengine_mac_p.h b/src/plugins/platforms/cocoa/qprintengine_mac_p.h
index 38bce4ff67..c690a5733c 100644
--- a/src/plugins/platforms/cocoa/qprintengine_mac_p.h
+++ b/src/plugins/platforms/cocoa/qprintengine_mac_p.h
@@ -118,9 +118,6 @@ public:
     QPrinter::PrinterState state;
     QPrinter::Orientation orient;
     NSPrintInfo *printInfo;
-    PMPageFormat format;
-    PMPrintSettings settings;
-    PMPrintSession session;
     PMResolution resolution;
     QString outputFilename;
     bool fullPage;
@@ -134,8 +131,7 @@ public:
     qreal bottomMargin;
     QHash<QMacPrintEngine::PrintEnginePropertyKey, QVariant> valueCache;
     QMacPrintEnginePrivate() : mode(QPrinter::ScreenResolution), state(QPrinter::Idle),
-                               orient(QPrinter::Portrait), printInfo(0), format(0), settings(0),
-                               session(0), paintEngine(0),
+                               orient(QPrinter::Portrait), printInfo(0), paintEngine(0),
                                hasCustomPaperSize(false), hasCustomPageMargins(false) {}
     ~QMacPrintEnginePrivate();
     void initialize();
@@ -148,6 +144,10 @@ public:
     {
         return printInfo != 0;
     }
+
+    PMPageFormat format() const { return static_cast<PMPageFormat>([printInfo PMPageFormat]); }
+    PMPrintSession session() const { return static_cast<PMPrintSession>([printInfo PMPrintSession]); }
+    PMPrintSettings settings() const { return static_cast<PMPrintSettings>([printInfo PMPrintSettings]); }
 };
 
 QT_END_NAMESPACE