ABI change: Watchlet now depends on Watch, not WatchServer

4 files changed, 7 insertions, 7 deletions

diff --git a/notificationswatchlet/notificationswatchlet.cpp b/notificationswatchlet/notificationswatchlet.cpp
index 89e61ca..b587fb5 100644
--- a/notificationswatchlet/notificationswatchlet.cpp
+++ b/notificationswatchlet/notificationswatchlet.cpp
@@ -2,9 +2,9 @@
 
 using namespace sowatch;
 
-NotificationsWatchlet::NotificationsWatchlet(WatchServer* server) :
-	DeclarativeWatchlet(server, "com.javispedro.sowatch.notifications")
+NotificationsWatchlet::NotificationsWatchlet(Watch* watch) :
+	DeclarativeWatchlet(watch, "com.javispedro.sowatch.notifications")
 {
-	setSource(QUrl(SOWATCH_QML_DIR "/notificationswatchlet/" + server->watch()->model() + ".qml"));
+	setSource(QUrl(SOWATCH_QML_DIR "/notificationswatchlet/" + watch->model() + ".qml"));
 }
 
diff --git a/notificationswatchlet/notificationswatchlet.h b/notificationswatchlet/notificationswatchlet.h
index fe49f97..78df1f6 100644
--- a/notificationswatchlet/notificationswatchlet.h
+++ b/notificationswatchlet/notificationswatchlet.h
@@ -10,7 +10,7 @@ class NotificationsWatchlet : public DeclarativeWatchlet
 {
     Q_OBJECT
 public:
-	explicit NotificationsWatchlet(WatchServer* server);
+	explicit NotificationsWatchlet(Watch* watch);
 };
 
 }
diff --git a/notificationswatchlet/notificationswatchletplugin.cpp b/notificationswatchlet/notificationswatchletplugin.cpp
index d5ba173..4b26a14 100644
--- a/notificationswatchlet/notificationswatchletplugin.cpp
+++ b/notificationswatchlet/notificationswatchletplugin.cpp
@@ -28,11 +28,11 @@ WatchletPluginInterface::WatchletInfo NotificationsWatchletPlugin::describeWatch
 	return info;
 }
 
-Watchlet* NotificationsWatchletPlugin::getWatchlet(const QString& driver, ConfigKey *settings, WatchServer *server)
+Watchlet* NotificationsWatchletPlugin::getWatchlet(const QString& driver, ConfigKey *settings, Watch *watch)
 {
 	Q_UNUSED(driver);
 	Q_UNUSED(settings);
-	return new NotificationsWatchlet(server);
+	return new NotificationsWatchlet(watch);
 }
 
 Q_EXPORT_PLUGIN2(notificationswatchlet, NotificationsWatchletPlugin)
diff --git a/notificationswatchlet/notificationswatchletplugin.h b/notificationswatchlet/notificationswatchletplugin.h
index 7efbc1c..472af5c 100644
--- a/notificationswatchlet/notificationswatchletplugin.h
+++ b/notificationswatchlet/notificationswatchletplugin.h
@@ -17,7 +17,7 @@ public:
 
 	QStringList watchlets();
 	WatchletInfo describeWatchlet(const QString &id);
-	Watchlet* getWatchlet(const QString& id, ConfigKey *settings, WatchServer* server);
+	Watchlet* getWatchlet(const QString& id, ConfigKey *settings, Watch* watch);
 };
 
 }