Merge branch 'master' of dev.vatsim-germany.org:vatpilotclient/client

src/blackcore/blackcore.contextnetwork.xml

@@ -5,6 +5,10 @@
       <arg name="message" type="(sii((iii)(iiii)i))" direction="in"/>
       <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::CStatusMessage"/>
     </signal>
+    <signal name="statusMessages">
+      <arg name="messages" type="(a(sii((iii)(iiii)i)))" direction="in"/>
+      <annotation name="org.qtproject.QtDBus.QtTypeName.Out0" value="BlackMisc::CStatusMessageList"/>
+    </signal>
     <signal name="changedAtcStationsOnline">
     </signal>
     <signal name="changedAtcStationsBooked">

src/blackcore/context_network.cpp

@@ -246,11 +246,11 @@ namespace BlackCore
         }
 
         // send as message
-        QString m("connection status changed ");
-        m.append(this->m_network->connectionStatusToString(from)).append(" ").append(this->m_network->connectionStatusToString(to));
+        QString m("connection status changed from %1 to %2");
+        m = m.arg(INetwork::connectionStatusToString(from), INetwork::connectionStatusToString(to));
         msgs.push_back(CStatusMessage(CStatusMessage::TypeTrafficNetwork,
                                       to == INetwork::DisconnectedError ? CStatusMessage::SeverityError : CStatusMessage::SeverityInfo, m));
-        emit this->statusMessage(msgs[0]);
+        emit this->statusMessages(msgs);
 
         // send as own signal
         emit this->connectionStatusChanged(from, to);

src/blackcore/context_network_interface.cpp

@@ -38,6 +38,8 @@ namespace BlackCore
                            "connectionTerminated", this, SIGNAL(connectionTerminated()));
         connection.connect(serviceName, IContextNetwork::ServicePath(), IContextNetwork::InterfaceName(),
                            "statusMessage", this, SIGNAL(statusMessage(BlackMisc::CStatusMessage)));
+        connection.connect(serviceName, IContextNetwork::ServicePath(), IContextNetwork::InterfaceName(),
+                           "statusMessages", this, SIGNAL(statusMessages(BlackMisc::CStatusMessageList)));
         connection.connect(serviceName, IContextNetwork::ServicePath(), IContextNetwork::InterfaceName(),
                            "textMessagesReceived", this, SIGNAL(textMessagesReceived(BlackMisc::Network::CTextMessageList)));
     }

src/blackcore/context_network_interface.h

@@ -106,11 +106,17 @@ namespace BlackCore
     signals:
 
         /*!
-         * \brief ATC station list has been changed
+         * \brief Send status messages
          * \param message
          */
         void statusMessage(const BlackMisc::CStatusMessage &message);
 
+        /*!
+         * \brief Send status messages
+         * \param messages
+         */
+        void statusMessages(const BlackMisc::CStatusMessageList &messages);
+
         /*!
          * \brief List has been changed
          */
@@ -137,8 +143,6 @@ namespace BlackCore
          * \param to
          */
         // If I use the enum, adaptor / interface are not created correctly
-
-
         void connectionStatusChanged(uint from, uint to);
 
         /*!

src/blackcore/network.h

@@ -64,11 +64,20 @@ namespace BlackCore
             Connected
         };
 
-        QString connectionStatusToString(ConnectionStatus status) const
+        static const QString connectionStatusToString(ConnectionStatus status)
         {
-            int index = metaObject()->indexOfEnumerator("ConnectionStatus");
-            QMetaEnum metaEnum = metaObject()->enumerator(index);
-            return metaEnum.valueToKey(status);
+            // the version with metaObject, metaObject()->indexOfEnumerator does not work anymore
+            // an interface cannot be used with Q_DECLAREMETATYPE
+            switch (status)
+            {
+            case Disconnected: return "disconnected";
+            case DisconnectedError: return "disconnectedError";
+            case Connecting: return "connecting";
+            case Connected: return "connected";
+            default: break;
+            }
+            qFatal("Missing value");
+            return ""; // just for compiler warning
         }
 
         virtual bool isConnected() const = 0;
@@ -101,7 +110,7 @@ namespace BlackCore
         virtual void setOwnAircraftPosition(const BlackMisc::Geo::CCoordinateGeodetic &position, const BlackMisc::Aviation::CAltitude &altitude) = 0;
         virtual void setOwnAircraftSituation(const BlackMisc::Aviation::CAircraftSituation &situation) = 0;
         virtual void setOwnAircraftAvionics(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2,
-            const BlackMisc::Aviation::CTransponder &xpdr) = 0;
+                                            const BlackMisc::Aviation::CTransponder &transponder) = 0;
 
         // Weather / flight plan
         virtual void requestMetar(const QString &airportICAO) = 0;

src/blackcore/network_vatlib.cpp

@@ -31,8 +31,8 @@ namespace BlackCore
     CNetworkVatlib::CNetworkVatlib(CNetworkVatlib::LoginMode loginMode, QObject *parent)
         : INetwork(parent),
           m_net(Cvatlib_Network::Create()),
-          m_status(Cvatlib_Network::connStatus_Idle),
           m_loginMode(loginMode),
+          m_status(Cvatlib_Network::connStatus_Idle),
           m_fsdTextCodec(QTextCodec::codecForName("latin1"))
     {
         try

src/blackmisc/aviomodulator.h

@@ -37,7 +37,7 @@ namespace BlackMisc
              * \brief Default constructor
              */
             CModulator() :
-                CAvionicsBase("default"), m_volumeInput(0), m_volumeOutput(0), m_digits(2) {}
+                CAvionicsBase("default"), m_volumeInput(0), m_volumeOutput(0), m_enabled(true), m_digits(2) {}
 
             /*!
              * \brief Constructor
@@ -47,7 +47,7 @@ namespace BlackMisc
              * \param digits
              */
             CModulator(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency, int digits) :
-                CAvionicsBase(name), m_frequencyActive(activeFrequency), m_frequencyStandby(standbyFrequency), m_volumeInput(0), m_volumeOutput(0), m_digits(digits), m_enabled(true) {}
+                CAvionicsBase(name), m_frequencyActive(activeFrequency), m_frequencyStandby(standbyFrequency), m_volumeInput(0), m_volumeOutput(0), m_enabled(true), m_digits(digits) {}
 
             /*!
              * \brief String for converter

src/blackmisc/pqphysicalquantity.cpp

@@ -25,7 +25,7 @@ namespace BlackMisc
          * (The implicitly generated copy constructor would suffice, but for what seems to be a bug in MSVC2010 template instantiation)
          */
         template <class MU, class PQ> CPhysicalQuantity<MU, PQ>::CPhysicalQuantity(const CPhysicalQuantity &other) :
-            m_value(other.m_value), m_unit(other.m_unit)
+            CValueObject(), m_value(other.m_value), m_unit(other.m_unit)
         {
             // void
         }