flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-13 15:45:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #297 Removed old simulator settings, which were not even used.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-06-30 20:48:04 +01:00
parent dace9e4da5
commit d971b073b7
12 changed files with 1 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackcore/context_settings.h
View File

@@ -94,13 +94,6 @@ namespace BlackCore
return s;
}
//! Path for simulator settings
static const QString &PathSimulatorSettings()
{
static QString s("simulator");
return s;
}
//! Root path
static const QString &PathRoot()
{
@@ -136,9 +129,6 @@ namespace BlackCore
//! Audio settings
virtual BlackMisc::Settings::CSettingsAudio getAudioSettings() const = 0;
//! Audio settings
virtual BlackMisc::Simulation::Settings::CSettingsSimulator getSimulatorSettings() const = 0;
//! Hotkeys
virtual BlackMisc::Settings::CSettingKeyboardHotkeyList getHotkeys() const = 0;

32
src/blackcore/context_settings_impl.cpp
View File

@@ -16,7 +16,6 @@ using namespace BlackMisc;
using namespace BlackMisc::Settings;
using namespace BlackMisc::Network;
using namespace BlackMisc::Hardware;
using namespace BlackMisc::Simulation::Settings;
namespace BlackCore
{
@@ -71,18 +70,6 @@ namespace BlackCore
this->m_settingsAudio.initDefaultValues();
}
// init simulator
if (jsonObject.contains(IContextSettings::PathSimulatorSettings()))
{
this->m_settingsSimulator.convertFromJson(
jsonObject.value(IContextSettings::PathSimulatorSettings()).toObject()
);
}
else
{
this->m_settingsSimulator.initDefaultValues();
}
// init own members
if (jsonObject.contains(IContextSettings::PathHotkeys()))
{
@@ -137,7 +124,6 @@ namespace BlackCore
this->m_hotkeys.initAsHotkeyList(true);
this->m_settingsNetwork.initDefaultValues();
this->m_settingsAudio.initDefaultValues();
this->m_settingsSimulator.initDefaultValues();
this->emitCompletelyChanged();
if (write)
{
@@ -163,7 +149,6 @@ namespace BlackCore
QJsonObject jsonObject;
jsonObject.insert(IContextSettings::PathNetworkSettings(), this->m_settingsNetwork.toJson());
jsonObject.insert(IContextSettings::PathAudioSettings(), this->m_settingsAudio.toJson());
jsonObject.insert(IContextSettings::PathSimulatorSettings(), this->m_settingsSimulator.toJson());
jsonObject.insert(IContextSettings::PathHotkeys(), this->m_hotkeys.toJson());
QJsonDocument doc(jsonObject);
return doc;
@@ -204,14 +189,6 @@ namespace BlackCore
return this->m_settingsAudio;
}
/*
* Simulator settings
*/
CSettingsSimulator CContextSettings::getSimulatorSettings() const
{
return this->m_settingsSimulator;
}
/*
* Pass value
*/
@@ -257,15 +234,6 @@ namespace BlackCore
emit this->changedSettings(static_cast<uint>(SettingsAudio));
}
}
else if (path.startsWith(IContextSettings::PathSimulatorSettings()))
{
msgs.push_back(this->m_settingsSimulator.value(nextLevelPath, command, value, changed));
if (changed)
{
msgs.push_back(this->write());
emit this->changedSettings(static_cast<uint>(SettingsSimulator));
}
}
else
{
msgs.push_back(

4
src/blackcore/context_settings_impl.h
View File

@@ -60,9 +60,6 @@ namespace BlackCore
//! \copydoc IContextSettings::getAudioSettings()
virtual BlackMisc::Settings::CSettingsAudio getAudioSettings() const override;
//! \copydoc IContextSettings::getSimulatorSettings()
virtual BlackMisc::Simulation::Settings::CSettingsSimulator getSimulatorSettings() const override;
//! \copydoc IContextSettings::getHotkeys()
virtual BlackMisc::Settings::CSettingKeyboardHotkeyList getHotkeys() const override;
@@ -87,7 +84,6 @@ namespace BlackCore
BlackMisc::Settings::CSettingsNetwork m_settingsNetwork;
BlackMisc::Settings::CSettingsAudio m_settingsAudio;
BlackMisc::Simulation::Settings::CSettingsSimulator m_settingsSimulator;
BlackMisc::Settings::CSettingKeyboardHotkeyList m_hotkeys;
QJsonDocument toJsonDocument() const;
void emitCompletelyChanged();

9
src/blackcore/context_settings_proxy.cpp
View File

@@ -15,7 +15,6 @@ using namespace BlackMisc;
using namespace BlackMisc::Settings;
using namespace BlackMisc::Network;
using namespace BlackMisc::Hardware;
using namespace BlackMisc::Simulation::Settings;
namespace BlackCore
{
@@ -58,14 +57,6 @@ namespace BlackCore
return this->m_dBusInterface->callDBusRet<CSettingsAudio>(QLatin1Literal("getAudioSettings"));
}
/*
* Relay to DBus
*/
CSettingsSimulator CContextSettingsProxy::getSimulatorSettings() const
{
return this->m_dBusInterface->callDBusRet<CSettingsSimulator>(QLatin1Literal("getSimulatorSettings"));
}
/*
* Relay to DBus
*/

3
src/blackcore/context_settings_proxy.h
View File

@@ -50,9 +50,6 @@ namespace BlackCore
//! \copydoc IContextSettings::getAudioSettings()
virtual BlackMisc::Settings::CSettingsAudio getAudioSettings() const override;
//! \copydoc IContextSettings::getSimulatorSettings()
virtual BlackMisc::Simulation::Settings::CSettingsSimulator getSimulatorSettings() const override;
//! \copydoc IContextSettings::getHotkeys()
virtual BlackMisc::Settings::CSettingKeyboardHotkeyList getHotkeys() const override;

1
src/blackcore/context_simulator_impl.cpp
View File

@@ -31,7 +31,6 @@ using namespace BlackMisc::Network;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Geo;
using namespace BlackMisc::Simulation;
using namespace BlackMisc::Simulation::Settings;
namespace BlackCore
{

1
src/blackcore/settingsallclasses.h
View File

@@ -7,6 +7,5 @@
#define BLACKCORE_SETTINGSALLCLASSES_H
#include "blackmisc/settingsblackmiscclasses.h"
#include "blackmisc/simulation/setsimulator.h"
#endif // guard