separation into lib and plugins complete

1 files changed, 9 insertions, 3 deletions

diff --git a/metawatch/metawatchplugin.cpp b/metawatch/metawatchplugin.cpp
index e5eaabf..e56d6db 100644
--- a/metawatch/metawatchplugin.cpp
+++ b/metawatch/metawatchplugin.cpp
@@ -1,8 +1,10 @@
+#include <QtConnectivity/QBluetoothAddress>
 #include "metawatch.h"
 #include "metawatchsimulator.h"
 #include "metawatchplugin.h"
 
 using namespace sowatch;
+QTM_USE_NAMESPACE
 
 MetaWatchPlugin::~MetaWatchPlugin()
 {
@@ -17,13 +19,17 @@ QStringList MetaWatchPlugin::drivers()
 	return d;
 }
 
-Watch* MetaWatchPlugin::getWatch(const QString& driver, const QString& connId, QObject *parent)
+Watch* MetaWatchPlugin::getWatch(const QString& driver, QSettings& settings, QObject *parent)
 {
 	if (driver == "metawatch-digital") {
-		return new MetaWatch(QBluetoothAddress(connId), parent);
+		QBluetoothAddress address(settings.value("address").toString());
+		return new MetaWatch(address, parent);
 	} else if (driver == "metawatch-digital-sim") {
-		return new MetaWatchSimulator(parent);
+		//return new MetaWatchSimulator(parent);
+		return 0;
 	} else {
 		return 0;
 	}
 }
+
+Q_EXPORT_PLUGIN2(metawatch, MetaWatchPlugin)