summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-11-11 16:26:04 +0100
committerMarc Mutz <marc.mutz@qt.io>2022-11-15 14:26:38 +0100
commitd9b57ccadbcb10017775f8212c651ca66d9c50e5 (patch)
tree40456473b3864e5278648b7010f69ef8313f9d20
parent81c15e27aaa82f08b0e81f92d5d5d9dc8ec2f28e (diff)
downloadqtactiveqt-d9b57ccadbcb10017775f8212c651ca66d9c50e5.tar.gz
Port from qAsConst() to std::as_const()
We've been requiring C++17 since Qt 6.0, and our qAsConst use finally starts to bother us (QTBUG-99313), so time to port away from it now. Since qAsConst has exactly the same semantics as std::as_const (down to rvalue treatment, constexpr'ness and noexcept'ness), there's really nothing more to it than a global search-and-replace. This is a 6.4 re-run of the script we ran in dev, in order to avoid conflicts between the branches when cherry-picking. Change-Id: I5eca3df3179dfb2b2682c75a479ba9a4259cc703 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
-rw-r--r--src/activeqt/container/qaxscript.cpp6
-rw-r--r--src/activeqt/control/qaxfactory.h4
-rw-r--r--src/activeqt/control/qaxserverbase.cpp2
-rw-r--r--tools/dumpcpp/main.cpp2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/activeqt/container/qaxscript.cpp b/src/activeqt/container/qaxscript.cpp
index ee6bd34..161f25e 100644
--- a/src/activeqt/container/qaxscript.cpp
+++ b/src/activeqt/container/qaxscript.cpp
@@ -694,7 +694,7 @@ bool QAxScript::load(const QString &code, const QString &language)
if (code.contains(QLatin1String("End Sub"), Qt::CaseInsensitive))
lang = QLatin1String("VBScript");
- for (const QAxEngineDescriptor &engine : qAsConst(engines)) {
+ for (const QAxEngineDescriptor &engine : std::as_const(engines)) {
if (!engine.code.isEmpty() && code.contains(engine.code)) {
lang = engine.name;
break;
@@ -1056,7 +1056,7 @@ QAxScript *QAxScriptManager::load(const QString &file, const QString &name)
if (file.endsWith(QLatin1String(".js"))) {
language = QLatin1String("JScript");
} else {
- for (const QAxEngineDescriptor &engine : qAsConst(engines)) {
+ for (const QAxEngineDescriptor &engine : std::as_const(engines)) {
if (!engine.extension.isEmpty() && file.endsWith(engine.extension)) {
language = engine.name;
break;
@@ -1186,7 +1186,7 @@ QString QAxScriptManager::scriptFileFilter()
QString specialFiles = QLatin1String(";;VBScript Files (*.vbs *.dsm)"
";;JavaScript Files (*.js)");
- for (const QAxEngineDescriptor &engine : qAsConst(engines)) {
+ for (const QAxEngineDescriptor &engine : std::as_const(engines)) {
if (!engine.extension.isEmpty()) {
allFiles += QLatin1String(" *") + engine.extension;
specialFiles += QLatin1String(";;") + engine.name
diff --git a/src/activeqt/control/qaxfactory.h b/src/activeqt/control/qaxfactory.h
index e140361..b43c298 100644
--- a/src/activeqt/control/qaxfactory.h
+++ b/src/activeqt/control/qaxfactory.h
@@ -219,7 +219,7 @@ private:
factory = new QAxClass<Class>(typeLibID().toString(), appID().toString()); \
qRegisterMetaType<Class*>(#Class"*"); \
keys = factory->featureList(); \
- for (const QString &key : qAsConst(keys)) { \
+ for (const QString &key : std::as_const(keys)) { \
factoryKeys += key; \
factories.insert(key, factory); \
creatable.insert(key, true); \
@@ -229,7 +229,7 @@ private:
factory = new QAxClass<Class>(typeLibID().toString(), appID().toString()); \
qRegisterMetaType<Class*>(#Class"*"); \
keys = factory->featureList(); \
- for (const QString &key : qAsConst(keys)) { \
+ for (const QString &key : std::as_const(keys)) { \
factoryKeys += key; \
factories.insert(key, factory); \
creatable.insert(key, false); \
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp
index 1b84b90..ac52583 100644
--- a/src/activeqt/control/qaxserverbase.cpp
+++ b/src/activeqt/control/qaxserverbase.cpp
@@ -609,7 +609,7 @@ public:
connections = old.connections;
that = old.that;
iid = old.iid;
- for (const CONNECTDATA &connection : qAsConst(connections))
+ for (const CONNECTDATA &connection : std::as_const(connections))
connection.pUnk->AddRef();
}
virtual ~QAxConnection()
diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp
index c2120b7..fc8bf8c 100644
--- a/tools/dumpcpp/main.cpp
+++ b/tools/dumpcpp/main.cpp
@@ -815,7 +815,7 @@ bool generateTypeLibrary(QString typeLibFile, QString outname,
declOut << '}' << Qt::endl << Qt::endl;
}
}
- for (const QByteArray &opaquePointerType : qAsConst(opaquePointerTypes))
+ for (const QByteArray &opaquePointerType : std::as_const(opaquePointerTypes))
declOut << "Q_DECLARE_OPAQUE_POINTER(" << opaquePointerType << "*)" << Qt::endl;
declOut << Qt::endl;
}