From 0c04b31d2715f68aa883107b4aa593fd95aefdfe Mon Sep 17 00:00:00 2001
From: John Layt <jlayt@kde.org>
Date: Sun, 29 Dec 2013 20:19:48 +0100
Subject: QPdfPaintEngine - Use QPageLayout and QPageSize

Switch internals of QPdfPageEngine and derived classes to use
QPageLayout and QPageSize to make handling of page layout and size
more consistent by removing multiple implementations.  In particular
remove all use of the QPdf namespace version of page size.

Change-Id: Ie820340015e8812c8162bd1a257dd0f51f4f0b85
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/plugins/printsupport/cups/qcupsprintengine_p.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/plugins/printsupport/cups/qcupsprintengine_p.h')

diff --git a/src/plugins/printsupport/cups/qcupsprintengine_p.h b/src/plugins/printsupport/cups/qcupsprintengine_p.h
index db947a0232..bc85205d50 100644
--- a/src/plugins/printsupport/cups/qcupsprintengine_p.h
+++ b/src/plugins/printsupport/cups/qcupsprintengine_p.h
@@ -96,15 +96,15 @@ public:
     void closePrintDevice();
 
     void updatePaperSize();
-    void setPaperSize();
-    void setPaperName();
+    void setPageSize(QPageSize::PageSizeId pageSizeId);
+    void setPaperName(const QString &name);
     void setCupsDefaults();
+    void setPageSize(const QString &key, const QString &name);
 
 private:
     Q_DISABLE_COPY(QCupsPrintEnginePrivate)
 
     QStringList cupsOptions;
-    QString cupsStringPageSize;
     QRect cupsPaperRect;
     QRect cupsPageRect;
     QString cupsTempFile;
-- 
cgit v1.2.3


From d13195584e3ec4b3c30b626c360e81e437757427 Mon Sep 17 00:00:00 2001
From: John Layt <jlayt@kde.org>
Date: Wed, 11 Dec 2013 16:37:03 +0100
Subject: QPrintEngine - Switch Cups to QPlaformPrintDevice

Use QPlatformPrintDevice in the Cups print engine for all device
specific code.

Change-Id: Ic1f5f8b4010a9958c320f3c0c727cf1bd1a70c65
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/plugins/printsupport/cups/qcupsprintengine_p.h | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'src/plugins/printsupport/cups/qcupsprintengine_p.h')

diff --git a/src/plugins/printsupport/cups/qcupsprintengine_p.h b/src/plugins/printsupport/cups/qcupsprintengine_p.h
index bc85205d50..393fef42a3 100644
--- a/src/plugins/printsupport/cups/qcupsprintengine_p.h
+++ b/src/plugins/printsupport/cups/qcupsprintengine_p.h
@@ -61,9 +61,8 @@
 #include <QtGui/qpaintengine.h>
 
 #include <private/qpaintengine_p.h>
+#include <private/qprintdevice_p.h>
 #include <private/qprintengine_pdf_p.h>
-#include <QtPrintSupport/qprintengine.h>
-#include <private/qcups_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -95,18 +94,15 @@ public:
     bool openPrintDevice();
     void closePrintDevice();
 
-    void updatePaperSize();
-    void setPageSize(QPageSize::PageSizeId pageSizeId);
-    void setPaperName(const QString &name);
-    void setCupsDefaults();
-    void setPageSize(const QString &key, const QString &name);
-
 private:
     Q_DISABLE_COPY(QCupsPrintEnginePrivate)
 
+    void setupDefaultPrinter();
+    void changePrinter(const QString &newPrinter);
+    void setPageSize(const QPageSize &pageSize);
+
+    QPrintDevice m_printDevice;
     QStringList cupsOptions;
-    QRect cupsPaperRect;
-    QRect cupsPageRect;
     QString cupsTempFile;
 };
 
-- 
cgit v1.2.3