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

Fixed failing test by adding calls to CUser::derivedHomeBaseFromCallsign which were missing.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-05-13 02:50:27 +01:00
parent a5529516a8
commit eeb0d17dcb
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackmisc/network/user.cpp
View File

@@ -22,6 +22,12 @@ namespace BlackMisc
{ {
namespace Network namespace Network
{ {
CUser::CUser(const CCallsign &callsign)
: m_callsign(callsign)
{
this->deriveHomeBaseFromCallsign();
}
CUser::CUser(const QString &id, const QString &realname, const CCallsign &callsign) CUser::CUser(const QString &id, const QString &realname, const CCallsign &callsign)
: m_id(id.trimmed()), m_realname(realname), m_callsign(callsign) : m_id(id.trimmed()), m_realname(realname), m_callsign(callsign)
{ {
@@ -36,6 +42,12 @@ namespace BlackMisc
this->setRealName(realname); // extracts homebase this->setRealName(realname); // extracts homebase
} }
void CUser::setCallsign(const CCallsign &callsign)
{
m_callsign = callsign;
this->deriveHomeBaseFromCallsign();
}
QString CUser::convertToQString(bool i18n) const QString CUser::convertToQString(bool i18n) const
{ {
Q_UNUSED(i18n); Q_UNUSED(i18n);

4
src/blackmisc/network/user.h
View File

@@ -47,7 +47,7 @@ namespace BlackMisc
CUser() = default; CUser() = default;
//! Constructor by callsign //! Constructor by callsign
CUser(const BlackMisc::Aviation::CCallsign &callsign) : m_callsign(callsign) {} CUser(const BlackMisc::Aviation::CCallsign &callsign);
//! Constructor. //! Constructor.
CUser(const QString &id, const QString &realname, const BlackMisc::Aviation::CCallsign &callsign); CUser(const QString &id, const QString &realname, const BlackMisc::Aviation::CCallsign &callsign);
@@ -113,7 +113,7 @@ namespace BlackMisc
const BlackMisc::Aviation::CCallsign &getCallsign() const { return m_callsign; } const BlackMisc::Aviation::CCallsign &getCallsign() const { return m_callsign; }
//! Set associated callsign //! Set associated callsign
void setCallsign(const BlackMisc::Aviation::CCallsign &callsign) { m_callsign = callsign; } void setCallsign(const BlackMisc::Aviation::CCallsign &callsign);
//! \copydoc CValueObject::toIcon() //! \copydoc CValueObject::toIcon()
BlackMisc::CIcon toIcon() const { return this->getCallsign().toIcon(); } BlackMisc::CIcon toIcon() const { return this->getCallsign().toIcon(); }