From 18a342ef1446997427de45095109f24c9352296d Mon Sep 17 00:00:00 2001
From: Petr Mrázek <peterix@gmail.com>
Date: Tue, 1 Jul 2014 01:48:09 +0200
Subject: Move settings lib into the main code, fixing error logging in it.

---
 logic/icons/IconList.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'logic/icons/IconList.h')

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;
-- 
cgit