From 5b11de4da03202685347b2a7d16b400a60556efc Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 26 Mar 2014 21:28:25 +0100
Subject: [PATCH] refs #192 , minor fixes after integration of #126

---
 src/blackmisc/avaircraft.cpp  | 3 +--
 src/blackmisc/avaircraft.h    | 3 +--
 src/blackmisc/tuple_private.h | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/blackmisc/avaircraft.cpp b/src/blackmisc/avaircraft.cpp
index 0487745c8..91abd73ac 100644
--- a/src/blackmisc/avaircraft.cpp
+++ b/src/blackmisc/avaircraft.cpp
@@ -9,9 +9,8 @@ namespace BlackMisc
     namespace Aviation
     {
         CAircraft::CAircraft(const CCallsign &callsign, const Network::CUser &user, const CAircraftSituation &situation)
-            : m_callsign(callsign), m_pilot(user), m_situation(situation), m_distanceToPlane(-1.0, BlackMisc::PhysicalQuantities::CLengthUnit::NM())
+            : m_callsign(callsign), m_pilot(user), m_situation(situation), m_distanceToPlane(0, BlackMisc::PhysicalQuantities::CLengthUnit::nullUnit())
         {
-
             // sync callsigns
             if (!this->m_pilot.hasValidCallsign() && !callsign.isEmpty())
                 this->m_pilot.setCallsign(callsign);
diff --git a/src/blackmisc/avaircraft.h b/src/blackmisc/avaircraft.h
index e1514e5b6..ba47b411d 100644
--- a/src/blackmisc/avaircraft.h
+++ b/src/blackmisc/avaircraft.h
@@ -31,8 +31,7 @@ namespace BlackMisc
             CAircraft() : m_distanceToPlane(0, BlackMisc::PhysicalQuantities::CLengthUnit::nullUnit()) {}
 
             //! \brief Constructor.
-            CAircraft(const CCallsign &callsign, const BlackMisc::Network::CUser &user, const CAircraftSituation &situation)
-                : m_callsign(callsign), m_pilot(user), m_situation(situation), m_distanceToPlane(0, BlackMisc::PhysicalQuantities::CLengthUnit::nullUnit()) {}
+            CAircraft(const CCallsign &callsign, const BlackMisc::Network::CUser &user, const CAircraftSituation &situation);
 
             //! \copydoc CValueObject::toQVariant
             virtual QVariant toQVariant() const override
diff --git a/src/blackmisc/tuple_private.h b/src/blackmisc/tuple_private.h
index 2b7a01816..667a29a1c 100644
--- a/src/blackmisc/tuple_private.h
+++ b/src/blackmisc/tuple_private.h
@@ -17,6 +17,7 @@
 #include <QHash>
 #include <QJsonObject>
 #include <QDateTime>
+#include <QString>
 #include <tuple>
 #include <type_traits>
 
@@ -111,7 +112,6 @@ namespace BlackMisc
             template <class Tu>
             static void serializeJson(QJsonObject &json, const QStringList &members, const Tu &tu)
             {
-                // typedef typename std::remove_const < typename std::remove_reference < typename std::tuple_element < N - 1, Tu >::type >::type >::type TARGET;
                 typedef typename std::decay < typename std::tuple_element < N - 1, Tu >::type >::type TARGET;
                 json << std::pair<QString, TARGET>(members.at(N - 1), std::get < N - 1 > (tu));
                 TupleHelper < N - 1 >::serializeJson(json, members, tu);