flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 15:15:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use nested namespaces (C++17 feature)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

47
src/blackmisc/weather/weatherdataplugininfo.cpp
View File

@@ -13,37 +13,34 @@
using namespace BlackMisc;
namespace BlackMisc
namespace BlackMisc::Weather
{
namespace Weather
CWeatherDataPluginInfo::CWeatherDataPluginInfo(const QString &identifier, const QString &name, const QString &description, bool valid) :
m_identifier(identifier), m_name(name), m_description(description), m_valid(valid)
{ }
void CWeatherDataPluginInfo::convertFromJson(const QJsonObject &json)
{
CWeatherDataPluginInfo::CWeatherDataPluginInfo(const QString &identifier, const QString &name, const QString &description, bool valid) :
m_identifier(identifier), m_name(name), m_description(description), m_valid(valid)
{ }
void CWeatherDataPluginInfo::convertFromJson(const QJsonObject &json)
if (json.contains("IID")) // comes from the plugin
{
if (json.contains("IID")) // comes from the plugin
{
if (! json.contains("MetaData")) { throw CJsonException("Missing 'MetaData'"); }
if (! json.contains("MetaData")) { throw CJsonException("Missing 'MetaData'"); }
// json data is already validated by CPluginManagerWeatherData
CJsonScope scope("MetaData"); // for stack trace
Q_UNUSED(scope);
CValueObject::convertFromJson(json["MetaData"].toObject());
m_valid = true;
}
else
{
CValueObject::convertFromJson(json);
}
// json data is already validated by CPluginManagerWeatherData
CJsonScope scope("MetaData"); // for stack trace
Q_UNUSED(scope);
CValueObject::convertFromJson(json["MetaData"].toObject());
m_valid = true;
}
QString CWeatherDataPluginInfo::convertToQString(bool i18n) const
else
{
Q_UNUSED(i18n);
return QStringLiteral("%1 (%2)").arg(m_name, m_identifier);
CValueObject::convertFromJson(json);
}
}
QString CWeatherDataPluginInfo::convertToQString(bool i18n) const
{
Q_UNUSED(i18n);
return QStringLiteral("%1 (%2)").arg(m_name, m_identifier);
}
} // ns
} // ns