Formatting code

This commit is contained in:
Lars Toenning
2019-03-08 17:09:35 +01:00
committed by Mat Sutcliffe
parent aea2f11b42
commit 9b4a01cd25
8 changed files with 204 additions and 188 deletions

View File

@@ -9,46 +9,50 @@
#include "blackmisc/simulation/aircraftmodelloader.h"
#include <QPointer>
namespace BlackMisc{
namespace Simulation {
namespace Flightgear {
/*!
* Flightgear aircraft model loader
*/
class AircraftModelLoaderFlightgear : public Simulation::IAircraftModelLoader{
Q_OBJECT
namespace BlackMisc
{
namespace Simulation
{
namespace Flightgear
{
/*!
* Flightgear aircraft model loader
*/
class AircraftModelLoaderFlightgear : public Simulation::IAircraftModelLoader
{
Q_OBJECT
// IAircraftModelLoader interface
public:
// IAircraftModelLoader interface
public:
//! Constructor
AircraftModelLoaderFlightgear(QObject *parent = nullptr);
//! Constructor
AircraftModelLoaderFlightgear(QObject *parent = nullptr);
//! Virtual destructor
virtual ~AircraftModelLoaderFlightgear() override;
//! Virtual destructor
virtual ~AircraftModelLoaderFlightgear() override;
// Interface functions
//! Parsed or injected models
void updateInstalledModels(const CAircraftModelList &models);
bool isLoadingFinished() const override;
// Interface functions
//! Parsed or injected models
void updateInstalledModels(const CAircraftModelList &models);
bool isLoadingFinished() const override;
protected:
// Interface functions
void startLoadingFromDisk(LoadMode mode, const ModelConsolidationCallback &modelConsolidation, const QStringList &modelDirectories) override;
// Interface functions
void startLoadingFromDisk(LoadMode mode, const ModelConsolidationCallback &modelConsolidation, const QStringList &modelDirectories) override;
private:
std::string getModelString(std::string 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<CWorker> m_parserWorker;
CAircraftModelList performParsing(const QStringList &rootDirectories, const QStringList &excludeDirectories);
private:
std::string getModelString(std::string 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<CWorker> m_parserWorker;
CAircraftModelList performParsing(const QStringList &rootDirectories, const QStringList &excludeDirectories);
};
};
}
}
}
}