From 264002cb63d60b2c627cb36e065f05ea97ace77c Mon Sep 17 00:00:00 2001 From: Roland Rossgotterer Date: Mon, 11 Mar 2019 13:24:10 +0100 Subject: [PATCH] Style and formatting --- default.json | 2 +- .../simulation/aircraftmodelloader.cpp | 3 +- .../aircraftmodelloaderflightgear.cpp | 67 ++++++++----------- .../aircraftmodelloaderflightgear.h | 28 +++----- .../simulation/simulatorplugininfo.cpp | 5 +- .../flightgear/fgswiftbusserviceproxy.h | 6 +- .../flightgear/fgswiftbustrafficproxy.h | 4 +- 7 files changed, 49 insertions(+), 66 deletions(-) diff --git a/default.json b/default.json index 1fddb5e38..713bf5a7b 100644 --- a/default.json +++ b/default.json @@ -24,7 +24,7 @@ "p3d": true, "fsuipc": true, "xplane": true, - "fg": true + "fg": true }, "profileRelease": true, "assertsInRelease": true, diff --git a/src/blackmisc/simulation/aircraftmodelloader.cpp b/src/blackmisc/simulation/aircraftmodelloader.cpp index ae9aa4504..574ee34ff 100644 --- a/src/blackmisc/simulation/aircraftmodelloader.cpp +++ b/src/blackmisc/simulation/aircraftmodelloader.cpp @@ -24,6 +24,7 @@ using namespace BlackMisc; using namespace BlackMisc::Simulation::Data; using namespace BlackMisc::Simulation::Settings; using namespace BlackMisc::Simulation::FsCommon; +using namespace BlackMisc::Simulation::Flightgear; using namespace BlackMisc::Simulation::XPlane; namespace BlackMisc @@ -175,7 +176,7 @@ namespace BlackMisc { Q_ASSERT_X(simulator.isSingleSimulator(), Q_FUNC_INFO, "Single simulator"); if (simulator.isXPlane()) { return new CAircraftModelLoaderXPlane(parent); } - if (simulator.isFG()) { return new BlackMisc::Simulation::Flightgear::AircraftModelLoaderFlightgear(parent); } + if (simulator.isFG()) { return new CAircraftModelLoaderFlightgear(parent); } return CAircraftCfgParser::createModelLoader(simulator, parent); } diff --git a/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.cpp b/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.cpp index ad09e5651..bdb9bc1de 100644 --- a/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.cpp +++ b/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.cpp @@ -16,100 +16,94 @@ namespace BlackMisc namespace Flightgear { - bool AircraftModelLoaderFlightgear::isLoadingFinished() const + bool CAircraftModelLoaderFlightgear::isLoadingFinished() const { return !m_parserWorker || m_parserWorker->isFinished();; } - AircraftModelLoaderFlightgear::AircraftModelLoaderFlightgear(QObject *parent) : Simulation::IAircraftModelLoader(Simulation::CSimulatorInfo::fg(), parent) + CAircraftModelLoaderFlightgear::CAircraftModelLoaderFlightgear(QObject *parent) : Simulation::IAircraftModelLoader(Simulation::CSimulatorInfo::fg(), parent) { } - AircraftModelLoaderFlightgear::~AircraftModelLoaderFlightgear() + CAircraftModelLoaderFlightgear::~CAircraftModelLoaderFlightgear() { // that should be safe as long as the worker uses deleteLater (which it does) if (m_parserWorker) { m_parserWorker->waitForFinished(); } } - void AircraftModelLoaderFlightgear::updateInstalledModels(const CAircraftModelList &models) + void CAircraftModelLoaderFlightgear::updateInstalledModels(const CAircraftModelList &models) { this->setModelsForSimulator(models, CSimulatorInfo::fg()); const CStatusMessage m = CStatusMessage(this, CStatusMessage::SeverityInfo, u"Flightgear updated '%1' models") << models.size(); m_loadingMessages.push_back(m); } - Simulation::CAircraftModelList AircraftModelLoaderFlightgear::parseFlyableAirplanes(const QString &rootDirectory, const QStringList &excludeDirectories) + CAircraftModelList CAircraftModelLoaderFlightgear::parseFlyableAirplanes(const QString &rootDirectory, const QStringList &excludeDirectories) { Q_UNUSED(excludeDirectories); if (rootDirectory.isEmpty()) { return {}; } - Simulation::CAircraftModelList installedModels; + CAircraftModelList installedModels; QDir searchPath(rootDirectory); searchPath.setNameFilters(QStringList() << "*-set.xml"); QDirIterator aircraftIt(searchPath, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (aircraftIt.hasNext()) { aircraftIt.next(); if (CFileUtils::isExcludedDirectory(aircraftIt.fileInfo(), excludeDirectories, Qt::CaseInsensitive)) { continue; } if (aircraftIt.filePath().toStdString().find("/AI/Aircraft") != std::string::npos) { continue; } - Simulation::CAircraftModel model; - std::string modelName = aircraftIt.fileName().toStdString(); - modelName = modelName.substr(0, modelName.find("-set.xml")); - model.setName(QString::fromStdString(modelName)); - model.setModelString(QString::fromStdString(getModelString(aircraftIt.fileName().toStdString(), false))); + CAircraftModel model; + QString modelName = aircraftIt.fileName(); + modelName = modelName.remove("-set.xml"); + model.setName(modelName); + model.setModelString(getModelString(aircraftIt.fileName(), false)); model.setModelType(CAircraftModel::TypeOwnSimulatorModel); model.setSimulator(CSimulatorInfo::fg()); model.setFileDetailsAndTimestamp(aircraftIt.fileInfo()); model.setModelMode(CAircraftModel::Exclude); - addUniqueModel(model, installedModels); - } return installedModels; } - CAircraftModelList AircraftModelLoaderFlightgear::parseAIAirplanes(const QString &rootDirectory, const QStringList &excludeDirectories) + CAircraftModelList CAircraftModelLoaderFlightgear::parseAIAirplanes(const QString &rootDirectory, const QStringList &excludeDirectories) { Q_UNUSED(excludeDirectories); if (rootDirectory.isEmpty()) { return {}; } - Simulation::CAircraftModelList installedModels; + CAircraftModelList installedModels; QDir searchPath(rootDirectory); searchPath.setNameFilters(QStringList() << "*.xml"); QDirIterator aircraftIt(searchPath, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while (aircraftIt.hasNext()) { aircraftIt.next(); if (CFileUtils::isExcludedDirectory(aircraftIt.fileInfo(), excludeDirectories, Qt::CaseInsensitive)) { continue; } - Simulation::CAircraftModel model; - std::string modelName = aircraftIt.fileName().toStdString(); - modelName = modelName.substr(0, modelName.find(".xml")); - model.setName(QString::fromStdString(modelName)); - model.setModelString(QString::fromStdString(getModelString(aircraftIt.filePath().toStdString(), true))); + CAircraftModel model; + QString modelName = aircraftIt.fileName(); + modelName = modelName.remove(".xml"); + model.setName(modelName); + model.setModelString(getModelString(aircraftIt.filePath(), true)); model.setModelType(CAircraftModel::TypeOwnSimulatorModel); model.setSimulator(CSimulatorInfo::fg()); model.setFileDetailsAndTimestamp(aircraftIt.fileInfo()); model.setModelMode(CAircraftModel::Include); - addUniqueModel(model, installedModels); - } return installedModels; } - void AircraftModelLoaderFlightgear::addUniqueModel(const CAircraftModel &model, CAircraftModelList &models) + void CAircraftModelLoaderFlightgear::addUniqueModel(const CAircraftModel &model, CAircraftModelList &models) { //TODO Add check models.push_back(model); } - CAircraftModelList AircraftModelLoaderFlightgear::performParsing(const QStringList &rootDirectories, const QStringList &excludeDirectories) + CAircraftModelList CAircraftModelLoaderFlightgear::performParsing(const QStringList &rootDirectories, const QStringList &excludeDirectories) { CAircraftModelList allModels; for (const QString &rootDirectory : rootDirectories) @@ -124,7 +118,7 @@ namespace BlackMisc return allModels; } - void AircraftModelLoaderFlightgear::startLoadingFromDisk(IAircraftModelLoader::LoadMode mode, const IAircraftModelLoader::ModelConsolidationCallback &modelConsolidation, const QStringList &modelDirectories) + void CAircraftModelLoaderFlightgear::startLoadingFromDisk(IAircraftModelLoader::LoadMode mode, const IAircraftModelLoader::ModelConsolidationCallback &modelConsolidation, const QStringList &modelDirectories) { const CSimulatorInfo simulator = CSimulatorInfo::fg(); const QStringList modelDirs = this->getInitializedModelDirectories(modelDirectories, simulator); @@ -159,28 +153,25 @@ namespace BlackMisc } - std::string AircraftModelLoaderFlightgear::getModelString(std::string fileName, bool ai) + QString CAircraftModelLoaderFlightgear::getModelString(const QString &fileName, bool ai) { - std::string modelString = "FG "; + QString modelString = "FG "; + QString f; if (ai) { modelString.append("AI "); - fileName = fileName.substr(fileName.find("Aircraft") + 9); - fileName = fileName.substr(0, fileName.find(".xml")); - + f = fileName.mid(fileName.indexOf("Aircraft") + 9); + f.remove(".xml"); } else { - fileName = fileName.substr(0, fileName.find("-set.xml")); + f = fileName; + f.remove("-set.xml"); } - modelString.append(fileName); - - + modelString.append(f); return modelString; } - - } } diff --git a/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.h b/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.h index 484cc52e4..79dd74df2 100644 --- a/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.h +++ b/src/blackmisc/simulation/flightgear/aircraftmodelloaderflightgear.h @@ -15,44 +15,36 @@ namespace BlackMisc { namespace Flightgear { - /*! - * Flightgear aircraft model loader - */ - class AircraftModelLoaderFlightgear : public Simulation::IAircraftModelLoader + //! Flightgear aircraft model loader + class CAircraftModelLoaderFlightgear : public Simulation::IAircraftModelLoader { Q_OBJECT - // IAircraftModelLoader interface public: - - //! Constructor - AircraftModelLoaderFlightgear(QObject *parent = nullptr); + CAircraftModelLoaderFlightgear(QObject *parent = nullptr); //! Virtual destructor - virtual ~AircraftModelLoaderFlightgear() override; + virtual ~CAircraftModelLoaderFlightgear() override; - // Interface functions //! Parsed or injected models void updateInstalledModels(const CAircraftModelList &models); - bool isLoadingFinished() const override; + + //! \copydoc IAircraftModelLoader::isLoadingFinished + virtual bool isLoadingFinished() const override; protected: - // Interface functions - void startLoadingFromDisk(LoadMode mode, const ModelConsolidationCallback &modelConsolidation, const QStringList &modelDirectories) override; + //! \copydoc IAircraftModelLoader::startLoadingFromDisk + virtual void startLoadingFromDisk(LoadMode mode, const ModelConsolidationCallback &modelConsolidation, const QStringList &modelDirectories) override; private: - std::string getModelString(std::string filePath, bool ai); + QString getModelString(const QString &filePath, bool ai); Simulation::CAircraftModelList parseFlyableAirplanes(const QString &rootDirectory, const QStringList &excludeDirectories); Simulation::CAircraftModelList parseAIAirplanes(const QString &rootDirectory, const QStringList &excludeDirectories); void addUniqueModel(const CAircraftModel &model, CAircraftModelList &models); QPointer m_parserWorker; CAircraftModelList performParsing(const QStringList &rootDirectories, const QStringList &excludeDirectories); - - }; } } - - } diff --git a/src/blackmisc/simulation/simulatorplugininfo.cpp b/src/blackmisc/simulation/simulatorplugininfo.cpp index 223dad545..0342cdaea 100644 --- a/src/blackmisc/simulation/simulatorplugininfo.cpp +++ b/src/blackmisc/simulation/simulatorplugininfo.cpp @@ -108,7 +108,7 @@ namespace BlackMisc xplanePluginIdentifier(), fs9PluginIdentifier(), emulatedPluginIdentifier(), - fgPluginIdentifier() + fgPluginIdentifier() }); return identifiers; } @@ -118,8 +118,7 @@ namespace BlackMisc if (BlackConfig::CBuildConfig::isRunningOnUnixPlatform()) { // On UNIX we likely run XP - // TODO Add FG? - return QStringList { xplanePluginIdentifier() }; + return QStringList { xplanePluginIdentifier(), fgPluginIdentifier() }; } return QStringList diff --git a/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h b/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h index 59f11d37b..51a05da1e 100644 --- a/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h +++ b/src/plugins/simulator/flightgear/fgswiftbusserviceproxy.h @@ -8,8 +8,8 @@ //! \file -#ifndef BLACKSIMPLUGIN_FGSWIFTBUS_SERVICE_PROXY_H -#define BLACKSIMPLUGIN_FGSWIFTBUS_SERVICE_PROXY_H +#ifndef BLACKSIMPLUGIN_FLIGHTGEAR_SERVICE_PROXY_H +#define BLACKSIMPLUGIN_FLIGHTGEAR_SERVICE_PROXY_H #include "blackmisc/genericdbusinterface.h" @@ -101,7 +101,7 @@ namespace BlackSimPlugin QString getVersionNumber(); //! Get own aircraft situation data - void getOwnAircraftSituationData(BlackSimPlugin::Flightgear::FlightgearData *o_flightgearData); + void getOwnAircraftSituationData(FlightgearData *o_flightgearData); //! Add a text message to the on-screen display void addTextMessage(const QString &text); diff --git a/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.h b/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.h index ffd6f2fb4..30a999a2b 100644 --- a/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.h +++ b/src/plugins/simulator/flightgear/fgswiftbustrafficproxy.h @@ -8,8 +8,8 @@ //! \file -#ifndef BLACKSIMPLUGIN_FGSWIFTBUS_TRAFFIC_PROXY_H -#define BLACKSIMPLUGIN_FGSWIFTBUS_TRAFFIC_PROXY_H +#ifndef BLACKSIMPLUGIN_FLIGHTGEAR_TRAFFIC_PROXY_H +#define BLACKSIMPLUGIN_FLIGHTGEAR_TRAFFIC_PROXY_H #include "blackmisc/genericdbusinterface.h" #include "blackmisc/aviation/callsign.h"