From 271b484b0081e0f97a97b3e2e7ea5bee02f43ae8 Mon Sep 17 00:00:00 2001 From: John Layt Date: Fri, 1 Jun 2012 20:33:53 +0100 Subject: QtPrintSupport: Move plugin access of QPrinterInfo internals to base Move all plugin methods requiring access to QPrinterInfo internals into the plugin base class, and remove the plugin classes as friends from QPrinterInfo. Change-Id: Ic527efc681e198abf19e038dd77c36bb8017d049 Reviewed-by: Teemu Katajisto Reviewed-by: John Layt --- src/plugins/printsupport/windows/qwindowsprintersupport.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'src/plugins/printsupport/windows') diff --git a/src/plugins/printsupport/windows/qwindowsprintersupport.cpp b/src/plugins/printsupport/windows/qwindowsprintersupport.cpp index 476889890d..3715aa1da9 100644 --- a/src/plugins/printsupport/windows/qwindowsprintersupport.cpp +++ b/src/plugins/printsupport/windows/qwindowsprintersupport.cpp @@ -64,10 +64,8 @@ QWindowsPrinterSupport::QWindowsPrinterSupport() QWin32PrintEngine::queryDefaultPrinter(defaultPrinterName, program, port); for (uint i = 0; i < returned; ++i) { QString printerName(QString::fromWCharArray(infoList[i].pPrinterName)); - - QPrinterInfo printerInfo(printerName); - if (printerInfo.printerName() == defaultPrinterName) - printerInfo.d_ptr->isDefault = true; + bool isDefault = (printerName == defaultPrinterName); + QPrinterInfo printerInfo = createPrinterInfo(printerName, QString(), QString(), QString(), isDefault, i); mPrinterList.append(printerInfo); } } -- cgit v1.2.3