StringBuilder for client

This commit is contained in:
Klaus Basan
2020-04-27 20:41:51 +02:00
committed by Mat Sutcliffe
parent 54646c8edb
commit 2c6794a009

View File

@@ -13,6 +13,7 @@
#include <QPixmap> #include <QPixmap>
#include <QString> #include <QString>
#include <QStringBuilder>
#include <QStringList> #include <QStringList>
#include <tuple> #include <tuple>
@@ -22,11 +23,10 @@ namespace BlackMisc
{ {
QString CClient::convertToQString(bool i18n) const QString CClient::convertToQString(bool i18n) const
{ {
QString s = m_user.toQString(i18n); return m_user.toQString(i18n) %
s.append(" capabilites: ").append(this->getCapabilitiesAsString()); QStringLiteral(" capabilites: ") % this->getCapabilitiesAsString() %
s.append(" model: ").append(m_modelString); QStringLiteral(" model: ") % m_modelString %
if (!m_server.isEmpty()) { s.append(" server:").append(m_server); } (m_server.isEmpty() ? QString() : QStringLiteral("server: ") % m_server);
return s;
} }
CClient::CClient(const Aviation::CCallsign &callsign, const QString &modelString) : CClient::CClient(const Aviation::CCallsign &callsign, const QString &modelString) :
@@ -60,12 +60,12 @@ namespace BlackMisc
{ {
QStringList sl; QStringList sl;
const Capabilities cap = this->getCapabilities(); const Capabilities cap = this->getCapabilities();
if (cap.testFlag(FsdAtisCanBeReceived)) sl << "ATIS"; if (cap.testFlag(FsdAtisCanBeReceived)) sl << "ATIS";
if (cap.testFlag(FsdWithInterimPositions)) sl << "interim pos."; if (cap.testFlag(FsdWithInterimPositions)) sl << "interim pos.";
if (cap.testFlag(FsdWithIcaoCodes)) sl << "ICAO"; if (cap.testFlag(FsdWithIcaoCodes)) sl << "ICAO";
if (cap.testFlag(FsdWithAircraftConfig)) sl << "aircraft config"; if (cap.testFlag(FsdWithAircraftConfig)) sl << "aircraft config";
if (cap.testFlag(FsdWithGroundFlag)) sl << "gnd.flag"; if (cap.testFlag(FsdWithGroundFlag)) sl << "gnd.flag";
if (cap.testFlag(FsdModelString)) sl << "modelstring"; if (cap.testFlag(FsdModelString)) sl << "modelstring";
if (sl.isEmpty()) { return {}; } if (sl.isEmpty()) { return {}; }
return sl.join(", "); return sl.join(", ");
} }