diff options
Diffstat (limited to 'src/dbus')
-rw-r--r-- | src/dbus/qdbusmetaobject.cpp | 4 | ||||
-rw-r--r-- | src/dbus/qdbusserver.cpp | 2 | ||||
-rw-r--r-- | src/dbus/qdbusservicewatcher.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
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); } } |