From d13195584e3ec4b3c30b626c360e81e437757427 Mon Sep 17 00:00:00 2001 From: John Layt 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 --- src/printsupport/kernel/qcups_p.h | 3 --- src/printsupport/kernel/qprintengine_pdf.cpp | 4 ++-- src/printsupport/kernel/qprintengine_pdf_p.h | 3 ++- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/printsupport/kernel') diff --git a/src/printsupport/kernel/qcups_p.h b/src/printsupport/kernel/qcups_p.h index 95ca323c22..337f2250c5 100644 --- a/src/printsupport/kernel/qcups_p.h +++ b/src/printsupport/kernel/qcups_p.h @@ -71,9 +71,6 @@ QT_BEGIN_NAMESPACE // Move back to qcupsprintengine_p.h in the plugin once all usage // removed from the dialogs. #define PPK_CupsOptions QPrintEngine::PrintEnginePropertyKey(0xfe00) -#define PPK_CupsPageRect QPrintEngine::PrintEnginePropertyKey(0xfe01) -#define PPK_CupsPaperRect QPrintEngine::PrintEnginePropertyKey(0xfe02) -#define PPK_CupsStringPageSize QPrintEngine::PrintEnginePropertyKey(0xfe03) Q_DECLARE_TYPEINFO(cups_option_t, Q_MOVABLE_TYPE | Q_PRIMITIVE_TYPE); diff --git a/src/printsupport/kernel/qprintengine_pdf.cpp b/src/printsupport/kernel/qprintengine_pdf.cpp index 2ddfb9c49e..c24905009d 100644 --- a/src/printsupport/kernel/qprintengine_pdf.cpp +++ b/src/printsupport/kernel/qprintengine_pdf.cpp @@ -206,7 +206,7 @@ void QPdfPrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &va d->embedFonts = value.toBool(); break; case PPK_Duplex: - d->duplex = static_cast (value.toInt()); + d->duplex = static_cast(value.toInt()); break; case PPK_CustomPaperSize: d->m_pageLayout.setPageSize(QPageSize(value.toSizeF(), QPageSize::Point)); @@ -362,7 +362,7 @@ void QPdfPrintEnginePrivate::closePrintDevice() QPdfPrintEnginePrivate::QPdfPrintEnginePrivate(QPrinter::PrinterMode m) : QPdfEnginePrivate(), - duplex(QPrinter::DuplexNone), + duplex(QPrint::DuplexNone), collate(true), copies(1), pageOrder(QPrinter::FirstPageFirst), diff --git a/src/printsupport/kernel/qprintengine_pdf_p.h b/src/printsupport/kernel/qprintengine_pdf_p.h index cc4044d1a0..80d81b4ed3 100644 --- a/src/printsupport/kernel/qprintengine_pdf_p.h +++ b/src/printsupport/kernel/qprintengine_pdf_p.h @@ -68,6 +68,7 @@ #include "private/qpdf_p.h" #include "private/qpaintengine_p.h" #include "qprintengine.h" +#include "qprint_p.h" QT_BEGIN_NAMESPACE @@ -131,7 +132,7 @@ private: QString printProgram; QString selectionOption; - QPrinter::DuplexMode duplex; + QPrint::DuplexMode duplex; bool collate; int copies; QPrinter::PageOrder pageOrder; -- cgit v1.2.3