diff --git a/kcms/solid_actions/ActionItem.cpp b/kcms/solid_actions/ActionItem.cpp
--- a/kcms/solid_actions/ActionItem.cpp
+++ b/kcms/solid_actions/ActionItem.cpp
@@ -88,9 +88,9 @@
 QString ActionItem::involvedTypes() const
 {
     SolidActionData * actData = SolidActionData::instance();
-    QSet<Solid::DeviceInterface::Type> devTypeList = predicateItem.usedTypes();
+    const QSet<Solid::DeviceInterface::Type> devTypeList = predicateItem.usedTypes();
     QStringList deviceTypes;
-    foreach( Solid::DeviceInterface::Type devType, devTypeList ) {
+    for (Solid::DeviceInterface::Type devType : devTypeList) {
         deviceTypes << actData->nameFromInterface( devType );
     }
 
@@ -140,10 +140,10 @@
     int countAccess = 0;
 
     if (actionType == ActionItem::DesktopRead) {
-        foreach(KConfigGroup * possibleGroup, actionGroups.values(keyGroup)) {
+        const auto values = actionGroups.values(keyGroup);
+        for (KConfigGroup *possibleGroup : values) {
             if (possibleGroup->hasKey(keyName)) {
                 return possibleGroup;
-                break;
             }
         }
     } else if (actionType == ActionItem::DesktopWrite) {
diff --git a/kcms/solid_actions/ActionModel.cpp b/kcms/solid_actions/ActionModel.cpp
--- a/kcms/solid_actions/ActionModel.cpp
+++ b/kcms/solid_actions/ActionModel.cpp
@@ -104,14 +104,14 @@
     // Prepare to search for possible actions -> we only want solid types
     const QStringList actionDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("solid/actions"), QStandardPaths::LocateDirectory);
     // Get service objects for those actions and add them to the display
-    foreach (const QString & actionDir, actionDirs) {
+    for (const QString &actionDir : actionDirs) {
         QDirIterator it(actionDir, QStringList() << QStringLiteral("*.desktop"));
         while (it.hasNext()) {
             it.next();
             const QString desktop = it.filePath();
             // Get contained services list
-            QList<KServiceAction> services = KDesktopFileActions::userDefinedServices(desktop, true);
-            foreach( const KServiceAction &deviceAction, services ) {
+            const QList<KServiceAction> services = KDesktopFileActions::userDefinedServices(desktop, true);
+            for (const KServiceAction &deviceAction : services) {
                 ActionItem * actionItem = new ActionItem( desktop, deviceAction.name(), this ); // Create an action
                 d->actions.append( actionItem );
             }
diff --git a/kcms/solid_actions/DesktopFileGenerator.cpp b/kcms/solid_actions/DesktopFileGenerator.cpp
--- a/kcms/solid_actions/DesktopFileGenerator.cpp
+++ b/kcms/solid_actions/DesktopFileGenerator.cpp
@@ -17,7 +17,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA          *
  ***************************************************************************/
 
-#include <QDebug>
 #include <QCoreApplication>
 #include <QCommandLineParser>
 
@@ -46,8 +45,9 @@
     parser.process(application);
     aboutData.processCommandLine(&parser);
 
-    SolidActionData * availActions = SolidActionData::instance();
-    foreach( Solid::DeviceInterface::Type internalType, availActions->interfaceTypeList() ) {
+    SolidActionData *availActions = SolidActionData::instance();
+    const auto interfaceTypes = availActions->interfaceTypeList();
+    for (Solid::DeviceInterface::Type internalType : interfaceTypes) {
         const QString typeName = Solid::DeviceInterface::typeToString( internalType );
         KDesktopFile typeFile(QStandardPaths::GenericDataLocation, "solid/devices/solid-device-" + typeName + ".desktop" );
         KConfigGroup tConfig = typeFile.desktopGroup();
@@ -64,8 +64,7 @@
         const QString actionText = typeValues.join(QLatin1Char(';')).append(";");
         tConfig.writeEntry( "Actions", actionText );
 
-        qWarning() << "Desktop file created: " + typeFile.fileName();
-        foreach( const QString &tValue, typeValues ) {
+        for (const QString &tValue : typeValues) {
             KConfigGroup vConfig = typeFile.actionGroup( tValue );
             if( !vConfig.hasKey("Name") ) {
                 vConfig.writeEntry( "Name", availActions->propertyName( internalType, tValue ) );
@@ -76,6 +75,5 @@
         typeFile.sync();
     }
 
-    qWarning() << "Generation now completed";
     return 0;
 }
diff --git a/kcms/solid_actions/SolidActionData.cpp b/kcms/solid_actions/SolidActionData.cpp
--- a/kcms/solid_actions/SolidActionData.cpp
+++ b/kcms/solid_actions/SolidActionData.cpp
@@ -46,8 +46,8 @@
 {
     const int propertyOffset = Solid::DeviceInterface::staticMetaObject.propertyOffset();
 
-    QList<QMetaObject> interfaceList = fillInterfaceList();
-    foreach( const QMetaObject &interface, interfaceList ) {
+    const QList<QMetaObject> interfaceList = fillInterfaceList();
+    for (const QMetaObject &interface : interfaceList) {
         QString ifaceName = interface.className();
         ifaceName.remove(0, ifaceName.lastIndexOf(':') + 1);
         Solid::DeviceInterface::Type ifaceDev = Solid::DeviceInterface::stringToType( ifaceName );
@@ -80,7 +80,8 @@
             types.insert( ifaceDev, cleanName ); // Read the user friendly name
 
             QMap<QString,QString> deviceValues = values.value( ifaceDev );
-            foreach( const QString &text, deviceFile.readActions() ) { // We want every single action
+            const auto actions = deviceFile.readActions();
+            for (const QString &text : actions) { // We want every single action
                 KConfigGroup actionType = deviceFile.actionGroup( text );
                 deviceValues.insert( text, actionType.readEntry("Name") ); // Add to the type - actions map
             }
diff --git a/kcms/solid_actions/SolidActions.cpp b/kcms/solid_actions/SolidActions.cpp
--- a/kcms/solid_actions/SolidActions.cpp
+++ b/kcms/solid_actions/SolidActions.cpp
@@ -136,9 +136,9 @@
 
     // Prepare to open the editDialog
     fillActionsList();
-    QList<ActionItem*> actionList = actionModel->actionList();
+    const QList<ActionItem*> actionList = actionModel->actionList();
     QModelIndex newAction;
-    foreach( ActionItem * newItem, actionList ) { // Lets find our new action
+    for (ActionItem *newItem : actionList) { // Lets find our new action
         if( newItem->desktopMasterPath == filePath ) {
             const int position = actionList.indexOf( newItem );
             newAction = actionModel->index( position, 0 ); // Grab it