diff options
| author | John Layt <jlayt@kde.org> | 2012-06-01 21:06:26 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-08 18:44:55 +0200 |
| commit | 20c7fa62caad8f93e3cfa81bcbfed4b753c3e92c (patch) | |
| tree | 997c954ffed2f8b924ab275c0ee14de1117fea24 /src/plugins | |
| parent | f2df9cef75bb035cacf341871406c40e39d21495 (diff) | |
QtPrintSupport: Move printer list into plugin base class
Move the cached printer list from the Windows plugin into the base
class so the CUPS plugin can also use it in a subsequent commit.
Change-Id: Idf5fb7fc49b1820aad58f16e8854ab9120caa193
Reviewed-by: Teemu Katajisto <teemu.katajisto@digia.com>
Reviewed-by: John Layt <jlayt@kde.org>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/printsupport/windows/qwindowsprintersupport.cpp | 7 | ||||
| -rw-r--r-- | src/plugins/printsupport/windows/qwindowsprintersupport.h | 7 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/plugins/printsupport/windows/qwindowsprintersupport.cpp b/src/plugins/printsupport/windows/qwindowsprintersupport.cpp index 3715aa1da9..85b18c2418 100644 --- a/src/plugins/printsupport/windows/qwindowsprintersupport.cpp +++ b/src/plugins/printsupport/windows/qwindowsprintersupport.cpp @@ -66,7 +66,7 @@ QWindowsPrinterSupport::QWindowsPrinterSupport() QString printerName(QString::fromWCharArray(infoList[i].pPrinterName)); bool isDefault = (printerName == defaultPrinterName); QPrinterInfo printerInfo = createPrinterInfo(printerName, QString(), QString(), QString(), isDefault, i); - mPrinterList.append(printerInfo); + m_printers.append(printerInfo); } } delete [] buffer; @@ -93,9 +93,4 @@ QList<QPrinter::PaperSize> QWindowsPrinterSupport::supportedPaperSizes(const QPr return QWin32PrintEngine::supportedPaperSizes(printerInfo); } -QList<QPrinterInfo> QWindowsPrinterSupport::availablePrinters() -{ - return mPrinterList; -} - QT_END_NAMESPACE diff --git a/src/plugins/printsupport/windows/qwindowsprintersupport.h b/src/plugins/printsupport/windows/qwindowsprintersupport.h index be8758a1bd..52ff5bbbcd 100644 --- a/src/plugins/printsupport/windows/qwindowsprintersupport.h +++ b/src/plugins/printsupport/windows/qwindowsprintersupport.h @@ -42,7 +42,6 @@ #ifndef WINDOWSPRINTERSUPPORT_H #define WINDOWSPRINTERSUPPORT_H -#include <QtCore/QList> #include <qpa/qplatformprintersupport.h> QT_BEGIN_HEADER @@ -59,12 +58,6 @@ public: virtual QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode); virtual QPaintEngine *createPaintEngine(QPrintEngine *printEngine, QPrinter::PrinterMode); virtual QList<QPrinter::PaperSize> supportedPaperSizes(const QPrinterInfo &) const; - - virtual QList<QPrinterInfo> availablePrinters(); -private: - - QList<QPrinterInfo> mPrinterList; - QPrinter::PrinterMode mCurrentMode; }; QT_END_NAMESPACE |