Changeset 561 for trunk/src/gui/painting/qprinterinfo_win.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/painting/qprinterinfo_win.cpp (modified) (11 diffs)

trunk/src/gui/painting/qprinterinfo_win.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -44 +44 @@
 #include <qstringlist.h>
 
-#include <windows.h>
+#include <qt_windows.h>
 
 QT_BEGIN_NAMESPACE
@@ -70 +70 @@
 static QPrinterInfoPrivate nullQPrinterInfoPrivate;
 
+class QPrinterInfoPrivateDeleter
+{
+public:
+    static inline void cleanup(QPrinterInfoPrivate *d)
+    {
+        if (d != &nullQPrinterInfoPrivate)
+            delete d;
+    }
+};
+
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
@@ -80 +90 @@
     DWORD returned = 0;
 
-    QT_WA({
-            if (!EnumPrintersW(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS, NULL,
-                               4, 0, 0, &needed, &returned))
-            {
-                buffer = new BYTE[needed];
-                if (!EnumPrintersW(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS , NULL,
-                                   4, buffer, needed, &needed, &returned))
-                {
-                    delete [] buffer;
-                    return printers;
-                }
-                PPRINTER_INFO_4 infoList = reinterpret_cast<PPRINTER_INFO_4>(buffer);
-                QPrinterInfo defPrn = defaultPrinter();
-                for (uint i = 0; i < returned; ++i) {
-                    printers.append(QPrinterInfo(QString::fromUtf16(reinterpret_cast<const ushort*>(infoList[i].pPrinterName))));
-                    if (printers.at(i).printerName() == defPrn.printerName())
-                        printers[i].d_ptr->m_default = true;
-                }
-                delete [] buffer;
-            }
-        }, {
-            // In Windows 98 networked printers are served through the local connection
-            if (!EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, 0, 0, &needed, &returned)) {
-                buffer = new BYTE[needed];
-                if (!EnumPrintersA(PRINTER_ENUM_LOCAL, NULL, 5, buffer, needed, &needed, &returned)) {
-                    delete [] buffer;
-                    return printers;
-                }
-
-                PPRINTER_INFO_5 infoList = reinterpret_cast<PPRINTER_INFO_5>(buffer);
-                QPrinterInfo defPrn = defaultPrinter();
-                for (uint i = 0; i < returned; ++i) {
-                    printers.append(QPrinterInfo(QString::fromLocal8Bit(reinterpret_cast<const char*>(infoList[i].pPrinterName))));
-                    if (printers.at(i).printerName() == defPrn.printerName())
-                        printers[i].d_ptr->m_default = true;
-                }
-                delete [] buffer;
-            }
-        });
+    if ( !EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS, NULL, 4, 0, 0, &needed, &returned))
+    {
+        buffer = new BYTE[needed];
+        if (!EnumPrinters(PRINTER_ENUM_LOCAL | PRINTER_ENUM_CONNECTIONS , NULL,
+                           4, buffer, needed, &needed, &returned))
+        {
+            delete [] buffer;
+            return printers;
+        }
+        PPRINTER_INFO_4 infoList = reinterpret_cast<PPRINTER_INFO_4>(buffer);
+        QPrinterInfo defPrn = defaultPrinter();
+        for (uint i = 0; i < returned; ++i) {
+            printers.append(QPrinterInfo(QString::fromWCharArray(infoList[i].pPrinterName)));
+            if (printers.at(i).printerName() == defPrn.printerName())
+                printers[i].d_ptr->m_default = true;
+        }
+        delete [] buffer;
+    }
 
     return printers;
@@ -126 +115 @@
 {
     QString noPrinters(QLatin1String("qt_no_printers"));
-    QString output;
-    QT_WA({
-        ushort buffer[256];
-        GetProfileStringW(L"windows", L"device",
-                          reinterpret_cast<const wchar_t *>(noPrinters.utf16()),
-                          reinterpret_cast<wchar_t *>(buffer), 256);
-        output = QString::fromUtf16(buffer);
-    }, {
-        char buffer[256];
-        GetProfileStringA("windows", "device", noPrinters.toLatin1(), buffer, 256);
-        output = QString::fromLocal8Bit(buffer);
-    });
+    wchar_t buffer[256];
+    GetProfileString(L"windows", L"device", (wchar_t*)noPrinters.utf16(), buffer, 256);
+    QString output = QString::fromWCharArray(buffer);
 
     // Filter out the name of the printer, which should be everything
@@ -156 +136 @@
 
 QPrinterInfo::QPrinterInfo()
-{
-    d_ptr = &nullQPrinterInfoPrivate;
+    : d_ptr(&nullQPrinterInfoPrivate)
+{
 }
 
 QPrinterInfo::QPrinterInfo(const QString& name)
-{
-    d_ptr = new QPrinterInfoPrivate(name);
+    : d_ptr(new QPrinterInfoPrivate(name))
+{
     d_ptr->q_ptr = this;
 }
 
 QPrinterInfo::QPrinterInfo(const QPrinterInfo& src)
-{
-    d_ptr = &nullQPrinterInfoPrivate;
+    : d_ptr(&nullQPrinterInfoPrivate)
+{
     *this = src;
 }
 
 QPrinterInfo::QPrinterInfo(const QPrinter& prn)
-{
-    d_ptr = &nullQPrinterInfoPrivate;
+    : d_ptr(&nullQPrinterInfoPrivate)
+{
     QList<QPrinterInfo> list = availablePrinters();
     for (int c = 0; c < list.size(); ++c) {
@@ -188 +168 @@
 QPrinterInfo::~QPrinterInfo()
 {
-    if (d_ptr != &nullQPrinterInfoPrivate)
-        delete d_ptr;
 }
 
@@ -195 +173 @@
 {
     Q_ASSERT(d_ptr);
-    if (d_ptr != &nullQPrinterInfoPrivate)
-        delete d_ptr;
-    d_ptr = new QPrinterInfoPrivate(*src.d_ptr);
+    d_ptr.reset(new QPrinterInfoPrivate(*src.d_ptr));
     d_ptr->q_ptr = this;
     return *this;
@@ -223 +199 @@
 {
     const Q_D(QPrinterInfo);
-    DWORD size;
-    WORD* papers;
     QList<QPrinter::PaperSize> paperList;
 
-    QT_WA({
-        size = DeviceCapabilitiesW(reinterpret_cast<const WCHAR*>(d->m_name.utf16()),
-                NULL, DC_PAPERS, NULL, NULL);
-        if ((int)size == -1)
-            return paperList;
-        papers = new WORD[size];
-        size = DeviceCapabilitiesW(reinterpret_cast<const WCHAR*>(d->m_name.utf16()),
-                NULL, DC_PAPERS, reinterpret_cast<WCHAR*>(papers), NULL);
-    }, {
-        size = DeviceCapabilitiesA(d->m_name.toLatin1().data(), NULL, DC_PAPERS, NULL, NULL);
-        if ((int)size == -1)
-            return paperList;
-        papers = new WORD[size];
-        size = DeviceCapabilitiesA(d->m_name.toLatin1().data(), NULL, DC_PAPERS,
-                reinterpret_cast<char*>(papers), NULL);
-    });
+    DWORD size = DeviceCapabilities(reinterpret_cast<const wchar_t*>(d->m_name.utf16()),
+                                    NULL, DC_PAPERS, NULL, NULL);
+    if ((int)size == -1)
+        return paperList;
+
+    wchar_t *papers = new wchar_t[size];
+    size = DeviceCapabilities(reinterpret_cast<const wchar_t*>(d->m_name.utf16()),
+                              NULL, DC_PAPERS, papers, NULL);
 
     for (int c = 0; c < (int)size; ++c) {