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 /MultiMC.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 'MultiMC.h')
-rw-r--r-- | MultiMC.h | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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; |