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

Ref T292, renamed "PerSimulator" -> "ForSimulator"

Browse Source
This commit is contained in:
Klaus Basan
2018-07-22 17:54:10 +02:00
parent e4866e3de6
commit ff3ffea7fc
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackgui/menus/aircraftmodelmenus.cpp
View File

@@ -307,7 +307,7 @@ namespace BlackGui
if (!filtered) if (!filtered)
{ {
this->modelsTargetSetable()->setModels(consolidated, sim); this->modelsTargetSetable()->setModelsForSimulator(consolidated, sim);
} }
else else
{ {
@@ -317,7 +317,7 @@ namespace BlackGui
} }
else else
{ {
this->modelsTargetUpdatable()->updateModels(consolidated, sim); this->modelsTargetUpdatable()->updateModelsForSimulator(consolidated, sim);
} }
} }
this->modelView()->hideLoadIndicator(i); this->modelView()->hideLoadIndicator(i);
@@ -338,7 +338,7 @@ namespace BlackGui
const CAircraftModelList consolidated = CDatabaseUtils::consolidateModelsWithSimulatorModelsAllowsGuiRefresh(models, this->getSimulatorModels(), true); const CAircraftModelList consolidated = CDatabaseUtils::consolidateModelsWithSimulatorModelsAllowsGuiRefresh(models, this->getSimulatorModels(), true);
const CSimulatorInfo sim(this->getSimulator()); const CSimulatorInfo sim(this->getSimulator());
this->modelsTargetUpdatable()->updateModels(consolidated, sim); this->modelsTargetUpdatable()->updateModelsForSimulator(consolidated, sim);
this->modelView()->hideLoadIndicator(i); this->modelView()->hideLoadIndicator(i);
} }
@@ -360,14 +360,14 @@ namespace BlackGui
return sim; return sim;
} }
IModelsPerSimulatorSetable *CConsolidateWithSimulatorModels::modelsTargetSetable() const IModelsForSimulatorSetable *CConsolidateWithSimulatorModels::modelsTargetSetable() const
{ {
return qobject_cast<IModelsPerSimulatorSetable *>(m_modelsTarget); return qobject_cast<IModelsForSimulatorSetable *>(m_modelsTarget);
} }
IModelsPerSimulatorUpdatable *CConsolidateWithSimulatorModels::modelsTargetUpdatable() const IModelsForSimulatorUpdatable *CConsolidateWithSimulatorModels::modelsTargetUpdatable() const
{ {
return qobject_cast<IModelsPerSimulatorUpdatable *>(m_modelsTarget); return qobject_cast<IModelsForSimulatorUpdatable *>(m_modelsTarget);
} }
ISimulatorSelectable *CConsolidateWithSimulatorModels::simulatorSelectable() const ISimulatorSelectable *CConsolidateWithSimulatorModels::simulatorSelectable() const

4
src/blackgui/menus/aircraftmodelmenus.h
View File

@@ -140,8 +140,8 @@ namespace BlackGui
//! Simulator //! Simulator
BlackMisc::Simulation::CSimulatorInfo getSimulator() const; BlackMisc::Simulation::CSimulatorInfo getSimulator() const;
BlackMisc::Simulation::IModelsPerSimulatorSetable *modelsTargetSetable() const; BlackMisc::Simulation::IModelsForSimulatorSetable *modelsTargetSetable() const;
BlackMisc::Simulation::IModelsPerSimulatorUpdatable *modelsTargetUpdatable() const; BlackMisc::Simulation::IModelsForSimulatorUpdatable *modelsTargetUpdatable() const;
BlackMisc::Simulation::ISimulatorSelectable *simulatorSelectable() const; BlackMisc::Simulation::ISimulatorSelectable *simulatorSelectable() const;
BlackGui::Components::CDbMappingComponent *getMappingComponent() const; BlackGui::Components::CDbMappingComponent *getMappingComponent() const;

14
src/blackmisc/simulation/aircraftmodelinterfaces.h
View File

@@ -32,23 +32,23 @@ namespace BlackMisc
{ {
public: public:
//! Update models //! Update models
virtual void updateModels(const CAircraftModelList &models) = 0; virtual int updateModels(const CAircraftModelList &models) = 0;
}; };
//! Interface to "something" backing models, which can be set //! Interface to "something" backing models, which can be set
class BLACKMISC_EXPORT IModelsPerSimulatorSetable class BLACKMISC_EXPORT IModelsForSimulatorSetable
{ {
public: public:
//! Set models //! Set models
virtual void setModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) = 0; virtual void setModelsForSimulator(const CAircraftModelList &models, const CSimulatorInfo &simulator) = 0;
}; };
//! Interface to "something" backing models, which can be modified (updated) //! Interface to "something" backing models, which can be modified (updated)
class BLACKMISC_EXPORT IModelsPerSimulatorUpdatable class BLACKMISC_EXPORT IModelsForSimulatorUpdatable
{ {
public: public:
//! Set models //! Set models
virtual void updateModels(const CAircraftModelList &models, const CSimulatorInfo &simulator) = 0; virtual int updateModelsForSimulator(const CAircraftModelList &models, const CSimulatorInfo &simulator) = 0;
}; };
//! Interface to "something" allowing a simulator selection //! Interface to "something" allowing a simulator selection
@@ -63,8 +63,8 @@ namespace BlackMisc
Q_DECLARE_INTERFACE(BlackMisc::Simulation::IModelsSetable, "org.swift-project.blackmisc.simulation.imodelssetable") Q_DECLARE_INTERFACE(BlackMisc::Simulation::IModelsSetable, "org.swift-project.blackmisc.simulation.imodelssetable")
Q_DECLARE_INTERFACE(BlackMisc::Simulation::IModelsUpdatable, "org.swift-project.blackmisc.simulation.imodelsupdateable") Q_DECLARE_INTERFACE(BlackMisc::Simulation::IModelsUpdatable, "org.swift-project.blackmisc.simulation.imodelsupdateable")
Q_DECLARE_INTERFACE(BlackMisc::Simulation::IModelsPerSimulatorSetable, "org.swift-project.blackmisc.simulation.imodelspersimulatorsetable") Q_DECLARE_INTERFACE(BlackMisc::Simulation::IModelsForSimulatorSetable, "org.swift-project.blackmisc.simulation.IModelsForSimulatorSetable")
Q_DECLARE_INTERFACE(BlackMisc::Simulation::IModelsPerSimulatorUpdatable, "org.swift-project.blackmisc.simulation.imodelspersimulatorupdatabale") Q_DECLARE_INTERFACE(BlackMisc::Simulation::IModelsForSimulatorUpdatable, "org.swift-project.blackmisc.simulation.imodelspersimulatorupdatabale")
Q_DECLARE_INTERFACE(BlackMisc::Simulation::ISimulatorSelectable, "org.swift-project.blackmisc.simulation.isimulatorselectable") Q_DECLARE_INTERFACE(BlackMisc::Simulation::ISimulatorSelectable, "org.swift-project.blackmisc.simulation.isimulatorselectable")
#endif // guard #endif // guard