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

@@ -10,61 +10,58 @@
#include <QtGlobal>
namespace BlackMisc
namespace BlackMisc::Simulation
{
namespace Simulation
CDistributorListPreferences::CDistributorListPreferences() { }
const CDistributorList &CDistributorListPreferences::getDistributors(const CSimulatorInfo &simulator) const
{
CDistributorListPreferences::CDistributorListPreferences() { }
const CDistributorList &CDistributorListPreferences::getDistributors(const CSimulatorInfo &simulator) const
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "Need single simulator");
switch (simulator.getSimulator())
{
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "Need single simulator");
switch (simulator.getSimulator())
{
case CSimulatorInfo::FSX: return m_distributorsFsx;
case CSimulatorInfo::P3D: return m_distributorsP3d;
case CSimulatorInfo::FS9: return m_distributorsFs9;
case CSimulatorInfo::FG: return m_distributorsFG;
case CSimulatorInfo::XPLANE: return m_distributorsXPlane;
default:
Q_ASSERT_X(false, Q_FUNC_INFO, "Wrong simulator");
break;
}
static const CDistributorList empty;
return empty;
case CSimulatorInfo::FSX: return m_distributorsFsx;
case CSimulatorInfo::P3D: return m_distributorsP3d;
case CSimulatorInfo::FS9: return m_distributorsFs9;
case CSimulatorInfo::FG: return m_distributorsFG;
case CSimulatorInfo::XPLANE: return m_distributorsXPlane;
default:
Q_ASSERT_X(false, Q_FUNC_INFO, "Wrong simulator");
break;
}
CDistributor CDistributorListPreferences::getFirstOrDefaultDistributor(const CSimulatorInfo &simulator) const
{
return this->getDistributors(simulator).frontOrDefault();
}
static const CDistributorList empty;
return empty;
}
void CDistributorListPreferences::setDistributors(const CDistributorList &distributors, const CSimulatorInfo &simulator)
{
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "Need single simulator");
CDistributorList d(distributors);
d.sortAscendingByOrder(); // make sure we are sorted by order
m_lastUpdatedSimulator = simulator;
CDistributor CDistributorListPreferences::getFirstOrDefaultDistributor(const CSimulatorInfo &simulator) const
{
return this->getDistributors(simulator).frontOrDefault();
}
switch (simulator.getSimulator())
{
case CSimulatorInfo::FSX: m_distributorsFsx = d; break;
case CSimulatorInfo::P3D: m_distributorsP3d = d; break;
case CSimulatorInfo::FS9: m_distributorsFs9 = d; break;
case CSimulatorInfo::FG: m_distributorsFG = d; break;
case CSimulatorInfo::XPLANE: m_distributorsXPlane = d; break;
default:
Q_ASSERT_X(false, Q_FUNC_INFO, "Wrong simulator");
break;
}
}
void CDistributorListPreferences::setDistributors(const CDistributorList &distributors, const CSimulatorInfo &simulator)
{
Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "Need single simulator");
CDistributorList d(distributors);
d.sortAscendingByOrder(); // make sure we are sorted by order
m_lastUpdatedSimulator = simulator;
QString CDistributorListPreferences::convertToQString(bool i18n) const
switch (simulator.getSimulator())
{
Q_UNUSED(i18n);
static const QString p("Preferences FSX %1, P3D %2, FS9 %3, XP %4 FG %5");
return p.arg(m_distributorsFsx.size()).arg(m_distributorsP3d.size()).arg(m_distributorsFs9.size()).arg(m_distributorsXPlane.size()).arg(m_distributorsFG.size());
case CSimulatorInfo::FSX: m_distributorsFsx = d; break;
case CSimulatorInfo::P3D: m_distributorsP3d = d; break;
case CSimulatorInfo::FS9: m_distributorsFs9 = d; break;
case CSimulatorInfo::FG: m_distributorsFG = d; break;
case CSimulatorInfo::XPLANE: m_distributorsXPlane = d; break;
default:
Q_ASSERT_X(false, Q_FUNC_INFO, "Wrong simulator");
break;
}
} // namespace
}
QString CDistributorListPreferences::convertToQString(bool i18n) const
{
Q_UNUSED(i18n);
static const QString p("Preferences FSX %1, P3D %2, FS9 %3, XP %4 FG %5");
return p.arg(m_distributorsFsx.size()).arg(m_distributorsP3d.size()).arg(m_distributorsFs9.size()).arg(m_distributorsXPlane.size()).arg(m_distributorsFG.size());
}
} // namespace