1 files changed, 10 insertions, 16 deletions
diff --git a/src/printsupport/kernel/qplatformprintersupport.h b/src/printsupport/kernel/qplatformprintersupport.h
index c4ffcffd1e..0efec08f64 100644
--- a/src/printsupport/kernel/qplatformprintersupport.h
+++ b/src/printsupport/kernel/qplatformprintersupport.h
@@ -52,6 +52,7 @@
 
 #include <QtPrintSupport/qprinter.h>
 
+#include <QtCore/qstringlist.h>
 #include <QtCore/qlist.h>
 #include <QtCore/qhash.h>
 
@@ -61,6 +62,9 @@ QT_BEGIN_NAMESPACE
 
 typedef QHash<QString, QString> PrinterOptions;
 
+class QPageSize;
+class QPlatformPrintDevice;
+class QPrintDevice;
 class QPrintEngine;
 
 class Q_PRINTSUPPORT_EXPORT QPlatformPrinterSupport
@@ -71,25 +75,15 @@ public:
 
     virtual QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode);
     virtual QPaintEngine *createPaintEngine(QPrintEngine *, QPrinter::PrinterMode printerMode);
-    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);
+    virtual QPrintDevice createPrintDevice(const QString &id);
+    virtual QPrintDevice createDefaultPrintDevice();
+    virtual QStringList availablePrintDeviceIds() const;
+    virtual QString defaultPrintDeviceId() const;
 
 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);
-
-    QList<QPrinterInfo> m_printers;
+    static QPrintDevice createPrintDevice(QPlatformPrintDevice *device);
+    static QPageSize createPageSize(const QString &id, QSize size, const QString &localizedName);
 };
 
 #endif // QT_NO_PRINTER