mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-02 15:15:50 +08:00
Use nested namespaces (C++17 feature)
This commit is contained in:
@@ -12,82 +12,79 @@
|
||||
using namespace BlackMisc;
|
||||
using namespace BlackMisc::Network;
|
||||
|
||||
namespace BlackCore
|
||||
namespace BlackCore::Data
|
||||
{
|
||||
namespace Data
|
||||
CVatsimSetup::CVatsimSetup() :
|
||||
ITimestampBased(0),
|
||||
m_dataFileUrls(QStringList( { "http://info.vroute.net/vatsim-data.txt" }))
|
||||
{ }
|
||||
|
||||
bool CVatsimSetup::setUrls(const CUrlList &dataFileUrls, const CUrlList &serverFileUrls, const CUrlList &metarFileUrls)
|
||||
{
|
||||
CVatsimSetup::CVatsimSetup() :
|
||||
ITimestampBased(0),
|
||||
m_dataFileUrls(QStringList( { "http://info.vroute.net/vatsim-data.txt" }))
|
||||
{ }
|
||||
const bool changed = (dataFileUrls != getDataFileUrls() || serverFileUrls != getServerFileUrls() || metarFileUrls != getMetarFileUrls());
|
||||
this->setServerFileUrls(serverFileUrls);
|
||||
this->setMetarFileUrls(metarFileUrls);
|
||||
this->setDataFileUrls(dataFileUrls);
|
||||
return changed;
|
||||
}
|
||||
|
||||
bool CVatsimSetup::setUrls(const CUrlList &dataFileUrls, const CUrlList &serverFileUrls, const CUrlList &metarFileUrls)
|
||||
bool CVatsimSetup::setServers(const CServerList &fsdServers, const CServerList &voiceServers)
|
||||
{
|
||||
const bool changed = (this->getVoiceServers() != voiceServers || this->getFsdServers() != fsdServers);
|
||||
this->setFsdServers(fsdServers);
|
||||
this->setVoiceServers(voiceServers);
|
||||
return changed;
|
||||
}
|
||||
|
||||
QString CVatsimSetup::convertToQString(bool i18n) const
|
||||
{
|
||||
return convertToQString(", ", i18n);
|
||||
}
|
||||
|
||||
QString CVatsimSetup::convertToQString(const QString &separator, bool i18n) const
|
||||
{
|
||||
QString s("timestamp: ");
|
||||
s.append(this->getFormattedUtcTimestampYmdhms());
|
||||
s.append(separator);
|
||||
|
||||
s.append("VATSIM data file: ");
|
||||
s.append(getDataFileUrls().toQString(i18n));
|
||||
s.append(separator);
|
||||
|
||||
s.append("FSD servers: ");
|
||||
s.append(getFsdServers().toQString(i18n));
|
||||
return s;
|
||||
}
|
||||
|
||||
QVariant CVatsimSetup::propertyByIndex(BlackMisc::CPropertyIndexRef index) const
|
||||
{
|
||||
if (index.isMyself()) { return QVariant::fromValue(*this); }
|
||||
if (ITimestampBased::canHandleIndex(index)) { return ITimestampBased::propertyByIndex(index); }
|
||||
|
||||
const ColumnIndex i = index.frontCasted<ColumnIndex>();
|
||||
switch (i)
|
||||
{
|
||||
const bool changed = (dataFileUrls != getDataFileUrls() || serverFileUrls != getServerFileUrls() || metarFileUrls != getMetarFileUrls());
|
||||
this->setServerFileUrls(serverFileUrls);
|
||||
this->setMetarFileUrls(metarFileUrls);
|
||||
this->setDataFileUrls(dataFileUrls);
|
||||
return changed;
|
||||
case IndexFsdServers: return QVariant::fromValue(this->m_fsdServers);
|
||||
case IndexDataFiles: return QVariant::fromValue(this->m_dataFileUrls);
|
||||
default: return CValueObject::propertyByIndex(index);
|
||||
}
|
||||
}
|
||||
|
||||
void CVatsimSetup::setPropertyByIndex(CPropertyIndexRef index, const QVariant &variant)
|
||||
{
|
||||
if (index.isMyself()) { (*this) = variant.value<CVatsimSetup>(); return; }
|
||||
if (ITimestampBased::canHandleIndex(index))
|
||||
{
|
||||
ITimestampBased::setPropertyByIndex(index, variant);
|
||||
return;
|
||||
}
|
||||
|
||||
bool CVatsimSetup::setServers(const CServerList &fsdServers, const CServerList &voiceServers)
|
||||
const ColumnIndex i = index.frontCasted<ColumnIndex>();
|
||||
switch (i)
|
||||
{
|
||||
const bool changed = (this->getVoiceServers() != voiceServers || this->getFsdServers() != fsdServers);
|
||||
this->setFsdServers(fsdServers);
|
||||
this->setVoiceServers(voiceServers);
|
||||
return changed;
|
||||
case IndexFsdServers: this->m_fsdServers = variant.value<CServerList>(); break;
|
||||
case IndexDataFiles: this->m_dataFileUrls = variant.value<CUrlList>(); break;
|
||||
default: CValueObject::setPropertyByIndex(index, variant); break;
|
||||
}
|
||||
|
||||
QString CVatsimSetup::convertToQString(bool i18n) const
|
||||
{
|
||||
return convertToQString(", ", i18n);
|
||||
}
|
||||
|
||||
QString CVatsimSetup::convertToQString(const QString &separator, bool i18n) const
|
||||
{
|
||||
QString s("timestamp: ");
|
||||
s.append(this->getFormattedUtcTimestampYmdhms());
|
||||
s.append(separator);
|
||||
|
||||
s.append("VATSIM data file: ");
|
||||
s.append(getDataFileUrls().toQString(i18n));
|
||||
s.append(separator);
|
||||
|
||||
s.append("FSD servers: ");
|
||||
s.append(getFsdServers().toQString(i18n));
|
||||
return s;
|
||||
}
|
||||
|
||||
QVariant CVatsimSetup::propertyByIndex(BlackMisc::CPropertyIndexRef index) const
|
||||
{
|
||||
if (index.isMyself()) { return QVariant::fromValue(*this); }
|
||||
if (ITimestampBased::canHandleIndex(index)) { return ITimestampBased::propertyByIndex(index); }
|
||||
|
||||
const ColumnIndex i = index.frontCasted<ColumnIndex>();
|
||||
switch (i)
|
||||
{
|
||||
case IndexFsdServers: return QVariant::fromValue(this->m_fsdServers);
|
||||
case IndexDataFiles: return QVariant::fromValue(this->m_dataFileUrls);
|
||||
default: return CValueObject::propertyByIndex(index);
|
||||
}
|
||||
}
|
||||
|
||||
void CVatsimSetup::setPropertyByIndex(CPropertyIndexRef index, const QVariant &variant)
|
||||
{
|
||||
if (index.isMyself()) { (*this) = variant.value<CVatsimSetup>(); return; }
|
||||
if (ITimestampBased::canHandleIndex(index))
|
||||
{
|
||||
ITimestampBased::setPropertyByIndex(index, variant);
|
||||
return;
|
||||
}
|
||||
|
||||
const ColumnIndex i = index.frontCasted<ColumnIndex>();
|
||||
switch (i)
|
||||
{
|
||||
case IndexFsdServers: this->m_fsdServers = variant.value<CServerList>(); break;
|
||||
case IndexDataFiles: this->m_dataFileUrls = variant.value<CUrlList>(); break;
|
||||
default: CValueObject::setPropertyByIndex(index, variant); break;
|
||||
}
|
||||
}
|
||||
} // ns
|
||||
}
|
||||
} // ns
|
||||
|
||||
Reference in New Issue
Block a user