more cleanup fixes

9 files changed, 9 insertions, 21 deletions

diff --git a/ckitcallnotification/ckitcallplugin.cpp b/ckitcallnotification/ckitcallplugin.cpp
index aea82c2..b63c1b6 100644
--- a/ckitcallnotification/ckitcallplugin.cpp
+++ b/ckitcallnotification/ckitcallplugin.cpp
@@ -19,7 +19,7 @@ QStringList CKitCallPlugin::providers()
 	return providers;
 }
 
-NotificationProvider* CKitCallPlugin::getProvider(const QString& driver, QSettings& settings, QObject *parent)
+NotificationProvider* CKitCallPlugin::getProvider(const QString& driver, ConfigKey *settings, QObject *parent)
 {
 	Q_UNUSED(driver);
 	Q_UNUSED(settings);
diff --git a/ckitcallnotification/ckitcallplugin.h b/ckitcallnotification/ckitcallplugin.h
index a9d432d..b55f178 100644
--- a/ckitcallnotification/ckitcallplugin.h
+++ b/ckitcallnotification/ckitcallplugin.h
@@ -16,7 +16,7 @@ public:
 	~CKitCallPlugin();
 
 	QStringList providers();
-	NotificationProvider* getProvider(const QString& driver, QSettings& settings, QObject *parent = 0);
+	NotificationProvider* getProvider(const QString& driver, ConfigKey *settings, QObject *parent = 0);
 };
 
 }
diff --git a/harmaccuweather/harmaccuplugin.cpp b/harmaccuweather/harmaccuplugin.cpp
index 25821c4..7414187 100644
--- a/harmaccuweather/harmaccuplugin.cpp
+++ b/harmaccuweather/harmaccuplugin.cpp
@@ -19,7 +19,7 @@ QStringList HarmAccuPlugin::providers()
 	return providers;
 }
 
-NotificationProvider* HarmAccuPlugin::getProvider(const QString& id, QSettings& settings, QObject *parent)
+NotificationProvider* HarmAccuPlugin::getProvider(const QString& id, ConfigKey *settings, QObject *parent)
 {
 	Q_UNUSED(settings);
 	if (id != "harmaccu") return 0;
diff --git a/harmaccuweather/harmaccuplugin.h b/harmaccuweather/harmaccuplugin.h
index 16198ad..d27c796 100644
--- a/harmaccuweather/harmaccuplugin.h
+++ b/harmaccuweather/harmaccuplugin.h
@@ -16,7 +16,7 @@ public:
 	~HarmAccuPlugin();
 
 	QStringList providers();
-	NotificationProvider* getProvider(const QString& driver, QSettings& settings, QObject *parent = 0);
+	NotificationProvider* getProvider(const QString& driver, ConfigKey *settings, QObject *parent = 0);
 };
 
 }
diff --git a/meegohandsetnotification/meegohandsetplugin.cpp b/meegohandsetnotification/meegohandsetplugin.cpp
index bac41aa..0f50575 100644
--- a/meegohandsetnotification/meegohandsetplugin.cpp
+++ b/meegohandsetnotification/meegohandsetplugin.cpp
@@ -18,7 +18,7 @@ QStringList MeegoHandsetPlugin::providers()
 	return providers;
 }
 
-NotificationProvider* MeegoHandsetPlugin::getProvider(const QString& driver, QSettings& settings, QObject *parent)
+NotificationProvider* MeegoHandsetPlugin::getProvider(const QString& driver, ConfigKey* settings, QObject *parent)
 {
 	Q_UNUSED(driver);
 	Q_UNUSED(settings);
diff --git a/meegohandsetnotification/meegohandsetplugin.h b/meegohandsetnotification/meegohandsetplugin.h
index 616fb9b..4d826dc 100644
--- a/meegohandsetnotification/meegohandsetplugin.h
+++ b/meegohandsetnotification/meegohandsetplugin.h
@@ -16,7 +16,7 @@ public:
 	~MeegoHandsetPlugin();
 
 	QStringList providers();
-	NotificationProvider* getProvider(const QString& driver, QSettings& settings, QObject *parent = 0);
+	NotificationProvider* getProvider(const QString& driver, ConfigKey *settings, QObject *parent = 0);
 };
 
 }
diff --git a/sowatch.pro b/sowatch.pro
index 9a89759..2f4ed37 100644
--- a/sowatch.pro
+++ b/sowatch.pro
@@ -22,8 +22,8 @@ unix {
 }
 
 contains(MEEGO_EDITION,harmattan) {
-#	SUBDIRS += meegohandsetnotification ckitcallnotification harmaccuweather
-#   SUBDIRS += qmafwwatchlet
+	SUBDIRS += meegohandsetnotification ckitcallnotification harmaccuweather
+	#SUBDIRS += qmafwwatchlet
 
 	meegohandsetnotification.depends = libsowatch
 	ckitcallnotification.depends = libsowatch
diff --git a/sowatchd/daemon.cpp b/sowatchd/daemon.cpp
index 61144de..f8cfa00 100644
--- a/sowatchd/daemon.cpp
+++ b/sowatchd/daemon.cpp
@@ -101,15 +101,6 @@ void Daemon::stopWatch(const QString &name)
 	qDebug() << "Stopping watch" << name;
 }
 
-#if TODO
-void Daemon::initWatch(Watch* watch, QSettings& settings)
-{
-	int size;
-
-
-}
-#endif
-
 void Daemon::settingsChanged(const QString &subkey)
 {
 	qDebug() << "Daemon settings changed" << subkey;
diff --git a/sysinfowatchlet/sysinfowatchlet.pro b/sysinfowatchlet/sysinfowatchlet.pro
index 70fd3f7..3b3087b 100644
--- a/sysinfowatchlet/sysinfowatchlet.pro
+++ b/sysinfowatchlet/sysinfowatchlet.pro
@@ -17,10 +17,7 @@ HEADERS += sysinfoplugin.h sysinfowatchlet.h
 
 qml_files.files = metawatch-digital.qml icon.png
 
-win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../libsowatch/release/ -lsowatch
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../libsowatch/debug/ -lsowatch
-else:symbian: LIBS += -lsowatch
-else:unix: LIBS += -L$$OUT_PWD/../libsowatch/ -lsowatch
+LIBS += -L$$OUT_PWD/../libsowatch/ -lsowatch
 
 INCLUDEPATH += $$PWD/../libsowatch
 DEPENDPATH += $$PWD/../libsowatch