mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-17 10:55:32 +08:00
committed by
Mathew Sutcliffe
parent
ee43f5598d
commit
37d1466a83
@@ -18,6 +18,7 @@ namespace BlackMisc
|
|||||||
void CCallsign::marshallToDbus(QDBusArgument &argument) const
|
void CCallsign::marshallToDbus(QDBusArgument &argument) const
|
||||||
{
|
{
|
||||||
argument << this->m_callsignAsSet;
|
argument << this->m_callsignAsSet;
|
||||||
|
argument << this->m_callsignPronounced;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@@ -26,6 +27,7 @@ namespace BlackMisc
|
|||||||
void CCallsign::unmarshallFromDbus(const QDBusArgument &argument)
|
void CCallsign::unmarshallFromDbus(const QDBusArgument &argument)
|
||||||
{
|
{
|
||||||
argument >> this->m_callsignAsSet;
|
argument >> this->m_callsignAsSet;
|
||||||
|
argument >> this->m_callsignPronounced;
|
||||||
this->m_callsign = CCallsign::unifyCallsign(this->m_callsignAsSet);
|
this->m_callsign = CCallsign::unifyCallsign(this->m_callsignAsSet);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -30,8 +30,8 @@ namespace BlackMisc
|
|||||||
/*!
|
/*!
|
||||||
* Constructor.
|
* Constructor.
|
||||||
*/
|
*/
|
||||||
CCallsign(const QString &callsign)
|
CCallsign(const QString &callsign, const QString &callsignPronounced = "")
|
||||||
: m_callsignAsSet(callsign), m_callsign(CCallsign::unifyCallsign(callsign))
|
: 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; }
|
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
|
* \brief Get ICAO code, if this possible
|
||||||
* \return
|
* \return
|
||||||
@@ -155,6 +161,7 @@ namespace BlackMisc
|
|||||||
private:
|
private:
|
||||||
QString m_callsignAsSet;
|
QString m_callsignAsSet;
|
||||||
QString m_callsign;
|
QString m_callsign;
|
||||||
|
QString m_callsignPronounced;
|
||||||
};
|
};
|
||||||
} // namespace
|
} // namespace
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|||||||
Reference in New Issue
Block a user