summaryrefslogtreecommitdiffstats
path: root/MultiMC.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-02-01 11:44:47 +0100
committerPetr Mrázek <peterix@gmail.com>2015-04-12 20:57:16 +0200
commitaa70ed2244700dbcc93c1fadb22edc1c1caede37 (patch)
tree79fc6703e984edc4d631be8c6f40c71400f88aba /MultiMC.h
parent154d19bb74f4c5fc1519aa40cd9dfd20244273a1 (diff)
downloadMultiMC-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 'MultiMC.h')
-rw-r--r--MultiMC.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/MultiMC.h b/MultiMC.h
index ccf950d1..ba8563e7 100644
--- a/MultiMC.h
+++ b/MultiMC.h
@@ -64,9 +64,6 @@ public:
// InstanceList, OneSixUpdate, MinecraftInstance, OneSixProfileStrategy
std::shared_ptr<MinecraftVersionList> minecraftlist();
- // LegacyInstance, BaseInstance, OneSixInstance, InstanceList
- std::shared_ptr<IconList> icons();
-
QIcon getThemedIcon(const QString& name);
void setIconTheme(const QString& name);
@@ -152,6 +149,8 @@ private slots:
private:
void initLogger();
+ void initIcons();
+
void initGlobalSettings(bool test_mode);
void initTranslations();
@@ -166,7 +165,6 @@ private:
std::shared_ptr<InstanceList> m_instances;
std::shared_ptr<UpdateChecker> m_updateChecker;
std::shared_ptr<MojangAccountList> m_accounts;
- std::shared_ptr<IconList> m_icons;
std::shared_ptr<LWJGLVersionList> m_lwjgllist;
std::shared_ptr<ForgeVersionList> m_forgelist;
std::shared_ptr<LiteLoaderVersionList> m_liteloaderlist;