simulator: Use refactored QtSimulator API

Change-Id: Icb0a5543d4081554cb689299219b48867746b40e
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>

2 files changed, 16 insertions, 37 deletions

diff --git a/src/systeminfo/simulator/qsysteminfoconnection_simulator.cpp b/src/systeminfo/simulator/qsysteminfoconnection_simulator.cpp
index 51db00bf..4b1b0536 100644
--- a/src/systeminfo/simulator/qsysteminfoconnection_simulator.cpp
+++ b/src/systeminfo/simulator/qsysteminfoconnection_simulator.cpp
@@ -35,39 +35,35 @@
 #include "qsysteminfoconnection_simulator_p.h"
 #include "qsysteminfobackend_simulator_p.h"
 
-#include <QtSimulator/connection.h>
-#include <QtSimulator/version.h>
-#include <QtSimulator/connectionworker.h>
 #include <QtSimulator/QtSimulator>
 
 #include <QTimer>
 #include <QEventLoop>
 #include <QMutex>
+#include <QVersionNumber>
 
 QT_BEGIN_NAMESPACE
 
-using namespace Simulator;
-
-const QString SystemInfoConnection::SERVERNAME(QStringLiteral("QtSimulator_Mobility_ServerName1.3.0.0"));
-const int SystemInfoConnection::PORT(0xbeef+1);
-const Simulator::Version SystemInfoConnection::VERSION(1,3,0,0);
+const QString SERVERNAME(QStringLiteral("SystemInfo.Battery"));
+const int PORT(0xbeef);
+const QVersionNumber VERSION(1, 0, 0);
 
 SystemInfoConnection::SystemInfoConnection(QObject *parent)
     : QObject(parent)
-    , mInitialDataSent(false)
 {
     qt_registerSystemInfoTypes();
-    mConnection = new Connection(Connection::Client, SERVERNAME, PORT, VERSION, this);
-    mWorker = mConnection->connectToServer(Connection::simulatorHostName(true), PORT);
+    mConnection = new QSimulatorConnection(SERVERNAME, VERSION);
+    mConnection->addPeerInfo(QLatin1String("name"), QLatin1String("systeminfo battery backend"));
+    mConnection->addPeerInfo(QLatin1String("version"), QLatin1String("1.0.0"));
+    mWorker = mConnection->connectToHost(QSimulatorConnection::simulatorHostName(true), PORT);
     if (mWorker) {
         mWorker->addReceiver(this);
-        mWorker->call("setRequestsSystemInfo");
 
         // wait until initial data is received
         QTimer timer;
         QEventLoop loop;
-        connect(&timer, SIGNAL(timeout()), &loop, SLOT(quit()));
-        connect(this, SIGNAL(initialDataReceived()), &loop, SLOT(quit()));
+        connect(&timer, &QTimer::timeout, &loop, &QEventLoop::quit);
+        connect(this, &SystemInfoConnection::dataReceived, &loop, &QEventLoop::quit);
         timer.start(1000);
         loop.exec();
         timer.stop();
@@ -89,12 +85,6 @@ void SystemInfoConnection::ensureSimulatorConnection()
     mutex.unlock();
 }
 
-void SystemInfoConnection::initialSystemInfoDataSent()
-{
-    mInitialDataSent = true;
-    emit initialDataReceived();
-}
-
 void SystemInfoConnection::setBatteryInfoData(const QBatteryInfoData &data)
 {
     QBatteryInfoSimulatorBackend *batteryInfoBackend = QBatteryInfoSimulatorBackend::getSimulatorBackend();
@@ -110,6 +100,7 @@ void SystemInfoConnection::setBatteryInfoData(const QBatteryInfoData &data)
     batteryInfoBackend->setLevelStatus(data.levelStatus);
     batteryInfoBackend->setHealth(data.health);
     batteryInfoBackend->setTemperature(data.temperature);
+    emit dataReceived();
 }
 
 QT_END_NAMESPACE
diff --git a/src/systeminfo/simulator/qsysteminfoconnection_simulator_p.h b/src/systeminfo/simulator/qsysteminfoconnection_simulator_p.h
index e7f902ba..f7d24889 100644
--- a/src/systeminfo/simulator/qsysteminfoconnection_simulator_p.h
+++ b/src/systeminfo/simulator/qsysteminfoconnection_simulator_p.h
@@ -50,12 +50,8 @@
 
 #include <QObject>
 
-namespace Simulator
-{
-    class Connection;
-    class ConnectionWorker;
-    class Version;
-}
+class QSimulatorConnection;
+class QSimulatorConnectionWorker;
 
 class SystemInfoConnection : public QObject
 {
@@ -69,23 +65,15 @@ private:
     SystemInfoConnection(QObject *parent = 0);
     Q_DISABLE_COPY(SystemInfoConnection)
 
-    bool save() const { return mInitialDataSent; }
-
 private Q_SLOTS:
-    void initialSystemInfoDataSent();
     void setBatteryInfoData(const QBatteryInfoData &data);
 
 Q_SIGNALS:
-    void initialDataReceived();
+    void dataReceived();
 
 private:
-    Simulator::Connection *mConnection;
-    Simulator::ConnectionWorker *mWorker;
-    bool mInitialDataSent;
-
-    static const QString SERVERNAME;
-    static const int PORT;
-    static const Simulator::Version VERSION;
+    QSimulatorConnection *mConnection;
+    QSimulatorConnectionWorker *mWorker;
 };
 
 #endif // QSYSTEMINFOCONNECTION_SIMULATOR_P_H