summaryrefslogtreecommitdiffstats
path: root/src/shared
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2012-05-03 17:12:58 +0200
committerThiago Macieira <thiago.macieira@intel.com>2012-05-04 13:35:55 +0200
commita0b88660ce52bb9956bc060507698f1ee4455fc0 (patch)
tree7fe3130b7c52e32e6eb128faec09ff1862190672 /src/shared
parentc79a2be17d59530931e105b18edf7a8bab056862 (diff)
Change uses of {to,from}Ascii to {to,from}Latin1
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: I70205b0d86451d31e81a4be4a521e454e1eff83f Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Diffstat (limited to 'src/shared')
-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) {