diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -72,6 +72,7 @@ ) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) +add_definitions(-DQT_NO_FOREACH) add_subdirectory (src) if (BUILD_TESTING) diff --git a/autotests/common/test.cpp b/autotests/common/test.cpp --- a/autotests/common/test.cpp +++ b/autotests/common/test.cpp @@ -32,10 +32,10 @@ bool Test::inEmptySession() { - QStringList services = + const QStringList services = QDBusConnection::sessionBus().interface()->registeredServiceNames(); - foreach (const QString & service, services) { + for (const QString & service : services) { bool kdeServiceAndNotKAMD = service.startsWith(QStringLiteral("org.kde")) && service != KAMD_DBUS_SERVICE; diff --git a/src/imports/resourcemodel.cpp b/src/imports/resourcemodel.cpp --- a/src/imports/resourcemodel.cpp +++ b/src/imports/resourcemodel.cpp @@ -617,7 +617,7 @@ QStringList result; - foreach (const auto &resource, resources) { + for (const auto &resource : qAsConst(resources)) { result << resource.first; } diff --git a/src/lib/activitiescache_p.cpp b/src/lib/activitiescache_p.cpp --- a/src/lib/activitiescache_p.cpp +++ b/src/lib/activitiescache_p.cpp @@ -288,9 +288,9 @@ m_activities.clear(); - ActivityInfoList activities = _activities; + const ActivityInfoList activities = _activities; - foreach (const ActivityInfo &info, activities) { + for (const ActivityInfo &info : activities) { m_activities << info; } diff --git a/src/lib/consumer.cpp b/src/lib/consumer.cpp --- a/src/lib/consumer.cpp +++ b/src/lib/consumer.cpp @@ -75,7 +75,7 @@ result.reserve(d->cache->m_activities.size()); - foreach (const auto & info, d->cache->m_activities) { + for (const auto & info : qAsConst(d->cache->m_activities)) { if (info.state == state) { result << info.id; } @@ -90,7 +90,7 @@ result.reserve(d->cache->m_activities.size()); - foreach (const auto & info, d->cache->m_activities) { + for (const auto & info : qAsConst(d->cache->m_activities)) { result << info.id; } @@ -103,7 +103,7 @@ result.reserve(d->cache->m_activities.size()); - foreach (const auto & info, d->cache->m_activities) { + for (const auto & info : qAsConst(d->cache->m_activities)) { if (info.state == Info::Running || info.state == Info::Stopping) { result << info.id; }