Tidy up qmimedata

- use range based for more
- replace QSL with _s

Change-Id: I81b41d674e5976a62a52955abdb55c1f208a90cd
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

1 files changed, 19 insertions, 19 deletions

diff --git a/src/corelib/kernel/qmimedata.cpp b/src/corelib/kernel/qmimedata.cpp
index 561c92aa7b..1348c70b1a 100644
--- a/src/corelib/kernel/qmimedata.cpp
+++ b/src/corelib/kernel/qmimedata.cpp
@@ -12,12 +12,12 @@ QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
 
-static inline QString textUriListLiteral() { return QStringLiteral("text/uri-list"); }
-static inline QString textHtmlLiteral() { return QStringLiteral("text/html"); }
-static inline QString textPlainLiteral() { return QStringLiteral("text/plain"); }
-static inline QString textPlainUtf8Literal() { return QStringLiteral("text/plain;charset=utf-8"); }
-static inline QString applicationXColorLiteral() { return QStringLiteral("application/x-color"); }
-static inline QString applicationXQtImageLiteral() { return QStringLiteral("application/x-qt-image"); }
+static inline QString textUriListLiteral() { return u"text/uri-list"_s; }
+static inline QString textHtmlLiteral() { return u"text/html"_s; }
+static inline QString textPlainLiteral() { return u"text/plain"_s; }
+static inline QString textPlainUtf8Literal() { return u"text/plain;charset=utf-8"_s; }
+static inline QString applicationXColorLiteral() { return u"application/x-color"_s; }
+static inline QString applicationXQtImageLiteral() { return u"application/x-qt-image"_s; }
 
 struct QMimeDataStruct
 {
@@ -83,8 +83,7 @@ static QList<QVariant> dataToUrls(QByteArrayView text)
     qsizetype from = 0;
     const char *begin = text.data();
     while ((newLineIndex = text.indexOf('\n', from)) != -1) {
-        QByteArrayView bav(begin + from, begin + newLineIndex);
-        bav = bav.trimmed();
+        const auto bav = QByteArrayView(begin + from, begin + newLineIndex).trimmed();
         if (!bav.isEmpty())
             list.push_back(QUrl::fromEncoded(bav));
         from = newLineIndex + 1;
@@ -110,9 +109,10 @@ QVariant QMimeDataPrivate::retrieveTypedData(const QString &format, QMetaType ty
             QString text;
             int numUrls = 0;
             const QList<QVariant> list = data.toList();
-            for (int i = 0; i < list.size(); ++i) {
-                if (list.at(i).metaType().id() == QMetaType::QUrl) {
-                    text += list.at(i).toUrl().toDisplayString() + u'\n';
+            for (const auto &element : list) {
+                if (element.metaType().id() == QMetaType::QUrl) {
+                    text += element.toUrl().toDisplayString();
+                    text += u'\n';
                     ++numUrls;
                 }
             }
@@ -190,10 +190,10 @@ QVariant QMimeDataPrivate::retrieveTypedData(const QString &format, QMetaType ty
         case QMetaType::QVariantList: {
             // has to be list of URLs
             QByteArray result;
-            QList<QVariant> list = data.toList();
-            for (int i = 0; i < list.size(); ++i) {
-                if (list.at(i).metaType().id() == QMetaType::QUrl) {
-                    result += list.at(i).toUrl().toEncoded();
+            const QList<QVariant> list = data.toList();
+            for (const auto &element : list) {
+                if (element.metaType().id() == QMetaType::QUrl) {
+                    result += element.toUrl().toEncoded();
                     result += "\r\n";
                 }
             }
@@ -328,10 +328,10 @@ QList<QUrl> QMimeData::urls() const
     if (data.metaType().id() == QMetaType::QUrl)
         urls.append(data.toUrl());
     else if (data.metaType().id() == QMetaType::QVariantList) {
-        QList<QVariant> list = data.toList();
-        for (int i = 0; i < list.size(); ++i) {
-            if (list.at(i).metaType().id() == QMetaType::QUrl)
-                urls.append(list.at(i).toUrl());
+        const QList<QVariant> list = data.toList();
+        for (const auto &element : list) {
+            if (element.metaType().id() == QMetaType::QUrl)
+                urls.append(element.toUrl());
         }
     }
     return urls;