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>

1 files changed, 3 insertions, 3 deletions

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;