Changeset 561 for trunk/src/gui/painting/qprinterinfo_mac.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_mac.cpp (modified) (9 diffs)

trunk/src/gui/painting/qprinterinfo_mac.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$
 **
@@ -65 +65 @@
 
 static QPrinterInfoPrivate nullQPrinterInfoPrivate;
+
+class QPrinterInfoPrivateDeleter
+{
+public:
+    static inline void cleanup(QPrinterInfoPrivate *d)
+    {
+        if (d != &nullQPrinterInfoPrivate)
+            delete d;
+    }
+};
 
 extern QPrinter::PaperSize qSizeFTopaperSize(const QSizeF& size);
@@ -107 +117 @@
 
 QPrinterInfo::QPrinterInfo(const QPrinter& prn)
-{
-    d_ptr = &nullQPrinterInfoPrivate;
+    : d_ptr(&nullQPrinterInfoPrivate)
+{
     QList<QPrinterInfo> list = availablePrinters();
     for (int c = 0; c < list.size(); ++c) {
@@ -116 +126 @@
         }
     }
-
-    *this = QPrinterInfo();
 }
 
 QPrinterInfo::~QPrinterInfo()
 {
-    if (d_ptr != &nullQPrinterInfoPrivate)
-        delete d_ptr;
 }
 
 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;
 }
@@ -146 +152 @@
 {
     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;
@@ -173 +177 @@
 QList<QPrinter::PaperSize> QPrinterInfo::supportedPaperSizes() const
 {
-#if (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4)
-                return QList<QPrinter::PaperSize>();
-#else
-        if (QSysInfo::MacintoshVersion <= QSysInfo::MV_10_4)
-                return QList<QPrinter::PaperSize>();
-
-    const Q_D(QPrinterInfo);
-
-    PMPrinter cfPrn = PMPrinterCreateFromPrinterID(
-            QCFString::toCFStringRef(d->m_name));
+    const Q_D(QPrinterInfo);
+
+    PMPrinter cfPrn = PMPrinterCreateFromPrinterID(QCFString::toCFStringRef(d->m_name));
 
     if (!cfPrn) return QList<QPrinter::PaperSize>();
@@ -212 +209 @@
 
     return paperList;
-#endif // MAC_OS_X_VERSION_MAX_ALLOWED
 }