Ref T215, some adjustments of user object

* remove "valid" from some functions, because no validity is checked
* homebase + real name string
This commit is contained in:
Klaus Basan
2018-01-03 20:13:47 +01:00
parent b2c0d726bc
commit 2fb7bde447
10 changed files with 45 additions and 37 deletions

View File

@@ -193,7 +193,7 @@ namespace BlackGui
if (m_flightPlan.wasSentOrLoaded()) { return; }
// only override with valid values
if (user.hasValidRealName())
if (user.hasRealName())
{
ui->le_PilotsName->setText(user.getRealName());
}
@@ -201,7 +201,7 @@ namespace BlackGui
{
ui->le_PilotsHomeBase->setText(user.getHomeBase().getIcaoCode());
}
if (user.hasValidCallsign())
if (user.hasCallsign())
{
ui->le_Callsign->setText(user.getCallsign().asString());
}

View File

@@ -351,7 +351,7 @@ namespace BlackGui
{
const CServer lastServer = m_lastVatsimServer.get();
const CUser lastUser = lastServer.getUser();
if (lastUser.hasValidCallsign())
if (lastUser.hasCallsign())
{
ui->le_Callsign->setText(lastUser.getCallsign().asString());
ui->le_VatsimId->setText(lastUser.getId());

View File

@@ -110,7 +110,7 @@ namespace BlackGui
aircraft.getAircraftIcaoCode().toQString(false) %
QLatin1String(")");
}
if (aircraft.hasValidRealName())
if (aircraft.hasRealName())
{
i += QLatin1String(" - ") % aircraft.getPilotRealName();
}