mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-12 23:35:33 +08:00
Ref T192, formatting and minor tweaks
This commit is contained in:
@@ -14,11 +14,13 @@
|
||||
#include "blackmisc/dbusserver.h"
|
||||
|
||||
using namespace BlackCore;
|
||||
using namespace BlackMisc;
|
||||
|
||||
namespace BlackCore
|
||||
{
|
||||
namespace Context
|
||||
{
|
||||
IContextNetwork *IContextNetwork::create(CCoreFacade *runtime, CCoreFacadeConfig::ContextMode mode, BlackMisc::CDBusServer *server, QDBusConnection &connection)
|
||||
IContextNetwork *IContextNetwork::create(CCoreFacade *runtime, CCoreFacadeConfig::ContextMode mode, CDBusServer *server, QDBusConnection &connection)
|
||||
{
|
||||
switch (mode)
|
||||
{
|
||||
@@ -26,7 +28,7 @@ namespace BlackCore
|
||||
case CCoreFacadeConfig::LocalInDBusServer:
|
||||
return (new CContextNetwork(mode, runtime))->registerWithDBus(server);
|
||||
case CCoreFacadeConfig::Remote:
|
||||
return new CContextNetworkProxy(BlackMisc::CDBusServer::coreServiceName(), connection, mode, runtime);
|
||||
return new CContextNetworkProxy(CDBusServer::coreServiceName(), connection, mode, runtime);
|
||||
case CCoreFacadeConfig::NotUsed:
|
||||
default:
|
||||
return new CContextNetworkEmpty(runtime);
|
||||
|
||||
@@ -40,7 +40,7 @@ namespace BlackCore
|
||||
}
|
||||
}
|
||||
|
||||
const BlackMisc::Aviation::CAircraftSituation &IContextOwnAircraft::getDefaultSituation()
|
||||
const CAircraftSituation &IContextOwnAircraft::getDefaultSituation()
|
||||
{
|
||||
static const CAircraftSituation situation(
|
||||
CCoordinateGeodetic(
|
||||
@@ -52,7 +52,7 @@ namespace BlackCore
|
||||
return situation;
|
||||
}
|
||||
|
||||
BlackMisc::Simulation::CAircraftModel IContextOwnAircraft::getDefaultOwnAircraftModel()
|
||||
CAircraftModel IContextOwnAircraft::getDefaultOwnAircraftModel()
|
||||
{
|
||||
// if all fails
|
||||
static const CAircraftModel defaultModel(
|
||||
|
||||
@@ -75,6 +75,9 @@ namespace BlackCore
|
||||
//! Facade and context shutting down
|
||||
bool isShuttingDown() const { return m_shuttingDown; }
|
||||
|
||||
//! Parse command line in all contexts
|
||||
bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator);
|
||||
|
||||
// ------- Context as interface, normal way to access a context
|
||||
|
||||
//! Context for network
|
||||
@@ -158,10 +161,6 @@ namespace BlackCore
|
||||
//! Register metadata
|
||||
static void registerMetadata();
|
||||
|
||||
public slots:
|
||||
//! Parse command line in all contexts
|
||||
bool parseCommandLine(const QString &commandLine, const BlackMisc::CIdentifier &originator);
|
||||
|
||||
private:
|
||||
bool m_initalized = false; //!< flag if already initialized
|
||||
bool m_shuttingDown = false; //!< flag if shutting down
|
||||
|
||||
Reference in New Issue
Block a user