summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/printsupport/windows/qwindowsprintersupport.cpp7
-rw-r--r--src/plugins/printsupport/windows/qwindowsprintersupport.h7
-rw-r--r--src/printsupport/kernel/qplatformprintersupport.h5
-rw-r--r--src/printsupport/kernel/qplatformprintersupport_qpa.cpp2
4 files changed, 6 insertions, 15 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
diff --git a/src/printsupport/kernel/qplatformprintersupport.h b/src/printsupport/kernel/qplatformprintersupport.h
index 074405f0cd..e922b5fb25 100644
--- a/src/printsupport/kernel/qplatformprintersupport.h
+++ b/src/printsupport/kernel/qplatformprintersupport.h
@@ -52,11 +52,12 @@
#include <QtPrintSupport/qprinter.h>
+#include <QtCore/qlist.h>
+
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-
#ifndef QT_NO_PRINTER
class QPrintEngine;
@@ -83,6 +84,8 @@ protected:
static QPrinterInfo createPrinterInfo(const QString &name, const QString &description,
const QString &location, const QString &makeAndModel,
bool isDefault, int index);
+
+ QList<QPrinterInfo> m_printers;
};
#endif // QT_NO_PRINTER
diff --git a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp
index d6ffd9b7fc..0a386eafc2 100644
--- a/src/printsupport/kernel/qplatformprintersupport_qpa.cpp
+++ b/src/printsupport/kernel/qplatformprintersupport_qpa.cpp
@@ -84,7 +84,7 @@ QList<QPrinter::PaperSize> QPlatformPrinterSupport::supportedPaperSizes(const QP
QList<QPrinterInfo> QPlatformPrinterSupport::availablePrinters()
{
- return QList<QPrinterInfo>();
+ return m_printers;
}
QPrinterInfo QPlatformPrinterSupport::defaultPrinter()