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

Ref T180, formatting

Browse Source
This commit is contained in:
Klaus Basan
2017-11-06 22:11:38 +01:00
parent 6273892b84
commit 822ef11c02
12 changed files with 66 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,7 +148,7 @@ namespace BlackCore
void kicked(const QString &kickMessage);
//! Connection status changed
void connectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to);
void connectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to);
//! Text messages received (also private chat messages, radio channel messages)
void textMessagesReceived(const BlackMisc::Network::CTextMessageList &textMessages);
@@ -225,7 +225,7 @@ namespace BlackCore
//! Connect to Network
//! \return messages generated during connecting
virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, BlackCore::INetwork::LoginMode loginMode) = 0;
virtual BlackMisc::CStatusMessage connectToNetwork(const BlackMisc::Network::CServer &server, INetwork::LoginMode loginMode) = 0;
//! Server which is connected, if not connected empty default object.
virtual BlackMisc::Network::CServer getConnectedServer() const = 0;

13
src/blackcore/context/contextsimulatorimpl.cpp
View File

@@ -55,13 +55,14 @@ namespace BlackCore
CIdentifiable(this),
m_plugins(new CPluginManagerSimulator(this))
{
setObjectName("CContextSimulator");
m_enableMatchingMessages = sApp->isRunningInDeveloperEnvironment();
connect(&m_weatherManager, &CWeatherManager::weatherGridReceived, this, &CContextSimulator::weatherGridReceived);
m_plugins->collectPlugins();
restoreSimulatorPlugins();
this->setObjectName("CContextSimulator");
CContextSimulator::registerHelp();
m_enableMatchingMessages = sApp->isRunningInDeveloperEnvironment();
m_plugins->collectPlugins();
this->restoreSimulatorPlugins();
connect(&m_weatherManager, &CWeatherManager::weatherGridReceived, this, &CContextSimulator::weatherGridReceived);
connect(&m_modelSetLoader, &CAircraftModelSetLoader::simulatorChanged, this, &CContextSimulator::ps_modelSetChanged);
connect(&m_modelSetLoader, &CAircraftModelSetLoader::cacheChanged, this, &CContextSimulator::ps_modelSetChanged);

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

@@ -12,12 +12,13 @@
#ifndef BLACKCORE_CONTEXT_CONTEXTSIMULATOR_IMPL_H
#define BLACKCORE_CONTEXT_CONTEXTSIMULATOR_IMPL_H
#include "blackcore/corefacadeconfig.h"
#include "blackcore/context/contextsimulator.h"
#include "blackcore/application/applicationsettings.h"
#include "blackcore/aircraftmatcher.h"
#include "blackcore/blackcoreexport.h"
#include "blackcore/context/contextsimulator.h"
#include "blackcore/corefacadeconfig.h"
#include "blackcore/application/applicationsettings.h"
#include "blackcore/weathermanager.h"
#include "blackcore/network.h"
#include "blackmisc/aviation/airportlist.h"
#include "blackmisc/identifier.h"
#include "blackmisc/network/textmessagelist.h"