From 4ad9e1874af29864ca8531e5ba033b85d6616639 Mon Sep 17 00:00:00 2001
From: "Javier S. Pedro" <maemo@javispedro.com>
Date: Fri, 10 Aug 2012 17:49:45 +0200
Subject: cleanup and bump version to 0.4

---
 qmsgwatchlet/qmsgwatchlet.pro       |  6 +-----
 qmsgwatchlet/qmsgwatchletplugin.cpp | 15 ++++++++++++---
 qmsgwatchlet/qmsgwatchletplugin.h   |  3 ++-
 3 files changed, 15 insertions(+), 9 deletions(-)

(limited to 'qmsgwatchlet')

diff --git a/qmsgwatchlet/qmsgwatchlet.pro b/qmsgwatchlet/qmsgwatchlet.pro
index ef02f16..9e18e42 100644
--- a/qmsgwatchlet/qmsgwatchlet.pro
+++ b/qmsgwatchlet/qmsgwatchlet.pro
@@ -1,4 +1,3 @@
-
 TARGET = qmsgwatchlet
 TEMPLATE = lib
 CONFIG   += plugin
@@ -11,10 +10,7 @@ HEADERS += qmsgwatchletplugin.h qmsgwatchlet.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
diff --git a/qmsgwatchlet/qmsgwatchletplugin.cpp b/qmsgwatchlet/qmsgwatchletplugin.cpp
index 64a4157..2471d03 100644
--- a/qmsgwatchlet/qmsgwatchletplugin.cpp
+++ b/qmsgwatchlet/qmsgwatchletplugin.cpp
@@ -19,10 +19,19 @@ QStringList QMsgWatchletPlugin::watchlets()
 	return l;
 }
 
-Watchlet* QMsgWatchletPlugin::getWatchlet(const QString& driver, QSettings& settings, WatchServer *server)
+WatchletPluginInterface::WatchletInfo QMsgWatchletPlugin::describeWatchlet(const QString &id)
 {
-	Q_UNUSED(driver);
-	Q_UNUSED(settings);
+	WatchletInfo info;
+	if (id != "com.javispedro.sowatch.qmsg") return info;
+	info.name = "Inbox";
+	info.icon = QUrl::fromLocalFile(SOWATCH_QML_DIR "/qmsgwatchlet/icon.png");
+	return info;
+}
+
+Watchlet* QMsgWatchletPlugin::getWatchlet(const QString &id, ConfigKey *config, WatchServer *server)
+{
+	Q_UNUSED(config);
+	if (id != "com.javispedro.sowatch.qmsg") return 0;
 	return new QMsgWatchlet(server);
 }
 
diff --git a/qmsgwatchlet/qmsgwatchletplugin.h b/qmsgwatchlet/qmsgwatchletplugin.h
index 4d08e94..01cb83e 100644
--- a/qmsgwatchlet/qmsgwatchletplugin.h
+++ b/qmsgwatchlet/qmsgwatchletplugin.h
@@ -16,7 +16,8 @@ public:
 	~QMsgWatchletPlugin();
 
 	QStringList watchlets();
-	Watchlet* getWatchlet(const QString& driver, QSettings& settings, WatchServer* server);
+	WatchletInfo describeWatchlet(const QString &id);
+	Watchlet* getWatchlet(const QString &id, ConfigKey *config, WatchServer *server);
 };
 
 }
-- 
cgit v1.2.3