From 37d1466a837a3daefb317bf9b12b23efea27c7af Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 8 Jan 2014 00:05:26 +0000 Subject: [PATCH] added CCallsign::m_callsignPronounced refs #81 --- src/blackmisc/avcallsign.cpp | 2 ++ src/blackmisc/avcallsign.h | 11 +++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/blackmisc/avcallsign.cpp b/src/blackmisc/avcallsign.cpp index acf1817e2..91f10b8f0 100644 --- a/src/blackmisc/avcallsign.cpp +++ b/src/blackmisc/avcallsign.cpp @@ -18,6 +18,7 @@ namespace BlackMisc void CCallsign::marshallToDbus(QDBusArgument &argument) const { argument << this->m_callsignAsSet; + argument << this->m_callsignPronounced; } /* @@ -26,6 +27,7 @@ namespace BlackMisc void CCallsign::unmarshallFromDbus(const QDBusArgument &argument) { argument >> this->m_callsignAsSet; + argument >> this->m_callsignPronounced; this->m_callsign = CCallsign::unifyCallsign(this->m_callsignAsSet); } diff --git a/src/blackmisc/avcallsign.h b/src/blackmisc/avcallsign.h index 87a08f46c..2446f8b97 100644 --- a/src/blackmisc/avcallsign.h +++ b/src/blackmisc/avcallsign.h @@ -30,8 +30,8 @@ namespace BlackMisc /*! * Constructor. */ - CCallsign(const QString &callsign) - : m_callsignAsSet(callsign), m_callsign(CCallsign::unifyCallsign(callsign)) + CCallsign(const QString &callsign, const QString &callsignPronounced = "") + : m_callsignAsSet(callsign), m_callsign(CCallsign::unifyCallsign(callsign)), m_callsignPronounced(callsignPronounced) {} /*! @@ -69,6 +69,12 @@ namespace BlackMisc */ const QString &getStringAsSet() const { return this->m_callsignAsSet; } + /*! + * \brief Get callsign pronounced + * \return + */ + const QString &getCallsignPronounced() const { return this->m_callsignPronounced; } + /*! * \brief Get ICAO code, if this possible * \return @@ -155,6 +161,7 @@ namespace BlackMisc private: QString m_callsignAsSet; QString m_callsign; + QString m_callsignPronounced; }; } // namespace } // namespace