Change remaining uses of {to,from}Ascii to {to,from}Latin1 [QtPrintSupport]
authorThiago Macieira <thiago.macieira@intel.com>
Wed, 2 May 2012 14:32:26 +0000 (16:32 +0200)
committerQt by Nokia <qt-info@nokia.com>
Thu, 3 May 2012 09:33:05 +0000 (11:33 +0200)
This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.

Task-number: QTBUG-21872
Change-Id: I73963515a44175cb63251d0508d5f28d78076d76
Reviewed-by: John Layt <jlayt@kde.org>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
src/printsupport/kernel/qprinterinfo_unix.cpp

index 241986d..b87d2a1 100644 (file)
@@ -363,7 +363,7 @@ char *qt_parsePrintersConf(QList<QPrinterDescription> *printers, bool *found)
                         j++;
                     // that's our default printer
                     defaultPrinter =
-                        qstrdup(printerDesc.mid(i, j-i).toAscii().data());
+                        qstrdup(printerDesc.mid(i, j-i).toLatin1().data());
                     printerName = QString();
                     printerDesc = QString();
                 } else if (printerName == QLatin1String("_all")) {
@@ -758,7 +758,7 @@ Q_PRINTSUPPORT_EXPORT int qt_getLprPrinters(QList<QPrinterDescription>& printers
             if (def.readLine(etcLpDefault.data(), 1024) > 0) {
                 QRegExp rx(QLatin1String("^(\\S+)"));
                 if (rx.indexIn(QString::fromLatin1(etcLpDefault)) != -1)
-                    etcLpDefault = rx.cap(1).toAscii();
+                    etcLpDefault = rx.cap(1).toLatin1();
             }
         }
     }