diff --git a/ksmserver/autostart.cpp b/ksmserver/autostart.cpp
index 219de6af6..0a421d316 100644
--- a/ksmserver/autostart.cpp
+++ b/ksmserver/autostart.cpp
@@ -1,159 +1,156 @@
 /*
  *  This file is part of the KDE libraries
  *  Copyright (c) 2001 Waldo Bastian <bastian@kde.org>
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Library General Public
  *  License version 2 as published by the Free Software Foundation.
  *
  *  This library is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  *  Library General Public License for more details.
  *
  *  You should have received a copy of the GNU Library General Public License
  *  along with this library; see the file COPYING.LIB.  If not, write to
  *  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  *  Boston, MA 02110-1301, USA.
  **/
 
 #include "autostart.h"
 
 #include <kautostart.h>
 #include <QStandardPaths>
 #include <QDir>
 
 class AutoStartItem
 {
 public:
     QString name;
     QString service;
     QString startAfter;
     int     phase;
 };
+Q_DECLARE_TYPEINFO(AutoStartItem, Q_MOVABLE_TYPE);
 
 AutoStart::AutoStart()
     : m_phase(-1), m_phasedone(false)
 {
 }
 
 AutoStart::~AutoStart()
 {
-    qDeleteAll(m_startList);
 }
 
 void
 AutoStart::setPhase(int phase)
 {
     if (phase > m_phase) {
         m_phase = phase;
         m_phasedone = false;
     }
 }
 
 void AutoStart::setPhaseDone()
 {
     m_phasedone = true;
 }
 
 static QString extractName(QString path) // krazy:exclude=passbyvalue
 {
     int i = path.lastIndexOf(QLatin1Char('/'));
     if (i >= 0) {
         path = path.mid(i + 1);
     }
     i = path.lastIndexOf(QLatin1Char('.'));
     if (i >= 0) {
         path = path.left(i);
     }
     return path;
 }
 
 void
 AutoStart::loadAutoStartList()
 {
     // XDG autostart dirs
 
     // Make unique list of relative paths
     QStringList files;
     QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericConfigLocation, QStringLiteral("autostart"), QStandardPaths::LocateDirectory);
     Q_FOREACH (const QString &dir, dirs) {
         const QStringList fileNames = QDir(dir).entryList(QStringList() << QStringLiteral("*.desktop"));
         Q_FOREACH (const QString &file, fileNames) {
             if (!files.contains(file)) {
                 files.append(file);
             }
         }
     }
 
-    for (QStringList::ConstIterator it = files.constBegin(); it != files.constEnd(); ++it) {
+    for (auto it = files.constBegin(); it != files.constEnd(); ++it) {
         KAutostart config(*it);
         if (!config.autostarts(QStringLiteral("KDE"), KAutostart::CheckAll)) {
             continue;
         }
 
-        const QString file = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, QStringLiteral("autostart/") + *it);
-        AutoStartItem *item = new AutoStartItem;
-        item->name = extractName(*it);
-        item->service = file;
-        item->startAfter = config.startAfter();
-        item->phase = qMax(KAutostart::BaseDesktop, config.startPhase());
+        const auto file = QStandardPaths::locate(QStandardPaths::GenericConfigLocation, QStringLiteral("autostart/") + *it);
+        AutoStartItem item;
+        item.name = extractName(file);
+        item.service = file;
+        item.startAfter = config.startAfter();
+        item.phase = qMax(KAutostart::BaseDesktop, config.startPhase());
         m_startList.append(item);
     }
 }
 
 QString
 AutoStart::startService()
 {
     if (m_startList.isEmpty()) {
         return QString();
     }
 
     while (!m_started.isEmpty()) {
 
         // Check for items that depend on previously started items
         QString lastItem = m_started[0];
-        QMutableListIterator<AutoStartItem *> it(m_startList);
+        QMutableVectorIterator<AutoStartItem> it(m_startList);
         while (it.hasNext()) {
-            AutoStartItem *item = it.next();
-            if (item->phase == m_phase
-                    &&  item->startAfter == lastItem) {
-                m_started.prepend(item->name);
-                QString service = item->service;
+            const auto &item = it.next();
+            if (item.phase == m_phase
+                    &&  item.startAfter == lastItem) {
+                m_started.prepend(item.name);
+                QString service = item.service;
                 it.remove();
-                delete item;
                 return service;
             }
         }
         m_started.removeFirst();
     }
 
     // Check for items that don't depend on anything
-    QMutableListIterator<AutoStartItem *> it(m_startList);
+    QMutableVectorIterator<AutoStartItem> it(m_startList);
     while (it.hasNext()) {
-        const auto item = it.next();
-        if (item->phase == m_phase
-                &&  item->startAfter.isEmpty()) {
-            m_started.prepend(item->name);
-            QString service = item->service;
+        const auto &item = it.next();
+        if (item.phase == m_phase
+                &&  item.startAfter.isEmpty()) {
+            m_started.prepend(item.name);
+            QString service = item.service;
             it.remove();
-            delete item;
             return service;
         }
     }
 
     // Just start something in this phase
     it = m_startList;
     while (it.hasNext()) {
-        const auto item = it.next();
-        if (item->phase == m_phase) {
-            m_started.prepend(item->name);
-            QString service = item->service;
+        const auto &item = it.next();
+        if (item.phase == m_phase) {
+            m_started.prepend(item.name);
+            QString service = item.service;
             it.remove();
-            delete item;
             return service;
         }
     }
 
     return QString();
 }
diff --git a/ksmserver/autostart.h b/ksmserver/autostart.h
index b82f8af07..0b8925e77 100644
--- a/ksmserver/autostart.h
+++ b/ksmserver/autostart.h
@@ -1,53 +1,54 @@
 /*
    This file is part of the KDE libraries
    Copyright (c) 2001 Waldo Bastian <bastian@kde.org>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
    License version 2 as published by the Free Software Foundation.
 
    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this library; see the file COPYING.LIB.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
    Boston, MA 02110-1301, USA.
 */
 
 #ifndef _AUTOSTART_H_
 #define _AUTOSTART_H_
 
-#include <QtCore/QStringList>
+#include <QStringList>
+#include <QVector>
 
 class AutoStartItem;
 
 class AutoStart
 {
 public:
     AutoStart();
     ~AutoStart();
 
     void loadAutoStartList();
     QString startService();
     void    setPhase(int phase);
     void    setPhaseDone();
     int     phase() const
     {
         return m_phase;
     }
     bool    phaseDone() const
     {
         return m_phasedone;
     }
 
 private:
-    QList<AutoStartItem *> m_startList;
+    QVector<AutoStartItem> m_startList;
     QStringList m_started;
     int m_phase;
     bool m_phasedone;
 };
 
 #endif