Ref T515, renaming to "isKnownModelInSet"

This commit is contained in:
Klaus Basan
2019-01-23 17:13:29 +01:00
committed by Mat Sutcliffe
parent 583a5bfb28
commit 2dd396c0df
7 changed files with 9 additions and 9 deletions

View File

@@ -213,7 +213,7 @@ namespace BlackCore
virtual void restoreDisabledModels() = 0;
//! Known model?
virtual bool isKnownModel(const QString &modelstring) const = 0;
virtual bool isKnownModelInSet(const QString &modelstring) const = 0;
//! Set time synchronization between simulator and user's computer time
//! \remarks not all drivers implement this, e.g. if it is an intrinsic simulator feature

View File

@@ -161,8 +161,8 @@ namespace BlackCore
return false;
}
//! \copydoc IContextSimulator::isKnownModel
virtual bool isKnownModel(const QString &modelstring) const override
//! \copydoc IContextSimulator::isKnownModelInSet
virtual bool isKnownModelInSet(const QString &modelstring) const override
{
Q_UNUSED(modelstring);
logEmptyContextWarning(Q_FUNC_INFO);

View File

@@ -238,7 +238,7 @@ namespace BlackCore
return this->getModelSet().getModelStringList(false);
}
bool CContextSimulator::isKnownModel(const QString &modelString) const
bool CContextSimulator::isKnownModelInSet(const QString &modelString) const
{
if (m_debugEnabled) { CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO; }
const bool known = this->getModelSet().containsModelString(modelString);

View File

@@ -90,7 +90,7 @@ namespace BlackCore
virtual BlackMisc::CStatusMessageList verifyPrerequisites() const override;
virtual QStringList getModelSetStrings() const override;
virtual QStringList getModelSetCompleterStrings(bool sorted) const override;
virtual bool isKnownModel(const QString &modelString) const override;
virtual bool isKnownModelInSet(const QString &modelString) const override;
virtual int getModelSetCount() const override;
virtual void disableModelsForMatching(const BlackMisc::Simulation::CAircraftModelList &removedModels, bool incremental) override;
virtual BlackMisc::Simulation::CAircraftModelList getDisabledModelsForMatching() const override;

View File

@@ -150,9 +150,9 @@ namespace BlackCore
return m_dBusInterface->callDBusRet<QStringList>(QLatin1String("getModelSetCompleterStrings"), sorted);
}
bool CContextSimulatorProxy::isKnownModel(const QString &modelString) const
bool CContextSimulatorProxy::isKnownModelInSet(const QString &modelString) const
{
return m_dBusInterface->callDBusRet<bool>(QLatin1String("isKnownModel"), modelString);
return m_dBusInterface->callDBusRet<bool>(QLatin1String("isKnownModelInSet"), modelString);
}
CAircraftModelList CContextSimulatorProxy::getModelSetModelsStartingWith(const QString &modelString) const

View File

@@ -72,7 +72,7 @@ namespace BlackCore
virtual void setModelSetLoaderSimulator(const BlackMisc::Simulation::CSimulatorInfo &simulator) override;
virtual QStringList getModelSetStrings() const override;
virtual QStringList getModelSetCompleterStrings(bool sorted) const override;
virtual bool isKnownModel(const QString &modelString) const override;
virtual bool isKnownModelInSet(const QString &modelString) const override;
virtual BlackMisc::Simulation::CAircraftModelList getModelSetModelsStartingWith(const QString &modelString) const override;
virtual int getModelSetCount() const override;
virtual BlackMisc::Simulation::CSimulatorInternals getSimulatorInternals() const override;

View File

@@ -336,7 +336,7 @@ namespace BlackGui
bool hasModel = ui->tvp_AircraftModels->container().containsModelString(modelString);
if (!hasModel && sGui && sGui->getIContextSimulator())
{
hasModel = sGui->getIContextSimulator()->isKnownModel(modelString);
hasModel = sGui->getIContextSimulator()->isKnownModelInSet(modelString);
}
if (!hasModel)