4 files changed, 21 insertions, 44 deletions
diff --git a/launcher/icons/IIconList.cpp b/launcher/icons/IIconList.cpp
deleted file mode 100644
index b3a8fb43..00000000
--- a/launcher/icons/IIconList.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "IIconList.h"
-
-// blargh
-IIconList::~IIconList()
-{
-}
-
diff --git a/launcher/icons/IIconList.h b/launcher/icons/IIconList.h
deleted file mode 100644
index 15d7dd15..00000000
--- a/launcher/icons/IIconList.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#pragma once
-
-#include <QString>
-#include <QStringList>
-
-enum IconType : unsigned
-{
-    Builtin,
-    Transient,
-    FileBased,
-    ICONS_TOTAL,
-    ToBeDeleted
-};
-
-class IIconList
-{
-public:
-    virtual ~IIconList();
-    virtual bool addIcon(const QString &key, const QString &name, const QString &path, const IconType type) = 0;
-    virtual bool deleteIcon(const QString &key) = 0;
-    virtual void saveIcon(const QString &key, const QString &path, const char * format) const = 0;
-    virtual bool iconFileExists(const QString &key) const = 0;
-    virtual void installIcons(const QStringList &iconFiles) = 0;
-    virtual void installIcon(const QString &file, const QString &name) = 0;
-};
diff --git a/launcher/icons/IconList.h b/launcher/icons/IconList.h
index 70266ebb..ebbb52e2 100644
--- a/launcher/icons/IconList.h
+++ b/launcher/icons/IconList.h
@@ -21,14 +21,15 @@
 #include <QDir>
 #include <QtGui/QIcon>
 #include <memory>
+
 #include "MMCIcon.h"
 #include "settings/Setting.h"
-#include "Env.h" // there is a global icon list inside Env.
-#include <icons/IIconList.h>
+
+#include "QObjectPtr.h"
 
 class QFileSystemWatcher;
 
-class IconList : public QAbstractListModel, public IIconList
+class IconList : public QAbstractListModel
 {
     Q_OBJECT
 public:
@@ -42,19 +43,19 @@ public:
     virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override;
 
-    bool addThemeIcon(const QString &key);
-    bool addIcon(const QString &key, const QString &name, const QString &path, const IconType type) override;
-    void saveIcon(const QString &key, const QString &path, const char * format) const override;
-    bool deleteIcon(const QString &key) override;
-    bool iconFileExists(const QString &key) const override;
-
     virtual QStringList mimeTypes() const override;
     virtual Qt::DropActions supportedDropActions() const override;
     virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
     virtual Qt::ItemFlags flags(const QModelIndex &index) const override;
 
-    void installIcons(const QStringList &iconFiles) override;
-    void installIcon(const QString &file, const QString &name) override;
+    bool addThemeIcon(const QString &key);
+    bool addIcon(const QString &key, const QString &name, const QString &path, const IconType type);
+    void saveIcon(const QString &key, const QString &path, const char * format) const;
+    bool deleteIcon(const QString &key);
+    bool iconFileExists(const QString &key) const;
+
+    void installIcons(const QStringList &iconFiles);
+    void installIcon(const QString &file, const QString &name);
 
     const MMCIcon * icon(const QString &key) const;
 
diff --git a/launcher/icons/MMCIcon.h b/launcher/icons/MMCIcon.h
index 1f05f28e..13d99318 100644
--- a/launcher/icons/MMCIcon.h
+++ b/launcher/icons/MMCIcon.h
@@ -17,7 +17,15 @@
 #include <QString>
 #include <QDateTime>
 #include <QIcon>
-#include <icons/IIconList.h>
+
+enum IconType : unsigned
+{
+    Builtin,
+    Transient,
+    FileBased,
+    ICONS_TOTAL,
+    ToBeDeleted
+};
 
 struct MMCImage
 {