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

Ref T739, removed voice room value objects

Browse Source
This commit is contained in:
Klaus Basan
2019-10-04 23:50:11 +02:00
committed by Mat Sutcliffe
parent 09e65a2525
commit 7e36e67f89
12 changed files with 1 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/blackmisc/aviation/atcstation.h
View File

@@ -11,7 +11,6 @@
#ifndef BLACKMISC_AVIATION_ATCSTATION_H
#define BLACKMISC_AVIATION_ATCSTATION_H
#include "blackmisc/audio/voiceroom.h"
#include "blackmisc/aviation/callsign.h"
#include "blackmisc/aviation/comsystem.h"
#include "blackmisc/aviation/informationmessage.h"
@@ -62,8 +61,7 @@ namespace BlackMisc
IndexLatitude,
IndexLongitude,
IndexAtis,
IndexMetar,
IndexVoiceRoom, //!< @deprecated
IndexMetar
};
//! Default constructor.
@@ -181,22 +179,6 @@ namespace BlackMisc
//! Set AFV cross coupled
void setAfvCrossCoupled(bool coupled) { m_isAfvCrossCoupled = coupled; }
//! Get voice room
//! \deprecated
const Audio::CVoiceRoom &getVoiceRoom() const { return m_voiceRoom; }
//! Set voice room
//! \deprecated
void setVoiceRoom(const Audio::CVoiceRoom &voiceRoom) { m_voiceRoom = voiceRoom; }
//! Set voice room URL
//! \deprecated
void setVoiceRoomUrl(const QString &url) { m_voiceRoom.setVoiceRoomUrl(url); }
//! Valid voice room?
//! \deprecated
bool hasValidVoiceRoom() const { return m_voiceRoom.isValid(); }
//! Booked date/time if any.
//! This represents the closest booking within a time frame as there can be multiple bookings.
const QDateTime &getBookedFromUtc() const { return m_bookedFromUtc; }
@@ -301,7 +283,6 @@ namespace BlackMisc
QDateTime m_bookedUntilUtc;
CInformationMessage m_atis { CInformationMessage::ATIS };
CInformationMessage m_metar { CInformationMessage::METAR };
Audio::CVoiceRoom m_voiceRoom;
BLACK_METACLASS(
CAtcStation,
@@ -316,7 +297,6 @@ namespace BlackMisc
BLACK_METAMEMBER(bookedUntilUtc),
BLACK_METAMEMBER(atis),
BLACK_METAMEMBER(metar),
BLACK_METAMEMBER(voiceRoom),
BLACK_METAMEMBER(relativeDistance),
BLACK_METAMEMBER(relativeBearing)
);