Changeset 846 for trunk/src/gui/painting/qpdf.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/painting/qpdf.cpp (modified) (6 diffs)

trunk/src/gui/painting/qpdf.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -917 +917 @@
 
 
-QByteArray QPdf::stripSpecialCharacters(const QByteArray &string)
-{
-    QByteArray s = string;
-    s.replace(' ', "");
-    s.replace('(', "");
-    s.replace(')', "");
-    s.replace('<', "");
-    s.replace('>', "");
-    s.replace('[', "");
-    s.replace(']', "");
-    s.replace('{', "");
-    s.replace('}', "");
-    s.replace('/', "");
-    s.replace('%', "");
-    return s;
-}
-
-
 // -------------------------- base engine, shared code between PS and PDF -----------------------
 
@@ -1409 +1391 @@
 {
     Q_D(QPdfBaseEngine);
-    switch (key) {
+    switch (int(key)) {
     case PPK_CollateCopies:
         d->collate = value.toBool();
@@ -1425 +1407 @@
         d->fullPage = value.toBool();
         break;
+    case PPK_CopyCount: // fallthrough
     case PPK_NumberOfCopies:
         d->copies = value.toInt();
@@ -1498 +1481 @@
 
     QVariant ret;
-    switch (key) {
+    switch (int(key)) {
     case PPK_CollateCopies:
         ret = d->collate;
@@ -1513 +1496 @@
     case PPK_FullPage:
         ret = d->fullPage;
+        break;
+    case PPK_CopyCount:
+        ret = d->copies;
+        break;
+    case PPK_SupportsMultipleCopies:
+#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
+        if (QCUPSSupport::isAvailable())
+            ret = true;
+        else
+#endif
+            ret = false;
         break;
     case PPK_NumberOfCopies: