From 2dd396c0dfff56dbadef43c7be432172cdbff0f3 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 23 Jan 2019 17:13:29 +0100 Subject: [PATCH] Ref T515, renaming to "isKnownModelInSet" --- src/blackcore/context/contextsimulator.h | 2 +- src/blackcore/context/contextsimulatorempty.h | 4 ++-- src/blackcore/context/contextsimulatorimpl.cpp | 2 +- src/blackcore/context/contextsimulatorimpl.h | 2 +- src/blackcore/context/contextsimulatorproxy.cpp | 4 ++-- src/blackcore/context/contextsimulatorproxy.h | 2 +- src/blackgui/components/mappingcomponent.cpp | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/blackcore/context/contextsimulator.h b/src/blackcore/context/contextsimulator.h index 0f1bfd22a..7926e03c7 100644 --- a/src/blackcore/context/contextsimulator.h +++ b/src/blackcore/context/contextsimulator.h @@ -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 diff --git a/src/blackcore/context/contextsimulatorempty.h b/src/blackcore/context/contextsimulatorempty.h index 9855bbe5b..f0e831129 100644 --- a/src/blackcore/context/contextsimulatorempty.h +++ b/src/blackcore/context/contextsimulatorempty.h @@ -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); diff --git a/src/blackcore/context/contextsimulatorimpl.cpp b/src/blackcore/context/contextsimulatorimpl.cpp index 9889b3ebc..ceb259fc1 100644 --- a/src/blackcore/context/contextsimulatorimpl.cpp +++ b/src/blackcore/context/contextsimulatorimpl.cpp @@ -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); diff --git a/src/blackcore/context/contextsimulatorimpl.h b/src/blackcore/context/contextsimulatorimpl.h index 1cd01af93..a0baaf09d 100644 --- a/src/blackcore/context/contextsimulatorimpl.h +++ b/src/blackcore/context/contextsimulatorimpl.h @@ -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; diff --git a/src/blackcore/context/contextsimulatorproxy.cpp b/src/blackcore/context/contextsimulatorproxy.cpp index 5fcd48b33..50dd013fb 100644 --- a/src/blackcore/context/contextsimulatorproxy.cpp +++ b/src/blackcore/context/contextsimulatorproxy.cpp @@ -150,9 +150,9 @@ namespace BlackCore return m_dBusInterface->callDBusRet(QLatin1String("getModelSetCompleterStrings"), sorted); } - bool CContextSimulatorProxy::isKnownModel(const QString &modelString) const + bool CContextSimulatorProxy::isKnownModelInSet(const QString &modelString) const { - return m_dBusInterface->callDBusRet(QLatin1String("isKnownModel"), modelString); + return m_dBusInterface->callDBusRet(QLatin1String("isKnownModelInSet"), modelString); } CAircraftModelList CContextSimulatorProxy::getModelSetModelsStartingWith(const QString &modelString) const diff --git a/src/blackcore/context/contextsimulatorproxy.h b/src/blackcore/context/contextsimulatorproxy.h index acae34ee5..5b5d56687 100644 --- a/src/blackcore/context/contextsimulatorproxy.h +++ b/src/blackcore/context/contextsimulatorproxy.h @@ -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; diff --git a/src/blackgui/components/mappingcomponent.cpp b/src/blackgui/components/mappingcomponent.cpp index f6d4e9628..408c9426c 100644 --- a/src/blackgui/components/mappingcomponent.cpp +++ b/src/blackgui/components/mappingcomponent.cpp @@ -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)