From aa37e67ef7f5ff22da0ef95fb5221bc1fff9b3ca Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 6 Oct 2022 11:08:21 +0200 Subject: 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, with manual unstaging of the actual definition and documentation in dist/, src/corelib/doc/ and src/corelib/global/. Task-number: QTBUG-99313 Change-Id: I4c7114444a325ad4e62d0fcbfd347d2bbfb21541 Reviewed-by: Ivan Solovev --- src/dbus/qdbusmetaobject.cpp | 4 ++-- src/dbus/qdbusserver.cpp | 2 +- src/dbus/qdbusservicewatcher.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/dbus') diff --git a/src/dbus/qdbusmetaobject.cpp b/src/dbus/qdbusmetaobject.cpp index 107a825b98..2cb6e97f22 100644 --- a/src/dbus/qdbusmetaobject.cpp +++ b/src/dbus/qdbusmetaobject.cpp @@ -415,9 +415,9 @@ void QDBusMetaObjectGenerator::write(QDBusMetaObject *obj) qsizetype data_size = idata.size() + (header->methodCount * (QMetaObjectPrivate::IntsPerMethod+intsPerMethod)) + methodParametersDataSize + (header->propertyCount * (QMetaObjectPrivate::IntsPerProperty+intsPerProperty)); - for (const Method &mm : qAsConst(signals_)) + for (const Method &mm : std::as_const(signals_)) data_size += 2 + mm.inputTypes.size() + mm.outputTypes.size(); - for (const Method &mm : qAsConst(methods)) + for (const Method &mm : std::as_const(methods)) data_size += 2 + mm.inputTypes.size() + mm.outputTypes.size(); idata.resize(data_size + 1); diff --git a/src/dbus/qdbusserver.cpp b/src/dbus/qdbusserver.cpp index ebff0b559c..21d422ac9e 100644 --- a/src/dbus/qdbusserver.cpp +++ b/src/dbus/qdbusserver.cpp @@ -81,7 +81,7 @@ QDBusServer::~QDBusServer() QMutexLocker locker(managerMutex); QWriteLocker writeLocker(&d->lock); if (QDBusConnectionManager::instance()) { - for (const QString &name : qAsConst(d->serverConnectionNames)) + for (const QString &name : std::as_const(d->serverConnectionNames)) QDBusConnectionManager::instance()->removeConnection(name); d->serverConnectionNames.clear(); locker.unlock(); diff --git a/src/dbus/qdbusservicewatcher.cpp b/src/dbus/qdbusservicewatcher.cpp index 835a7cd3ac..4d180e2124 100644 --- a/src/dbus/qdbusservicewatcher.cpp +++ b/src/dbus/qdbusservicewatcher.cpp @@ -62,7 +62,7 @@ void QDBusServiceWatcherPrivate::setConnection(const QStringList &services, { if (connection.isConnected()) { // remove older rules - for (const QString &s : qAsConst(watchedServicesData.value())) + for (const QString &s : std::as_const(watchedServicesData.value())) removeService(s); } @@ -72,7 +72,7 @@ void QDBusServiceWatcherPrivate::setConnection(const QStringList &services, if (connection.isConnected()) { // add new rules - for (const QString &s : qAsConst(watchedServicesData.value())) + for (const QString &s : std::as_const(watchedServicesData.value())) addService(s); } } -- cgit v1.2.3