flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-08 21:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #192 , minor fixes after integration of #126

Browse Source
This commit is contained in:
Klaus Basan
2014-03-26 21:28:25 +01:00
parent f03d095e10
commit 5b11de4da0
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackmisc/avaircraft.cpp
View File

@@ -9,9 +9,8 @@ namespace BlackMisc
namespace Aviation namespace Aviation
{ {
CAircraft::CAircraft(const CCallsign &callsign, const Network::CUser &user, const CAircraftSituation &situation) 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 // sync callsigns
if (!this->m_pilot.hasValidCallsign() && !callsign.isEmpty()) if (!this->m_pilot.hasValidCallsign() && !callsign.isEmpty())
this->m_pilot.setCallsign(callsign); this->m_pilot.setCallsign(callsign);

3
src/blackmisc/avaircraft.h
View File

@@ -31,8 +31,7 @@ namespace BlackMisc
CAircraft() : m_distanceToPlane(0, BlackMisc::PhysicalQuantities::CLengthUnit::nullUnit()) {} CAircraft() : m_distanceToPlane(0, BlackMisc::PhysicalQuantities::CLengthUnit::nullUnit()) {}
//! \brief Constructor. //! \brief Constructor.
CAircraft(const CCallsign &callsign, const BlackMisc::Network::CUser &user, const CAircraftSituation &situation) 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()) {}
//! \copydoc CValueObject::toQVariant //! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override virtual QVariant toQVariant() const override

2
src/blackmisc/tuple_private.h
View File

@@ -17,6 +17,7 @@
#include <QHash> #include <QHash>
#include <QJsonObject> #include <QJsonObject>
#include <QDateTime> #include <QDateTime>
#include <QString>
#include <tuple> #include <tuple>
#include <type_traits> #include <type_traits>
@@ -111,7 +112,6 @@ namespace BlackMisc
template <class Tu> template <class Tu>
static void serializeJson(QJsonObject &json, const QStringList &members, const Tu &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; 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)); json << std::pair<QString, TARGET>(members.at(N - 1), std::get < N - 1 > (tu));
TupleHelper < N - 1 >::serializeJson(json, members, tu); TupleHelper < N - 1 >::serializeJson(json, members, tu);