QPrinterInfo - Switch to QPlatformPrintDevice

Change the QPrinterInfo implementation to use QPlatformPrintDevice as
the backend.  Remove all the old QPrinterInfo related code from the
QPA plugin.  Add public api to QPrinterInfo to support some features
from QPlatformPrintDevice.

[ChangeLog][QtPrintSupport][QPrinterInfo] Added new public api for
isRemote(), state(), defaultPageSize(), supportedPageSizes(),
supportsCustomPageSizes(), minimumPhysicalPageSize(),
maximumPhysicalPageSize(), supportedResolutions(),
availablePrinterNames(), and defaultPrinterName(). The use of
availablePrinters() is discouraged due to performance concerns.

Task-number: QTBUG-35248

Change-Id: Ic38323a930549ad67bf04a1a6bb43d623dfe6a33
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

1 files changed, 2 insertions, 18 deletions

diff --git a/src/printsupport/kernel/qplatformprintersupport.h b/src/printsupport/kernel/qplatformprintersupport.h
index 6a4ecc09c8..0efec08f64 100644
--- a/src/printsupport/kernel/qplatformprintersupport.h
+++ b/src/printsupport/kernel/qplatformprintersupport.h
@@ -62,6 +62,7 @@ QT_BEGIN_NAMESPACE
 
 typedef QHash<QString, QString> PrinterOptions;
 
+class QPageSize;
 class QPlatformPrintDevice;
 class QPrintDevice;
 class QPrintEngine;
@@ -80,26 +81,9 @@ public:
     virtual QStringList availablePrintDeviceIds() const;
     virtual QString defaultPrintDeviceId() const;
 
-    virtual QList<QPrinter::PaperSize> supportedPaperSizes(const QPrinterInfo &) const;
-    virtual QList<QPair<QString, QSizeF> > supportedSizesWithNames(const QPrinterInfo &printerInfo) const;
-    virtual QList<QPrinterInfo> availablePrinters();
-    virtual QPrinterInfo defaultPrinter();
-    virtual QPrinterInfo printerInfo(const QString &printerName);
-
-    virtual QString printerOption(const QPrinterInfo &printer, const QString &key) const;
-    virtual PrinterOptions printerOptions(const QPrinterInfo &printer) const;
-
-    static QPrinter::PaperSize convertQSizeFToPaperSize(const QSizeF &sizef);
-    static QSizeF convertPaperSizeToQSizeF(QPrinter::PaperSize paperSize);
-
 protected:
-    static int printerIndex(const QPrinterInfo &printer);
-    static QPrinterInfo createPrinterInfo(const QString &name, const QString &description,
-                                          const QString &location, const QString &makeAndModel,
-                                          bool isDefault, int index);
     static QPrintDevice createPrintDevice(QPlatformPrintDevice *device);
-
-    QList<QPrinterInfo> m_printers;
+    static QPageSize createPageSize(const QString &id, QSize size, const QString &localizedName);
 };
 
 #endif // QT_NO_PRINTER