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

refs #697 BlackCore settings renamed and reorganized.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-08-03 02:13:57 +01:00
parent 8275b0d9bf
commit 7a34cc6d9a
43 changed files with 312 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/context/contextaudioimpl.h
View File

@@ -16,7 +16,7 @@
#include "blackcore/blackcoreexport.h"
#include "blackcore/context/contextaudio.h"
#include "blackcore/corefacadeconfig.h"
#include "blackcore/settings/audio.h"
#include "blackcore/audio/audiosettings.h"
#include "blackcore/voicechannel.h"
#include "blackmisc/audio/audiodeviceinfolist.h"
#include "blackmisc/audio/notificationsounds.h"
@@ -183,7 +183,7 @@ namespace BlackCore
QHash<BlackMisc::Aviation::CComSystem::ComUnit, QSharedPointer<IVoiceChannel>> m_voiceChannelMapping;
// settings
BlackMisc::CSetting<BlackCore::Settings::Audio::AudioSettings> m_audioSettings { this };
BlackMisc::CSetting<BlackCore::Audio::TSettings> m_audioSettings { this };
};
} // namespace
} // namespace

4
src/blackcore/context/contextownaircraftimpl.h
View File

@@ -15,7 +15,7 @@
#include "blackcore/blackcoreexport.h"
#include "blackcore/context/contextownaircraft.h"
#include "blackcore/corefacadeconfig.h"
#include "blackcore/settings/network.h"
#include "blackcore/vatsim/vatsimsettings.h"
#include "blackmisc/aviation/aircraftparts.h"
#include "blackmisc/aviation/airlineicaocode.h"
#include "blackmisc/aviation/atcstation.h"
@@ -170,7 +170,7 @@ namespace BlackCore
QString m_voiceRoom2UrlOverride; //!< overridden voice room url
mutable QReadWriteLock m_lockAircraft; //!< lock aircraft
BlackMisc::CSetting<Settings::Network::CurrentTrafficServer> m_currentNetworkServer { this };
BlackMisc::CSetting<Vatsim::TCurrentTrafficServer> m_currentNetworkServer { this };
//! Init my very own aircraft with some defaults, before overridden by simulator
void initOwnAircraft();

4
src/blackcore/context/contextsimulatorimpl.h
View File

@@ -15,7 +15,7 @@
#include "blackcore/blackcoreexport.h"
#include "blackcore/context/contextsimulator.h"
#include "blackcore/corefacadeconfig.h"
#include "blackcore/settings/application.h"
#include "blackcore/application/applicationsettings.h"
#include "blackcore/weathermanager.h"
#include "blackmisc/aviation/airportlist.h"
#include "blackmisc/identifier.h"
@@ -205,7 +205,7 @@ namespace BlackCore
CPluginManagerSimulator *m_plugins = nullptr;
BlackMisc::CRegularThread m_listenersThread;
BlackCore::CWeatherManager m_weatherManager { this };
BlackMisc::CSetting<BlackCore::Settings::Application::EnabledSimulators> m_enabledSimulators { this, &CContextSimulator::restoreSimulatorPlugins };
BlackMisc::CSetting<BlackCore::Application::TEnabledSimulators> m_enabledSimulators { this, &CContextSimulator::restoreSimulatorPlugins };
};
} // namespace
} // namespace