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

all voice changes from kbatclist branch

Browse Source 
refs #81
This commit is contained in:
Klaus Basan
2014-01-07 23:53:17 +00:00
committed by Mathew Sutcliffe
parent 51cbd2a394
commit 1c1fdabd2e
35 changed files with 2311 additions and 935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/blackmisc/avatcstation.cpp
View File

@@ -1,10 +1,12 @@
#include "avatcstation.h"
#include "aviocomsystem.h"
#include "vvoiceroom.h"
#include "blackmiscfreefunctions.h"
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Geo;
using namespace BlackMisc::Network;
using namespace BlackMisc::Voice;
namespace BlackMisc
{
@@ -142,7 +144,7 @@ namespace BlackMisc
(void)QT_TRANSLATE_NOOP("Aviation", "until(UTC)");
(void)QT_TRANSLATE_NOOP("Aviation", "range");
(void)QT_TRANSLATE_NOOP("Aviation", "distance");
(void)QT_TRANSLATE_NOOP("Network", "voiceroom");
}
/*
@@ -161,6 +163,7 @@ namespace BlackMisc
argument << this->m_bookedUntilUtc;
argument << this->m_atis;
argument << this->m_metar;
argument << this->m_voiceRoom;
}
/*
@@ -179,6 +182,7 @@ namespace BlackMisc
argument >> this->m_bookedUntilUtc;
argument >> this->m_atis;
argument >> this->m_metar;
argument >> this->m_voiceRoom;
}
/*
@@ -205,6 +209,7 @@ namespace BlackMisc
if (other.getController() != this->getController()) return false;
if (other.getAtis() != this->getAtis()) return false;
if (other.getMetar() != this->getMetar()) return false;
if (other.getVoiceRoom() != this->getVoiceRoom()) return false;
return this->getBookedFromUtc() == other.getBookedFromUtc() &&
this->getBookedUntilUtc() == other.getBookedUntilUtc();
@@ -292,6 +297,7 @@ namespace BlackMisc
hashs << this->m_distanceToPlane.getValueHash();
hashs << this->m_metar.getValueHash();
hashs << this->m_atis.getValueHash();
hashs << this->m_voiceRoom.getValueHash();
hashs << qHash(this->m_isOnline ? 1 : 3);
hashs << qHash(this->m_bookedFromUtc);
hashs << qHash(this->m_bookedUntilUtc);
@@ -343,6 +349,10 @@ namespace BlackMisc
return this->m_metar.toQVariant();
case IndexMetarMessage:
return QVariant(this->m_metar.getMessage());
case IndexVoiceRoom:
return QVariant(this->m_voiceRoom.toQVariant());
case IndexVoiceRoomUrl:
return QVariant(this->m_voiceRoom.getVoiceRoomUrl());
default:
break;
}
@@ -407,6 +417,12 @@ namespace BlackMisc
case IndexMetarMessage:
this->setMetarMessage(variant.value<QString>());
break;
case IndexVoiceRoom:
this->setVoiceRoom(variant.value<CVoiceRoom>());
break;
case IndexVoiceRoomUrl:
this->setVoiceRoom(CVoiceRoom(variant.toString()));
break;
default:
Q_ASSERT_X(false, "CAtcStation", "index unknown (setter)");
break;