Fix build errors

vranki · May 28, 2018 · f0982fd · f0982fd
1 parent 2cd6948
commit f0982fd
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/clients/extplane-client-qt/simulateddatarefs/simulateddataref.cpp b/clients/extplane-client-qt/simulateddatarefs/simulateddataref.cpp
@@ -12,9 +12,9 @@ SimulatedDataRef::SimulatedDataRef(QObject *parent,
     QObject(parent)
   , minValue(minV)
   , maxValue(maxV)
+  , change((maxValue - minValue)/changeDivisor)
   , currentValue(minV)
   , actualCurrentValue(minV)
-  , change((maxValue - minValue)/changeDivisor)
   , round(round)
   , arrayCount(arrayCount)
   , myClientRef(nullptr, refName, 0)
@@ -25,9 +25,7 @@ SimulatedDataRef::SimulatedDataRef(QObject *parent,
     changeTimer.start();
 }
 
-SimulatedDataRef::~SimulatedDataRef() {
-
-}
+SimulatedDataRef::~SimulatedDataRef() { }
 
 void SimulatedDataRef::tickTime(double dt, int total) {
     Q_UNUSED(total);

diff --git a/extplane-transformer/datasources/flightgeardatasource.cpp b/extplane-transformer/datasources/flightgeardatasource.cpp
@@ -4,8 +4,8 @@
 #include "../extplane-server/datarefs/floatdataref.h"
 
 FlightGearDataSource::FlightGearDataSource() : DataSource() {
-    connect(&tcpClient, &BasicTcpClient::tcpClientConnected,
-            this, &FlightGearDataSource::sessionOpened);
+    connect(&tcpClient, &BasicTcpClient::connectedChanged,
+            this, &FlightGearDataSource::connectedChanged);
     connect(&tcpClient, &BasicTcpClient::receivedLine,
             this, &FlightGearDataSource::readLine);
     connect(&tcpClient, &BasicTcpClient::networkError,
@@ -34,7 +34,9 @@ FlightGearDataSource::FlightGearDataSource() : DataSource() {
 
 void FlightGearDataSource::connectToSource() {
     setNetworkError(QString());
-    tcpClient.startConnection("localhost" , 5401);
+    tcpClient.setHostName("localhost");
+    tcpClient.setPort(5401);
+    tcpClient.startConnection();
 }
 
 DataRef *FlightGearDataSource::subscribeRef(QString &name)
@@ -79,11 +81,13 @@ void FlightGearDataSource::command(QString &name, extplaneCommandType type)
 bool FlightGearDataSource::loadSituation(QString sitFileLocation)
 {}
 
-void FlightGearDataSource::sessionOpened()
+void FlightGearDataSource::connectedChanged(bool connected)
 {
-    setNetworkError(QString());
-    setHelpText(QString("Connected to FlightGear at %1:%2").arg(tcpClient.hostName()).arg(tcpClient.port()));
-    tcpClient.writeLine("data");
+    if(connected) {
+        setNetworkError(QString());
+        setHelpText(QString("Connected to FlightGear at %1:%2").arg(tcpClient.hostName()).arg(tcpClient.port()));
+        tcpClient.writeLine("data");
+    }
 }
 
 void FlightGearDataSource::readLine(QString line)

diff --git a/extplane-transformer/datasources/flightgeardatasource.h b/extplane-transformer/datasources/flightgeardatasource.h
@@ -40,7 +40,7 @@ class FlightGearDataSource : public DataSource
     //
 
 private slots:
-    void sessionOpened();
+    void connectedChanged(bool connected);
     void readLine(QString line);
     void gotNetworkError(QString errstring);