summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-10-06 11:13:47 +0200
committerMarc Mutz <marc.mutz@qt.io>2022-10-06 17:30:25 +0200
commitc2a9c3827bcd396a52812c528e3257b3581156b0 (patch)
tree2613b67d7c1f19de2d1440ab53c1a81c2d281067 /src
parent7848d23be6181573c5fe7dbe2bc5d604e66f8e4e (diff)
downloadqtactiveqt-c2a9c3827bcd396a52812c528e3257b3581156b0.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. Task-number: QTBUG-99313 Change-Id: I7d7d21564161807692941b12085686711583d556 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/activeqt/container/qaxscript.cpp6
-rw-r--r--src/activeqt/control/qaxfactory.h4
-rw-r--r--src/activeqt/control/qaxserverbase.cpp2
3 files changed, 6 insertions, 6 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 88c3fd7..a7675ef 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()