From 9e274badf1e2179c5c665f58d8a385a6e6e29625 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Sat, 2 May 2015 00:40:10 +0200 Subject: [PATCH] refs #409 Rename ISimulatorModelMappings to IModelMappingsProvider The reason is that the previous name sounded more like a value object. But instead it does read the mappings from somwhere. --- .../simulation/fscommon/aircraftmapper.cpp | 4 ++-- .../simulation/fscommon/aircraftmapper.h | 8 ++++---- ...ngs.cpp => modelmappingsprovidervpilot.cpp} | 18 +++++++++--------- ...appings.h => modelmappingsprovidervpilot.h} | 8 ++++---- ...lmappings.cpp => modelmappingsprovider.cpp} | 12 ++++++------ ...modelmappings.h => modelmappingsprovider.h} | 6 +++--- .../simulator/fscommon/simulator_fscommon.cpp | 6 +++--- 7 files changed, 31 insertions(+), 31 deletions(-) rename src/blackmisc/simulation/fscommon/{vpilotmodelmappings.cpp => modelmappingsprovidervpilot.cpp} (87%) rename src/blackmisc/simulation/fscommon/{vpilotmodelmappings.h => modelmappingsprovidervpilot.h} (85%) rename src/blackmisc/simulation/{simulatormodelmappings.cpp => modelmappingsprovider.cpp} (76%) rename src/blackmisc/simulation/{simulatormodelmappings.h => modelmappingsprovider.h} (89%) diff --git a/src/blackmisc/simulation/fscommon/aircraftmapper.cpp b/src/blackmisc/simulation/fscommon/aircraftmapper.cpp index 9f7afdb21..36cf8e3c9 100644 --- a/src/blackmisc/simulation/fscommon/aircraftmapper.cpp +++ b/src/blackmisc/simulation/fscommon/aircraftmapper.cpp @@ -25,11 +25,11 @@ namespace BlackMisc { CAircraftMapper::CAircraftMapper(QObject *parent) : QObject(parent) { } - CAircraftMapper::CAircraftMapper(std::unique_ptr mappings, QObject *parent) : + CAircraftMapper::CAircraftMapper(std::unique_ptr mappings, QObject *parent) : QObject(parent), m_mappings(mappings.release()) { } - CAircraftMapper::CAircraftMapper(std::unique_ptr mappings, const QString &simObjectsDir, QObject *parent) : + CAircraftMapper::CAircraftMapper(std::unique_ptr mappings, const QString &simObjectsDir, QObject *parent) : QObject(parent), m_mappings(mappings.release()) { this->m_entries.changeDirectory(simObjectsDir); diff --git a/src/blackmisc/simulation/fscommon/aircraftmapper.h b/src/blackmisc/simulation/fscommon/aircraftmapper.h index 296f2be59..63171f312 100644 --- a/src/blackmisc/simulation/fscommon/aircraftmapper.h +++ b/src/blackmisc/simulation/fscommon/aircraftmapper.h @@ -14,7 +14,7 @@ #include "blackmisc/blackmiscexport.h" #include "aircraftcfgentrieslist.h" -#include "../simulatormodelmappings.h" +#include "blackmisc/simulation/modelmappingsprovider.h" #include "blackmisc/worker.h" #include #include @@ -51,10 +51,10 @@ namespace BlackMisc CAircraftMapper(QObject *parent = nullptr); //! Constructor, handing over ownership or mappings object - CAircraftMapper(std::unique_ptr mappings, QObject *parent = nullptr); + CAircraftMapper(std::unique_ptr mappings, QObject *parent = nullptr); //! Constructor, handing over ownership or mappings object - CAircraftMapper(std::unique_ptr mappings, const QString &simObjectsDir, QObject *parent = nullptr); + CAircraftMapper(std::unique_ptr mappings, const QString &simObjectsDir, QObject *parent = nullptr); //! Destructor ~CAircraftMapper(); @@ -109,7 +109,7 @@ namespace BlackMisc static const BlackMisc::Simulation::CAircraftModel &getDefaultModel(); private: - QScopedPointer m_mappings; //!< all mapping definitions + QScopedPointer m_mappings; //!< all mapping definitions CAircraftCfgEntriesList m_entries; //!< all entries bool m_init = false; bool m_initInProgress = false; diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelmappings.cpp b/src/blackmisc/simulation/fscommon/modelmappingsprovidervpilot.cpp similarity index 87% rename from src/blackmisc/simulation/fscommon/vpilotmodelmappings.cpp rename to src/blackmisc/simulation/fscommon/modelmappingsprovidervpilot.cpp index 408488140..564570913 100644 --- a/src/blackmisc/simulation/fscommon/vpilotmodelmappings.cpp +++ b/src/blackmisc/simulation/fscommon/modelmappingsprovidervpilot.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "vpilotmodelmappings.h" +#include "modelmappingsprovidervpilot.h" #include "blackmisc/network/aircraftmapping.h" #include @@ -24,19 +24,19 @@ namespace BlackMisc namespace FsCommon { - CVPilotModelMappings::CVPilotModelMappings(bool standardDirectory, QObject *parent) : - ISimulatorModelMappings(parent) + CModelMappingsProviderVPilot::CModelMappingsProviderVPilot(bool standardDirectory, QObject *parent) : + IModelMappingsProvider(parent) { - if (standardDirectory) { this->addDirectory(CVPilotModelMappings::standardMappingsDirectory()); } + if (standardDirectory) { this->addDirectory(CModelMappingsProviderVPilot::standardMappingsDirectory()); } } - void CVPilotModelMappings::addFilename(const QString &fileName) + void CModelMappingsProviderVPilot::addFilename(const QString &fileName) { if (this->m_fileList.contains(fileName)) return; this->m_fileList.append(fileName); } - void CVPilotModelMappings::addDirectory(const QString &directory) + void CModelMappingsProviderVPilot::addDirectory(const QString &directory) { QDir dir(directory); if (!dir.exists()) return; @@ -48,7 +48,7 @@ namespace BlackMisc } } - const QString &CVPilotModelMappings::standardMappingsDirectory() + const QString &CModelMappingsProviderVPilot::standardMappingsDirectory() { static QString directory; if (directory.isEmpty()) @@ -60,7 +60,7 @@ namespace BlackMisc return directory; } - bool CVPilotModelMappings::read() + bool CModelMappingsProviderVPilot::read() { bool success = true; this->m_loadedFiles = 0; @@ -75,7 +75,7 @@ namespace BlackMisc return success; } - bool CVPilotModelMappings::loadFile(const QString &fileName) + bool CModelMappingsProviderVPilot::loadFile(const QString &fileName) { QFile f(fileName); if (!f.exists()) { return false; } diff --git a/src/blackmisc/simulation/fscommon/vpilotmodelmappings.h b/src/blackmisc/simulation/fscommon/modelmappingsprovidervpilot.h similarity index 85% rename from src/blackmisc/simulation/fscommon/vpilotmodelmappings.h rename to src/blackmisc/simulation/fscommon/modelmappingsprovidervpilot.h index f74e47ae7..5619921a7 100644 --- a/src/blackmisc/simulation/fscommon/vpilotmodelmappings.h +++ b/src/blackmisc/simulation/fscommon/modelmappingsprovidervpilot.h @@ -13,7 +13,7 @@ #define BLACKMISC_SIMULATION_FSCOMMON_VPILOTMODELMAPPINGS_H #include "blackmisc/blackmiscexport.h" -#include "../simulatormodelmappings.h" +#include "blackmisc/simulation/modelmappingsprovider.h" #include namespace BlackMisc @@ -23,14 +23,14 @@ namespace BlackMisc namespace FsCommon { //! Model mappings - class BLACKMISC_EXPORT CVPilotModelMappings : public ISimulatorModelMappings + class BLACKMISC_EXPORT CModelMappingsProviderVPilot : public IModelMappingsProvider { public: //! Constructor - CVPilotModelMappings(bool standardDirectory, QObject *parent = nullptr); + CModelMappingsProviderVPilot(bool standardDirectory, QObject *parent = nullptr); //! Destructor - virtual ~CVPilotModelMappings() {} + virtual ~CModelMappingsProviderVPilot() {} //! File names void addFilename(const QString &fileName); diff --git a/src/blackmisc/simulation/simulatormodelmappings.cpp b/src/blackmisc/simulation/modelmappingsprovider.cpp similarity index 76% rename from src/blackmisc/simulation/simulatormodelmappings.cpp rename to src/blackmisc/simulation/modelmappingsprovider.cpp index 59874a522..05af56ea7 100644 --- a/src/blackmisc/simulation/simulatormodelmappings.cpp +++ b/src/blackmisc/simulation/modelmappingsprovider.cpp @@ -7,7 +7,7 @@ * contained in the LICENSE file. */ -#include "simulatormodelmappings.h" +#include "modelmappingsprovider.h" using namespace BlackMisc; using namespace BlackMisc::Network; @@ -17,24 +17,24 @@ namespace BlackMisc namespace Simulation { - ISimulatorModelMappings::ISimulatorModelMappings(QObject *parent) : QObject(parent) {} + IModelMappingsProvider::IModelMappingsProvider(QObject *parent) : QObject(parent) {} - int ISimulatorModelMappings::size() const + int IModelMappingsProvider::size() const { return this->m_mappings.size(); } - bool ISimulatorModelMappings::isEmpty() const + bool IModelMappingsProvider::isEmpty() const { return this->m_mappings.isEmpty(); } - const CAircraftMappingList &ISimulatorModelMappings::getMappingList() const + const CAircraftMappingList &IModelMappingsProvider::getMappingList() const { return this->m_mappings; } - int ISimulatorModelMappings::synchronizeWithExistingModels(const QStringList &modelNames, Qt::CaseSensitivity cs) + int IModelMappingsProvider::synchronizeWithExistingModels(const QStringList &modelNames, Qt::CaseSensitivity cs) { if (modelNames.isEmpty() || this->m_mappings.isEmpty()) { return this->m_mappings.size(); } CAircraftMappingList newList; diff --git a/src/blackmisc/simulation/simulatormodelmappings.h b/src/blackmisc/simulation/modelmappingsprovider.h similarity index 89% rename from src/blackmisc/simulation/simulatormodelmappings.h rename to src/blackmisc/simulation/modelmappingsprovider.h index 60fc59690..a7f49f11e 100644 --- a/src/blackmisc/simulation/simulatormodelmappings.h +++ b/src/blackmisc/simulation/modelmappingsprovider.h @@ -22,16 +22,16 @@ namespace BlackMisc { //! Model mappings interface, different mapping readers (e.g. from database, from vPilot data files) //! can implement this, but provide the same mapping list. - class BLACKMISC_EXPORT ISimulatorModelMappings : public QObject + class BLACKMISC_EXPORT IModelMappingsProvider : public QObject { Q_OBJECT public: //! Constructor - ISimulatorModelMappings(QObject *parent = nullptr); + IModelMappingsProvider(QObject *parent = nullptr); //! Destructor - virtual ~ISimulatorModelMappings() {} + virtual ~IModelMappingsProvider() {} //! Load data virtual bool read() = 0; diff --git a/src/plugins/simulator/fscommon/simulator_fscommon.cpp b/src/plugins/simulator/fscommon/simulator_fscommon.cpp index e20a352e7..0579906b4 100644 --- a/src/plugins/simulator/fscommon/simulator_fscommon.cpp +++ b/src/plugins/simulator/fscommon/simulator_fscommon.cpp @@ -9,7 +9,7 @@ #include "simulator_fscommon.h" #include "blackmisc/logmessage.h" -#include "blackmisc/simulation/fscommon/vpilotmodelmappings.h" +#include "blackmisc/simulation/fscommon/modelmappingsprovidervpilot.h" #include "blackmisc/simulation/fscommon/fscommonutil.h" using namespace BlackMisc::PhysicalQuantities; @@ -112,12 +112,12 @@ namespace BlackSimPlugin CAircraftMapper *CSimulatorFsCommon::mapperInstance() { - static CVPilotModelMappings *mappings = new CVPilotModelMappings(true); + static CModelMappingsProviderVPilot *mappings = new CModelMappingsProviderVPilot(true); // tries to access simObjectsDir, if this is an mapped remote directory // init might hang for a while static CAircraftMapper *mapper = new CAircraftMapper( - std::unique_ptr(mappings), // currently hard wired + std::unique_ptr(mappings), // currently hard wired simObjectsDir() ); return mapper;