diff --git a/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp b/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp
--- a/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp
+++ b/solid-device-automounter/kcm/DeviceAutomounterKCM.cpp
@@ -88,7 +88,8 @@
 
 void DeviceAutomounterKCM::updateForgetDeviceButton()
 {
-    foreach (const QModelIndex &idx, deviceView->selectionModel()->selectedIndexes()) {
+    const auto selectedIndex = deviceView->selectionModel()->selectedIndexes();
+    for (const QModelIndex &idx : selectedIndex) {
 		if (idx.data(DeviceModel::TypeRole) == DeviceModel::Detatched) {
 			forgetDevice->setEnabled(true);
 			return;
@@ -167,7 +168,8 @@
         }
     }
 
-    foreach (const QString &possibleDevice, AutomounterSettings::knownDevices()) {
+    const auto knownDevices = AutomounterSettings::knownDevices();
+    for (const QString &possibleDevice : knownDevices) {
         if (!validDevices.contains(possibleDevice)) {
             AutomounterSettings::deviceSettings(possibleDevice).deleteGroup();
         }
diff --git a/solid-device-automounter/kcm/DeviceModel.cpp b/solid-device-automounter/kcm/DeviceModel.cpp
--- a/solid-device-automounter/kcm/DeviceModel.cpp
+++ b/solid-device-automounter/kcm/DeviceModel.cpp
@@ -141,10 +141,12 @@
     m_automaticLogin = AutomounterSettings::automountOnLogin();
     m_automaticAttached = AutomounterSettings::automountOnPlugin();
 
-    foreach (const QString &dev, AutomounterSettings::knownDevices()) {
+    const auto knownDevices = AutomounterSettings::knownDevices();
+    for (const QString &dev : knownDevices) {
         addNewDevice(dev);
     }
-    foreach (const QString &udi, m_loginForced.keys()) {
+    const auto keys = m_loginForced.keys();
+    for (const QString &udi : keys) {
         m_loginForced[udi] = AutomounterSettings::deviceAutomountIsForced(udi, AutomounterSettings::Login);
         m_attachedForced[udi] = AutomounterSettings::deviceAutomountIsForced(udi, AutomounterSettings::Attach);
     }
diff --git a/solid-device-automounter/kded/DeviceAutomounter.cpp b/solid-device-automounter/kded/DeviceAutomounter.cpp
--- a/solid-device-automounter/kded/DeviceAutomounter.cpp
+++ b/solid-device-automounter/kded/DeviceAutomounter.cpp
@@ -69,10 +69,10 @@
     }
 
     connect(Solid::DeviceNotifier::instance(), &Solid::DeviceNotifier::deviceAdded, this, &DeviceAutomounter::deviceAdded);
-    QList<Solid::Device> volumes = Solid::Device::listFromType(Solid::DeviceInterface::StorageVolume);
-    foreach(Solid::Device volume, volumes) {
+    const QList<Solid::Device> volumes = Solid::Device::listFromType(Solid::DeviceInterface::StorageVolume);
+    for (Solid::Device volume : volumes) {
         // sa can be 0 (e.g. for the swap partition)
-        if (Solid::StorageAccess *sa = volume.as<Solid::StorageAccess>()) {
+        if (const Solid::StorageAccess *sa = volume.as<Solid::StorageAccess>()) {
             connect(sa, &Solid::StorageAccess::accessibilityChanged, this, &DeviceAutomounter::deviceMountChanged);
         }
         automountDevice(volume, AutomounterSettings::Login);