summaryrefslogtreecommitdiffstats
path: root/logic/icons/IconList.h
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2014-07-01 01:48:09 +0200
committerPetr Mrázek <peterix@gmail.com>2014-07-01 01:48:09 +0200
commit18a342ef1446997427de45095109f24c9352296d (patch)
tree73f4dd5a79e3df896f10b36dec4496afa8517907 /logic/icons/IconList.h
parent8b86306d48fff4a6cc9291d00e1211a5e5dc1903 (diff)
downloadMultiMC-18a342ef1446997427de45095109f24c9352296d.tar
MultiMC-18a342ef1446997427de45095109f24c9352296d.tar.gz
MultiMC-18a342ef1446997427de45095109f24c9352296d.tar.lz
MultiMC-18a342ef1446997427de45095109f24c9352296d.tar.xz
MultiMC-18a342ef1446997427de45095109f24c9352296d.zip
Move settings lib into the main code, fixing error logging in it.
Diffstat (limited to 'logic/icons/IconList.h')
-rw-r--r--logic/icons/IconList.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/logic/icons/IconList.h b/logic/icons/IconList.h
index 4ee3f782..e3ff9fab 100644
--- a/logic/icons/IconList.h
+++ b/logic/icons/IconList.h
@@ -22,7 +22,7 @@
#include <QtGui/QIcon>
#include <memory>
#include "MMCIcon.h"
-#include "setting.h"
+#include "logic/settings/Setting.h"
class QFileSystemWatcher;
@@ -68,7 +68,7 @@ protected
slots:
void directoryChanged(const QString &path);
void fileChanged(const QString &path);
- void settingChanged(const Setting & setting, QVariant value);
+ void SettingChanged(const Setting & setting, QVariant value);
private:
std::shared_ptr<QFileSystemWatcher> m_watcher;
bool is_watching;