Issue #77 Break cyclic dependency between CSimulatorInfo and CSimulatorPluginInfo by moving a method from one to the other

This commit is contained in:
Mat Sutcliffe
2020-11-09 00:39:51 +00:00
parent b81cc9a9dc
commit 2cf02c484e
5 changed files with 17 additions and 18 deletions

View File

@@ -7,7 +7,6 @@
*/
#include "blackconfig/buildconfig.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/simulation/fscommon/fscommonutil.h"
#include "blackmisc/simulation/simulatorinfo.h"
#include "blackmisc/simulation/xplane/xplaneutil.h"
@@ -218,19 +217,6 @@ namespace BlackMisc
m_simulator = (m_simulator ^ static_cast<int>(All)) & static_cast<int>(All);
}
const QString &CSimulatorInfo::toPluginIdentifier() const
{
static const QString e;
if (!this->isSingleSimulator()) { return e; }
const Simulator s = getSimulator();
if (s.testFlag(FSX)) { return CSimulatorPluginInfo::fsxPluginIdentifier(); }
if (s.testFlag(FS9)) { return CSimulatorPluginInfo::fs9PluginIdentifier(); }
if (s.testFlag(P3D)) { return CSimulatorPluginInfo::p3dPluginIdentifier(); }
if (s.testFlag(XPLANE)) { return CSimulatorPluginInfo::xplanePluginIdentifier(); }
if (s.testFlag(FG)) { return CSimulatorPluginInfo::fgPluginIdentifier(); }
return e;
}
CStatusMessage CSimulatorInfo::validateSimulatorsForModel() const
{
CStatusMessage m(this);