summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-05-03 17:11:44 +0200
committerThiago Macieira <thiago.macieira@intel.com>2012-05-04 13:35:44 +0200
commit542bf5f9290215a15ba5b4a949adf03ea0a5fe7e (patch)
tree54de27fcea546cdbec57a4fe0d27006d9ec43c56
parent82c53237221c5cd9978c83d90ef823ae7e377a50 (diff)
Change uses of {to,from}Ascii to {to,from}Latin10.85
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: I66018663366a886a1d34c8c9389536081a09f2b7 Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
-rw-r--r--src/shared/qwaylandmimehelper.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/shared/qwaylandmimehelper.cpp b/src/shared/qwaylandmimehelper.cpp
index b2d4af562..e0b4c3360 100644
--- a/src/shared/qwaylandmimehelper.cpp
+++ b/src/shared/qwaylandmimehelper.cpp
@@ -60,7 +60,7 @@ QByteArray QWaylandMimeHelper::getByteArray(QMimeData *mimeData, const QString &
buf.open(QIODevice::ReadWrite);
QByteArray fmt = "BMP";
if (mimeType.startsWith(QLatin1String("image/"))) {
- QByteArray imgFmt = mimeType.mid(6).toUpper().toAscii();
+ QByteArray imgFmt = mimeType.mid(6).toUpper().toLatin1();
if (QImageWriter::supportedImageFormats().contains(imgFmt))
fmt = imgFmt;
}
@@ -69,7 +69,7 @@ QByteArray QWaylandMimeHelper::getByteArray(QMimeData *mimeData, const QString &
content = buf.buffer();
}
} else if (mimeType == QLatin1String("application/x-color")) {
- content = qvariant_cast<QColor>(mimeData->colorData()).name().toAscii();
+ content = qvariant_cast<QColor>(mimeData->colorData()).name().toLatin1();
} else if (mimeType == QLatin1String("text/uri-list")) {
QList<QUrl> urls = mimeData->urls();
for (int i = 0; i < urls.count(); ++i) {