Use nested namespaces (C++17 feature)

This commit is contained in:
Mat Sutcliffe
2021-09-15 21:44:54 +01:00
parent 3f2e5b0b69
commit 57d32da826
1345 changed files with 146075 additions and 150376 deletions

View File

@@ -14,50 +14,47 @@
using namespace BlackMisc;
using namespace BlackMisc::Network;
namespace BlackCore
namespace BlackCore::Fsd
{
namespace Fsd
AtcDataUpdate::AtcDataUpdate() : MessageBase()
{ }
AtcDataUpdate::AtcDataUpdate(const QString &sender, int frequencykHz, CFacilityType facility, int visibleRange, AtcRating rating,
double latitude, double longitude, int elevation) :
MessageBase(sender, {}),
m_frequencykHz(frequencykHz),
m_facility(facility),
m_visibleRange(visibleRange),
m_rating(rating),
m_latitude(latitude),
m_longitude(longitude),
m_elevation(elevation)
{ }
QStringList AtcDataUpdate::toTokens() const
{
AtcDataUpdate::AtcDataUpdate() : MessageBase()
{ }
QStringList tokens;
tokens.push_back(m_sender);
tokens.push_back(QString::number(m_frequencykHz - 100000));
tokens.push_back(toQString(m_facility));
tokens.push_back(QString::number(m_visibleRange));
tokens.push_back(toQString(m_rating));
tokens.push_back(QString::number(m_latitude, 'f', 5));
tokens.push_back(QString::number(m_longitude, 'f', 5));
tokens.push_back(QString::number(m_elevation));
return tokens;
}
AtcDataUpdate::AtcDataUpdate(const QString &sender, int frequencykHz, CFacilityType facility, int visibleRange, AtcRating rating,
double latitude, double longitude, int elevation) :
MessageBase(sender, {}),
m_frequencykHz(frequencykHz),
m_facility(facility),
m_visibleRange(visibleRange),
m_rating(rating),
m_latitude(latitude),
m_longitude(longitude),
m_elevation(elevation)
{ }
QStringList AtcDataUpdate::toTokens() const
AtcDataUpdate AtcDataUpdate::fromTokens(const QStringList &tokens)
{
if (tokens.size() < 7)
{
QStringList tokens;
tokens.push_back(m_sender);
tokens.push_back(QString::number(m_frequencykHz - 100000));
tokens.push_back(toQString(m_facility));
tokens.push_back(QString::number(m_visibleRange));
tokens.push_back(toQString(m_rating));
tokens.push_back(QString::number(m_latitude, 'f', 5));
tokens.push_back(QString::number(m_longitude, 'f', 5));
tokens.push_back(QString::number(m_elevation));
return tokens;
CLogMessage(static_cast<AtcDataUpdate *>(nullptr)).warning(u"Wrong number of arguments.");
return {};
}
AtcDataUpdate AtcDataUpdate::fromTokens(const QStringList &tokens)
{
if (tokens.size() < 7)
{
CLogMessage(static_cast<AtcDataUpdate *>(nullptr)).warning(u"Wrong number of arguments.");
return {};
}
AtcDataUpdate packet(tokens[0], tokens[1].toInt() + 100000, fromQString<CFacilityType>(tokens[2]), tokens[3].toInt(), fromQString<AtcRating>(tokens[4]),
tokens[5].toDouble(), tokens[6].toDouble(), tokens[7].toInt());
return packet;
}
AtcDataUpdate packet(tokens[0], tokens[1].toInt() + 100000, fromQString<CFacilityType>(tokens[2]), tokens[3].toInt(), fromQString<AtcRating>(tokens[4]),
tokens[5].toDouble(), tokens[6].toDouble(), tokens[7].toInt());
return packet;
}
}