diff --git a/startkde/kcminit/main.h b/startkde/kcminit/main.h
--- a/startkde/kcminit/main.h
+++ b/startkde/kcminit/main.h
@@ -39,8 +39,8 @@
     private:
         bool runModule(const QString &libName, KService::Ptr service);
         void runModules( int phase );
-        KService::List list;
-        QSet<QString> alreadyInitialized;
+        KService::List m_list;
+        QSet<QString> m_alreadyInitialized;
 };
 
 #endif // MAIN_H
diff --git a/startkde/kcminit/main.cpp b/startkde/kcminit/main.cpp
--- a/startkde/kcminit/main.cpp
+++ b/startkde/kcminit/main.cpp
@@ -105,7 +105,7 @@
 void KCMInit::runModules( int phase )
 {
     QString KCMINIT_PREFIX=QStringLiteral("kcminit_");
-    foreach (const KService::Ptr & service, list) {
+    for (const KService::Ptr & service : qAsConst(m_list)) {
       const QVariant tmp = service->property(QStringLiteral("X-KDE-Init-Library"), QVariant::String);
       QString library;
       if( tmp.isValid() )
@@ -135,9 +135,9 @@
           continue;
 
       // try to load the library
-      if (!alreadyInitialized.contains(library)) {
+      if (!m_alreadyInitialized.contains(library)) {
           runModule(library, service);
-          alreadyInitialized.insert(library);
+          m_alreadyInitialized.insert(library);
       }
   }
 }
@@ -150,9 +150,9 @@
   }
 
   if (args.isSet(QStringLiteral("list"))) {
-    list = KServiceTypeTrader::self()->query( QStringLiteral("KCModuleInit") );
+    m_list = KServiceTypeTrader::self()->query( QStringLiteral("KCModuleInit") );
 
-    foreach (const KService::Ptr & service, list) {
+    for (const KService::Ptr &service : qAsConst(m_list)) {
       if (service->library().isEmpty())
         continue; // Skip
       printf("%s\n", QFile::encodeName(service->desktopEntryName()).data());
@@ -170,11 +170,11 @@
       qCritical() << i18n("Module %1 not found", module);
       return;
     } else {
-      list.append(serv);
+      m_list.append(serv);
     }
   } else {
     // locate the desktop files
-    list = KServiceTypeTrader::self()->query( QStringLiteral("KCModuleInit") );
+    m_list = KServiceTypeTrader::self()->query( QStringLiteral("KCModuleInit") );
   }
 
   if( startup ) {
diff --git a/startkde/plasma-session/main.cpp b/startkde/plasma-session/main.cpp
--- a/startkde/plasma-session/main.cpp
+++ b/startkde/plasma-session/main.cpp
@@ -29,8 +29,8 @@
     // the internal QEventLoopLocker expires and our app exits
     app.setQuitLockEnabled(false);
 
-    auto startup = new Startup(&app);
-    auto shutdown = new Shutdown(&app);
+    new Startup(&app);
+    new Shutdown(&app);
 
     app.exec();
 }
diff --git a/startkde/plasma-session/shutdown.cpp b/startkde/plasma-session/shutdown.cpp
--- a/startkde/plasma-session/shutdown.cpp
+++ b/startkde/plasma-session/shutdown.cpp
@@ -76,11 +76,11 @@
 void Shutdown::runShutdownScripts()
 {
     const QStringList shutdownFolders = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QStringLiteral("plasma-workspace/shutdown"), QStandardPaths::LocateDirectory);
-    foreach (const QString &shutDownFolder, shutdownFolders) {
+    for (const QString &shutDownFolder : shutdownFolders) {
         QDir dir(shutDownFolder);
 
         const QStringList entries = dir.entryList(QDir::Files);
-        foreach (const QString &file, entries) {
+        for (const QString &file : entries) {
             // Don't execute backup files
             if (!file.endsWith(QLatin1Char('~')) && !file.endsWith(QLatin1String(".bak")) &&
                     (file[0] != QLatin1Char('%') || !file.endsWith(QLatin1Char('%'))) &&
diff --git a/startkde/plasma-session/startup.cpp b/startkde/plasma-session/startup.cpp
--- a/startkde/plasma-session/startup.cpp
+++ b/startkde/plasma-session/startup.cpp
@@ -323,7 +323,7 @@
     }
 
     const QStringList entries = dir.entryList(QDir::Files);
-    foreach (const QString &file, entries) {
+    for (const QString &file : entries) {
         // Don't execute backup files
         if (!file.endsWith(QLatin1Char('~')) && !file.endsWith(QLatin1String(".bak")) &&
                 (file[0] != QLatin1Char('%') || !file.endsWith(QLatin1Char('%'))) &&
@@ -361,7 +361,7 @@
     const QDir oldFolder(oldAutostart);
     qCDebug(PLASMA_SESSION) << "Copying autostart files from" << oldFolder.path();
     const QStringList entries = oldFolder.entryList(QDir::Files);
-    foreach (const QString &file, entries) {
+    for (const QString &file : entries) {
         const QString src = oldFolder.absolutePath() + QLatin1Char('/') + file;
         const QString dest = autostartFolder + QLatin1Char('/') + file;
         QFileInfo info(src);