refs #697 BlackMisc settings renamed and reorganized.

This commit is contained in:
Mathew Sutcliffe
2016-08-03 02:08:53 +01:00
parent e7c9d3b62f
commit 8275b0d9bf
28 changed files with 902 additions and 926 deletions

View File

@@ -15,7 +15,7 @@
#include "blackmisc/aviation/aircrafticaocode.h"
#include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/sampleutils.h"
#include "blackmisc/simulation/settings/settingssimulator.h"
#include "blackmisc/simulation/simulationsettings.h"
#include "blackmisc/simulation/aircraftmodellist.h"
#include "blackmisc/simulation/aircraftmodelloader.h"
#include "blackmisc/simulation/fscommon/aircraftcfgentrieslist.h"
@@ -33,7 +33,6 @@ 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
@@ -54,9 +53,9 @@ namespace BlackSample
}, streamOut, streamIn);
const CSimulatorInfo sim = fsDir.toLower().contains("simobjects") ? CSimulatorInfo::FSX : CSimulatorInfo::FS9;
CMultiSimulatorSimulatorSettings multiSettings;
const CSettingsSimulator originalSettings = multiSettings.getSettings(sim);
CSettingsSimulator newSettings(originalSettings);
CMultiSimulatorSettings multiSettings;
const CSettings originalSettings = multiSettings.getSettings(sim);
CSettings newSettings(originalSettings);
newSettings.setModelDirectory(fsDir);
multiSettings.setSettings(newSettings, sim); // set, but do NOT(!) save