update the rest of the watchlets

4 files changed, 7 insertions, 7 deletions

diff --git a/qmsgwatchlet/qmsgwatchlet.cpp b/qmsgwatchlet/qmsgwatchlet.cpp
index 7111c81..6a24ab9 100644
--- a/qmsgwatchlet/qmsgwatchlet.cpp
+++ b/qmsgwatchlet/qmsgwatchlet.cpp
@@ -5,9 +5,9 @@
 QTM_USE_NAMESPACE
 using namespace sowatch;
 
-QMsgWatchlet::QMsgWatchlet(WatchServer* server) :
-	DeclarativeWatchlet(server, "com.javispedro.sowatch.qmsg"),
+QMsgWatchlet::QMsgWatchlet(Watch* watch) :
+	DeclarativeWatchlet(watch, "com.javispedro.sowatch.qmsg"),
     _qms(new QMessageService(this))
 {
-	setSource(QUrl(SOWATCH_QML_DIR "/qmsgwatchlet/" + server->watch()->model() + ".qml"));
+	setSource(QUrl(SOWATCH_QML_DIR "/qmsgwatchlet/" + watch->model() + ".qml"));
 }
diff --git a/qmsgwatchlet/qmsgwatchlet.h b/qmsgwatchlet/qmsgwatchlet.h
index 6fa331c..b698d21 100644
--- a/qmsgwatchlet/qmsgwatchlet.h
+++ b/qmsgwatchlet/qmsgwatchlet.h
@@ -11,7 +11,7 @@ class QMsgWatchlet : public DeclarativeWatchlet
 {
     Q_OBJECT
 public:
-	explicit QMsgWatchlet(WatchServer* server);
+	explicit QMsgWatchlet(Watch* watch);
 
 private:
 	QtMobility::QMessageService *_qms;
diff --git a/qmsgwatchlet/qmsgwatchletplugin.cpp b/qmsgwatchlet/qmsgwatchletplugin.cpp
index dfabd12..91c6387 100644
--- a/qmsgwatchlet/qmsgwatchletplugin.cpp
+++ b/qmsgwatchlet/qmsgwatchletplugin.cpp
@@ -32,11 +32,11 @@ WatchletPluginInterface::WatchletInfo QMsgWatchletPlugin::describeWatchlet(const
 	return info;
 }
 
-Watchlet* QMsgWatchletPlugin::getWatchlet(const QString &id, ConfigKey *config, WatchServer *server)
+Watchlet* QMsgWatchletPlugin::getWatchlet(const QString &id, ConfigKey *config, Watch *watch)
 {
 	Q_UNUSED(config);
 	if (id != "com.javispedro.sowatch.qmsg") return 0;
-	return new QMsgWatchlet(server);
+	return new QMsgWatchlet(watch);
 }
 
 Q_EXPORT_PLUGIN2(qmsgwatchlet, QMsgWatchletPlugin)
diff --git a/qmsgwatchlet/qmsgwatchletplugin.h b/qmsgwatchlet/qmsgwatchletplugin.h
index 01cb83e..728ed0b 100644
--- a/qmsgwatchlet/qmsgwatchletplugin.h
+++ b/qmsgwatchlet/qmsgwatchletplugin.h
@@ -17,7 +17,7 @@ public:
 
 	QStringList watchlets();
 	WatchletInfo describeWatchlet(const QString &id);
-	Watchlet* getWatchlet(const QString &id, ConfigKey *config, WatchServer *server);
+	Watchlet* getWatchlet(const QString &id, ConfigKey *config, Watch *watch);
 };
 
 }