summaryrefslogtreecommitdiffstats
path: root/api/gui/icons/IconList.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2016-05-03 00:27:28 +0200
committerPetr Mrázek <peterix@gmail.com>2016-05-03 00:27:28 +0200
commite1a530f84dce9b4c1b262669157359fbbd436428 (patch)
treecc372ad70b91977d1f038fe835a139cdf6bfb7d1 /api/gui/icons/IconList.h
parentc50b3cdeec1ce30de7c67f62f026d689afe6930a (diff)
downloadMultiMC-e1a530f84dce9b4c1b262669157359fbbd436428.tar
MultiMC-e1a530f84dce9b4c1b262669157359fbbd436428.tar.gz
MultiMC-e1a530f84dce9b4c1b262669157359fbbd436428.tar.lz
MultiMC-e1a530f84dce9b4c1b262669157359fbbd436428.tar.xz
MultiMC-e1a530f84dce9b4c1b262669157359fbbd436428.zip
GH-1559 Fix FTB icons
This was caused by separation of GUI and logic. Now logic has an interface that GUI implements. It should be expanded upon later.
Diffstat (limited to 'api/gui/icons/IconList.h')
-rw-r--r--api/gui/icons/IconList.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/api/gui/icons/IconList.h b/api/gui/icons/IconList.h
index 04dea2cd..7aeb7067 100644
--- a/api/gui/icons/IconList.h
+++ b/api/gui/icons/IconList.h
@@ -24,12 +24,13 @@
#include "MMCIcon.h"
#include "settings/Setting.h"
#include "Env.h" // there is a global icon list inside Env.
+#include <icons/IIconList.h>
#include "multimc_gui_export.h"
class QFileSystemWatcher;
-class MULTIMC_GUI_EXPORT IconList : public QAbstractListModel
+class MULTIMC_GUI_EXPORT IconList : public QAbstractListModel, public IIconList
{
Q_OBJECT
public:
@@ -40,18 +41,17 @@ public:
QIcon getBigIcon(QString key);
int getIconIndex(QString key);
- virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
- virtual int rowCount(const QModelIndex &parent = QModelIndex()) const;
+ virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+ virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override;
- bool addIcon(QString key, QString name, QString path, MMCIcon::Type type);
+ virtual bool addIcon(QString key, QString name, QString path, IconType type) override;
bool deleteIcon(QString key);
bool iconFileExists(QString key);
- virtual QStringList mimeTypes() const;
- virtual Qt::DropActions supportedDropActions() const;
- virtual bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column,
- const QModelIndex &parent);
- virtual Qt::ItemFlags flags(const QModelIndex &index) const;
+ 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(QStringList iconFiles);