From d24dd977178b04ba9dd8d1b5e13877c1fbe58545 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Thu, 4 Aug 2022 07:04:38 +0200 Subject: [PATCH] CPaster: Replace deprecated code Change-Id: I2c9ee3df6c4a8e91d5f3701655e10dc106697593 Reviewed-by: hjk --- src/plugins/cpaster/cpasterplugin.cpp | 2 +- src/plugins/cpaster/frontend/main.cpp | 2 +- src/plugins/cpaster/stickynotespasteprotocol.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/plugins/cpaster/cpasterplugin.cpp b/src/plugins/cpaster/cpasterplugin.cpp index a119c9ce078..28132037098 100644 --- a/src/plugins/cpaster/cpasterplugin.cpp +++ b/src/plugins/cpaster/cpasterplugin.cpp @@ -219,7 +219,7 @@ static inline void textFromCurrentEditor(QString *text, QString *mimeType) data = textDocument->plainText(); } else { const QVariant textV = document->property("plainText"); // Diff Editor. - if (textV.type() == QVariant::String) + if (textV.typeId() == QMetaType::QString) data = textV.toString(); } } diff --git a/src/plugins/cpaster/frontend/main.cpp b/src/plugins/cpaster/frontend/main.cpp index b2aba50ac3d..471d864623a 100644 --- a/src/plugins/cpaster/frontend/main.cpp +++ b/src/plugins/cpaster/frontend/main.cpp @@ -103,7 +103,7 @@ int main(int argc, char *argv[]) std::cout << qPrintable(argsCollector.usageString()) << std::endl; return EXIT_SUCCESS; case ArgumentsCollector::RequestTypeListProtocols: - foreach (const QString &protocol, protocols) + for (const QString &protocol : protocols) std::cout << qPrintable(protocol) << std::endl; return EXIT_SUCCESS; case ArgumentsCollector::RequestTypePaste: { diff --git a/src/plugins/cpaster/stickynotespasteprotocol.cpp b/src/plugins/cpaster/stickynotespasteprotocol.cpp index a3b5a7473fb..6524a2cc436 100644 --- a/src/plugins/cpaster/stickynotespasteprotocol.cpp +++ b/src/plugins/cpaster/stickynotespasteprotocol.cpp @@ -245,8 +245,8 @@ static inline QStringList parseList(QIODevice *device) if (obj.contains(pastesKey)) { value = obj.value(pastesKey); if (value.isArray()) { - QJsonArray array = value.toArray(); - foreach (const QJsonValue &val, array) + const QJsonArray array = value.toArray(); + for (const QJsonValue &val : array) result.append(val.toString()); } }