Style and formatting

This commit is contained in:
Roland Rossgotterer
2019-03-11 13:24:10 +01:00
committed by Mat Sutcliffe
parent 9b4a01cd25
commit 264002cb63
7 changed files with 49 additions and 66 deletions

View File

@@ -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<CWorker> m_parserWorker;
CAircraftModelList performParsing(const QStringList &rootDirectories, const QStringList &excludeDirectories);
};
}
}
}