refs #678, using QString for queried string, not full model anymore

This commit is contained in:
Klaus Basan
2016-06-23 20:05:41 +02:00
parent a132972f27
commit 12d06aceef
3 changed files with 31 additions and 23 deletions

View File

@@ -27,14 +27,19 @@ namespace BlackMisc
{
QString s = this->m_user.toQString(i18n);
s.append(" capabilites: ").append(this->getCapabilitiesAsString());
s.append(" model: ").append(this->m_model.toQString(i18n));
if (!this->m_server.isEmpty())
{
s.append(" server:").append(this->m_server);
}
s.append(" model: ").append(this->m_modelString);
if (!this->m_server.isEmpty()) { s.append(" server:").append(this->m_server); }
return s;
}
CClient::CClient(const Aviation::CCallsign &callsign, const QString &modelString) :
m_user(CUser(callsign)), m_modelString(modelString.trimmed()) {}
bool CClient::isValid() const
{
return this->m_user.hasValidCallsign();
}
void CClient::setCapability(bool hasCapability, CClient::Capabilities capability)
{
this->m_capabilities.addValue(static_cast<int>(capability), hasCapability);
@@ -87,8 +92,8 @@ namespace BlackMisc
return this->getCallsign().propertyByIndex(index.copyFrontRemoved());
case IndexUser:
return this->getUser().propertyByIndex(index.copyFrontRemoved());
case IndexModel:
return this->m_model.propertyByIndex(index.copyFrontRemoved());
case IndexModelString:
return CVariant(this->m_modelString);
case IndexServer:
return CVariant(this->m_server);
case IndexVoiceCapabilities:
@@ -113,8 +118,8 @@ namespace BlackMisc
case IndexCapabilities:
this->m_capabilities = variant.value<CPropertyIndexVariantMap>();
break;
case IndexModel:
this->m_model.setPropertyByIndex(index.copyFrontRemoved(), variant);;
case IndexModelString:
this->m_modelString = variant.toQString();
break;
case IndexServer:
this->m_server = variant.toQString();