From 22ca8687ef2c4ebbbc8d40fd41b45335b0058418 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kari=20Hautam=C3=A4ki?= <kari.hautamaki@qt.io>
Date: Mon, 20 Feb 2017 17:58:51 +0200
Subject: iot-sensortag: Add MockDataProviderPool

Add MockDataProviderPool that derives directly from
SensorTagDataProviderPool. This allows building for Android without
a dependency to SensorTagDataProviderPool that can be used only
when a device runs in host mode

Change-Id: I3ff6fe36b80a4ee5dfe9815c811cc6bf016e3e6d
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Titta Heikkala <titta.heikkala@qt.io>
---
 tradeshow/iot-sensortag/SensorTagDemo.pro | 10 ++++++----
 tradeshow/iot-sensortag/main.cpp          |  8 +++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tradeshow/iot-sensortag/SensorTagDemo.pro b/tradeshow/iot-sensortag/SensorTagDemo.pro
index 8d2e471..bd79351 100644
--- a/tradeshow/iot-sensortag/SensorTagDemo.pro
+++ b/tradeshow/iot-sensortag/SensorTagDemo.pro
@@ -46,8 +46,8 @@ SOURCES += main.cpp \
     clouddataprovider.cpp \
     dataproviderpool.cpp \
     clouddataproviderpool.cpp \
-    demodataproviderpool.cpp \
-    seriesstorage.cpp
+    seriesstorage.cpp \
+    mockdataproviderpool.cpp
 
 HEADERS += \
     sensortagdataprovider.h \
@@ -56,9 +56,9 @@ HEADERS += \
     cloudservice.h \
     dataproviderpool.h \
     clouddataproviderpool.h \
-    demodataproviderpool.h \
     bluetoothapiconstants.h \
-    seriesstorage.h
+    seriesstorage.h \
+    mockdataproviderpool.h
 
 BLUETOOTH_HOST {
     win32 {
@@ -71,12 +71,14 @@ BLUETOOTH_HOST {
     SOURCES += \
         sensortagdataproviderpool.cpp \
         bluetoothdataprovider.cpp \
+        demodataproviderpool.cpp \
         serviceinfo.cpp \
         bluetoothdevice.cpp
 
     HEADERS += \
         sensortagdataproviderpool.h \
         bluetoothdataprovider.h \
+        demodataproviderpool.h \
         serviceinfo.h \
         bluetoothdevice.h
 }
diff --git a/tradeshow/iot-sensortag/main.cpp b/tradeshow/iot-sensortag/main.cpp
index e6f3381..f2cf849 100644
--- a/tradeshow/iot-sensortag/main.cpp
+++ b/tradeshow/iot-sensortag/main.cpp
@@ -59,11 +59,12 @@
 #include "bluetoothdataprovider.h"
 #include "sensortagdataprovider.h"
 #include "sensortagdataproviderpool.h"
+#include "demodataproviderpool.h"
 #endif
 #include "clouddataprovider.h"
 #include "clouddataproviderpool.h"
 #include "mockdataprovider.h"
-#include "demodataproviderpool.h"
+#include "mockdataproviderpool.h"
 #ifdef AZURE_UPLOAD
 #include "cloudupdate.h"
 #endif
@@ -117,10 +118,7 @@ int main(int argc, char *argv[])
 #endif
     else if (sensorSource == QString("mock").toLower()){
         qCDebug(boot2QtDemos) << "Running in mock data mode";
-        // Replace this with modified DemoDataProviderPoool,
-        // which combines data from three devices
-        dataProviderPool = new DemoDataProviderPool;
-        static_cast<DemoDataProviderPool*>(dataProviderPool)->setMockDataMode(true);
+        dataProviderPool = new MockDataProviderPool;
     }
     else {
         qCDebug(boot2QtDemos) << "Unknown mode: " << sensorSource;
-- 
cgit v1.2.3