summaryrefslogtreecommitdiff
path: root/qmapwatchlet
diff options
context:
space:
mode:
Diffstat (limited to 'qmapwatchlet')
-rw-r--r--qmapwatchlet/compasswatchlet.cpp6
-rw-r--r--qmapwatchlet/compasswatchlet.h2
-rw-r--r--qmapwatchlet/qmapwatchlet.cpp6
-rw-r--r--qmapwatchlet/qmapwatchlet.h2
-rw-r--r--qmapwatchlet/qmapwatchletplugin.cpp6
-rw-r--r--qmapwatchlet/qmapwatchletplugin.h2
6 files changed, 12 insertions, 12 deletions
diff --git a/qmapwatchlet/compasswatchlet.cpp b/qmapwatchlet/compasswatchlet.cpp
index cbc19a4..2ebfc42 100644
--- a/qmapwatchlet/compasswatchlet.cpp
+++ b/qmapwatchlet/compasswatchlet.cpp
@@ -4,8 +4,8 @@ using namespace sowatch;
const QLatin1String CompassWatchlet::myId("com.javispedro.sowatch.compass");
-CompassWatchlet::CompassWatchlet(WatchServer* server) :
- DeclarativeWatchlet(server, myId)
+CompassWatchlet::CompassWatchlet(Watch* watch) :
+ DeclarativeWatchlet(watch, myId)
{
- setSource(QUrl(SOWATCH_QML_DIR "/qmapwatchlet/compass-" + server->watch()->model() + ".qml"));
+ setSource(QUrl(SOWATCH_QML_DIR "/qmapwatchlet/compass-" + watch->model() + ".qml"));
}
diff --git a/qmapwatchlet/compasswatchlet.h b/qmapwatchlet/compasswatchlet.h
index 88547a2..3663c18 100644
--- a/qmapwatchlet/compasswatchlet.h
+++ b/qmapwatchlet/compasswatchlet.h
@@ -10,7 +10,7 @@ class CompassWatchlet : public DeclarativeWatchlet
{
Q_OBJECT
public:
- explicit CompassWatchlet(WatchServer* server);
+ explicit CompassWatchlet(Watch* watch);
static const QLatin1String myId;
};
diff --git a/qmapwatchlet/qmapwatchlet.cpp b/qmapwatchlet/qmapwatchlet.cpp
index d262c2c..28fa6fa 100644
--- a/qmapwatchlet/qmapwatchlet.cpp
+++ b/qmapwatchlet/qmapwatchlet.cpp
@@ -4,9 +4,9 @@ using namespace sowatch;
const QLatin1String QMapWatchlet::myId("com.javispedro.sowatch.qmap");
-QMapWatchlet::QMapWatchlet(WatchServer* server) :
- DeclarativeWatchlet(server, myId)
+QMapWatchlet::QMapWatchlet(Watch* watch) :
+ DeclarativeWatchlet(watch, myId)
{
setFullUpdateMode(true);
- setSource(QUrl(SOWATCH_QML_DIR "/qmapwatchlet/map-" + server->watch()->model() + ".qml"));
+ setSource(QUrl(SOWATCH_QML_DIR "/qmapwatchlet/map-" + watch->model() + ".qml"));
}
diff --git a/qmapwatchlet/qmapwatchlet.h b/qmapwatchlet/qmapwatchlet.h
index 8683aae..168368f 100644
--- a/qmapwatchlet/qmapwatchlet.h
+++ b/qmapwatchlet/qmapwatchlet.h
@@ -10,7 +10,7 @@ class QMapWatchlet : public DeclarativeWatchlet
{
Q_OBJECT
public:
- explicit QMapWatchlet(WatchServer* server);
+ explicit QMapWatchlet(Watch* watch);
static const QLatin1String myId;
};
diff --git a/qmapwatchlet/qmapwatchletplugin.cpp b/qmapwatchlet/qmapwatchletplugin.cpp
index 8f48539..b34606f 100644
--- a/qmapwatchlet/qmapwatchletplugin.cpp
+++ b/qmapwatchlet/qmapwatchletplugin.cpp
@@ -48,13 +48,13 @@ WatchletPluginInterface::WatchletInfo QMapWatchletPlugin::describeWatchlet(const
return info;
}
-Watchlet* QMapWatchletPlugin::getWatchlet(const QString &id, ConfigKey *config, WatchServer *server)
+Watchlet* QMapWatchletPlugin::getWatchlet(const QString &id, ConfigKey *config, Watch *watch)
{
Q_UNUSED(config);
if (id == QMapWatchlet::myId) {
- return new QMapWatchlet(server);
+ return new QMapWatchlet(watch);
} else if (id == CompassWatchlet::myId) {
- return new CompassWatchlet(server);
+ return new CompassWatchlet(watch);
}
return 0;
}
diff --git a/qmapwatchlet/qmapwatchletplugin.h b/qmapwatchlet/qmapwatchletplugin.h
index 3d10213..a6f494a 100644
--- a/qmapwatchlet/qmapwatchletplugin.h
+++ b/qmapwatchlet/qmapwatchletplugin.h
@@ -18,7 +18,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);
static QtMobility::QGeoServiceProvider * geoServiceProvider();