Ref T112, moved simulator settings in subdir/settings namespace

This commit is contained in:
Klaus Basan
2017-08-06 00:29:37 +02:00
committed by Mathew Sutcliffe
parent f3847bd33c
commit 1387573e5b
29 changed files with 960 additions and 940 deletions

View File

@@ -15,9 +15,9 @@
#include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/sampleutils.h"
#include "blackmisc/simulation/simulatorsettings.h"
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/simulation/aircraftmodelloader.h"
#include "blackmisc/simulation/settings/simulatorsettings.h"
#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
#include "blackmisc/simulation/fscommon/aircraftcfgparser.h"
#include "blackmisc/simulation/fscommon/vpilotrulesreader.h"
@@ -33,6 +33,7 @@ using namespace BlackCore;
using namespace BlackMisc;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Simulation::FsCommon;
using namespace BlackMisc::Simulation::Settings;
using namespace BlackMisc::Aviation;
namespace BlackSample
@@ -40,12 +41,12 @@ namespace BlackSample
void CSamplesModelMapping::samples(QTextStream &streamOut, QTextStream &streamIn)
{
CVPilotRulesReader vpRulesReader;
bool s = vpRulesReader.read(true);
const bool s = vpRulesReader.read(true);
streamOut << "directory: " << CVPilotRulesReader::standardMappingsDirectory() << endl;
streamOut << "loaded: " << BlackMisc::boolToYesNo(s) << " size: " << vpRulesReader.getAsModelsFromCache().size() << endl;
// mapper with rule set, handing over ownership
QString fsDir = CSampleUtils::selectDirectory(
const QString fsDir = CSampleUtils::selectDirectory(
{
QStringLiteral("P:/FlightSimulatorX (MSI)/SimObjects"),
QStringLiteral("P:/Temp/SimObjects"),