Move the remaining QPrinter dependencies out of qpf.*

Change-Id: I4fd0158d65afad1bc67c52eff17ce2e12ff60641
Reviewed-on: http://codereview.qt.nokia.com/3203
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>

1 files changed, 32 insertions, 2 deletions

diff --git a/src/gui/painting/qprintengine_pdf_p.h b/src/gui/painting/qprintengine_pdf_p.h
index 022f414ef8..367e3aebab 100644
--- a/src/gui/painting/qprintengine_pdf_p.h
+++ b/src/gui/painting/qprintengine_pdf_p.h
@@ -71,8 +71,6 @@
 
 QT_BEGIN_NAMESPACE
 
-// #define USE_NATIVE_GRADIENTS
-
 class QImage;
 class QDataStream;
 class QPen;
@@ -81,6 +79,20 @@ class QRegion;
 class QFile;
 class QPdfPrintEngine;
 
+#define PPK_CupsOptions QPrintEngine::PrintEnginePropertyKey(0xfe00)
+#define PPK_CupsPageRect QPrintEngine::PrintEnginePropertyKey(0xfe01)
+#define PPK_CupsPaperRect QPrintEngine::PrintEnginePropertyKey(0xfe02)
+#define PPK_CupsStringPageSize QPrintEngine::PrintEnginePropertyKey(0xfe03)
+
+namespace QPdf {
+
+    struct PaperSize {
+        int width, height; // in postscript points
+    };
+    Q_GUI_EXPORT PaperSize paperSize(QPrinter::PaperSize paperSize);
+    Q_GUI_EXPORT const char *paperSizeToString(QPrinter::PaperSize paperSize);
+}
+
 class QPdfPrintEnginePrivate;
 
 class QPdfPrintEngine : public QPdfEngine, public QPrintEngine
@@ -121,9 +133,27 @@ public:
     bool openPrintDevice();
     void closePrintDevice();
 
+    void updatePaperSize();
+
 private:
     Q_DISABLE_COPY(QPdfPrintEnginePrivate)
 
+    QString printerName;
+    QString printProgram;
+    QString selectionOption;
+    QStringList cupsOptions;
+    QString cupsStringPageSize;
+
+    QPrinter::DuplexMode duplex;
+    bool collate;
+    int copies;
+    QPrinter::PageOrder pageOrder;
+    QPrinter::PaperSource paperSource;
+
+    QPrinter::PaperSize printerPaperSize;
+    QRect cupsPaperRect;
+    QRect cupsPageRect;
+    QSizeF customPaperSize; // in postscript points
 };
 
 QT_END_NAMESPACE