diff options
| author | Petr Mrázek <peterix@gmail.com> | 2015-02-01 11:44:47 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2015-04-12 20:57:16 +0200 |
| commit | aa70ed2244700dbcc93c1fadb22edc1c1caede37 (patch) | |
| tree | 79fc6703e984edc4d631be8c6f40c71400f88aba /logic/icons/IconList.h | |
| parent | 154d19bb74f4c5fc1519aa40cd9dfd20244273a1 (diff) | |
| download | MultiMC-aa70ed2244700dbcc93c1fadb22edc1c1caede37.tar MultiMC-aa70ed2244700dbcc93c1fadb22edc1c1caede37.tar.gz MultiMC-aa70ed2244700dbcc93c1fadb22edc1c1caede37.tar.lz MultiMC-aa70ed2244700dbcc93c1fadb22edc1c1caede37.tar.xz MultiMC-aa70ed2244700dbcc93c1fadb22edc1c1caede37.zip | |
SCRATCH move icons over to Env, instance proxy model to gui
Diffstat (limited to 'logic/icons/IconList.h')
| -rw-r--r-- | logic/icons/IconList.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/logic/icons/IconList.h b/logic/icons/IconList.h index 8687eba6..124ecf27 100644 --- a/logic/icons/IconList.h +++ b/logic/icons/IconList.h @@ -23,6 +23,7 @@ #include <memory> #include "MMCIcon.h" #include "logic/settings/Setting.h" +#include "logic/Env.h" // there is a global icon list inside Env. class QFileSystemWatcher; @@ -30,7 +31,7 @@ class IconList : public QAbstractListModel { Q_OBJECT public: - explicit IconList(QString path, QObject *parent = 0); + explicit IconList(QString builtinPath, QString path, QObject *parent = 0); virtual ~IconList() {}; QIcon getIcon(QString key); |