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

Ref T167, renaming LocalInDBusServer and verifyModelSet

Browse Source
This commit is contained in:
Klaus Basan
2017-10-10 00:15:50 +01:00
committed by Mathew Sutcliffe
parent 988a4791ab
commit 7a87f986e2
16 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackcore/context/context.h
View File

@@ -50,7 +50,7 @@ namespace BlackCore
//! Using local implementing object?
bool isUsingImplementingObject() const
{
return m_mode == CCoreFacadeConfig::Local || m_mode == CCoreFacadeConfig::LocalInDbusServer;
return m_mode == CCoreFacadeConfig::Local || m_mode == CCoreFacadeConfig::LocalInDBusServer;
}
//! Local or remote object?

2
src/blackcore/context/contextapplication.cpp
View File

@@ -37,7 +37,7 @@ namespace BlackCore
switch (mode)
{
case CCoreFacadeConfig::Local:
case CCoreFacadeConfig::LocalInDbusServer:
case CCoreFacadeConfig::LocalInDBusServer:
return (new CContextApplication(mode, parent))->registerWithDBus(server);
case CCoreFacadeConfig::Remote:
return new CContextApplicationProxy(BlackMisc::CDBusServer::coreServiceName(), connection, mode, parent);

2
src/blackcore/context/contextapplicationimpl.cpp
View File

@@ -34,7 +34,7 @@ namespace BlackCore
CContextApplication *CContextApplication::registerWithDBus(BlackMisc::CDBusServer *server)
{
if (!server || m_mode != CCoreFacadeConfig::LocalInDbusServer) { return this; }
if (!server || m_mode != CCoreFacadeConfig::LocalInDBusServer) { return this; }
server->addObject(IContextApplication::ObjectPath(), this);
return this;
}

2
src/blackcore/context/contextaudio.cpp
View File

@@ -50,7 +50,7 @@ namespace BlackCore
switch (mode)
{
case CCoreFacadeConfig::Local:
case CCoreFacadeConfig::LocalInDbusServer:
case CCoreFacadeConfig::LocalInDBusServer:
return (new CContextAudio(mode, runtime))->registerWithDBus(server);
case CCoreFacadeConfig::Remote:
return new CContextAudioProxy(BlackMisc::CDBusServer::coreServiceName(), conn, mode, runtime);

2
src/blackcore/context/contextaudioimpl.cpp
View File

@@ -94,7 +94,7 @@ namespace BlackCore
CContextAudio *CContextAudio::registerWithDBus(CDBusServer *server)
{
if (!server || m_mode != CCoreFacadeConfig::LocalInDbusServer) { return this; }
if (!server || m_mode != CCoreFacadeConfig::LocalInDBusServer) { return this; }
server->addObject(IContextAudio::ObjectPath(), this);
return this;
}

2
src/blackcore/context/contextnetwork.cpp
View File

@@ -23,7 +23,7 @@ namespace BlackCore
switch (mode)
{
case CCoreFacadeConfig::Local:
case CCoreFacadeConfig::LocalInDbusServer:
case CCoreFacadeConfig::LocalInDBusServer:
return (new CContextNetwork(mode, runtime))->registerWithDBus(server);
case CCoreFacadeConfig::Remote:
return new CContextNetworkProxy(BlackMisc::CDBusServer::coreServiceName(), connection, mode, runtime);

2
src/blackcore/context/contextnetworkimpl.cpp
View File

@@ -94,7 +94,7 @@ namespace BlackCore
CContextNetwork *CContextNetwork::registerWithDBus(BlackMisc::CDBusServer *server)
{
if (!server || m_mode != CCoreFacadeConfig::LocalInDbusServer) return this;
if (!server || m_mode != CCoreFacadeConfig::LocalInDBusServer) return this;
server->addObject(IContextNetwork::ObjectPath(), this);
return this;
}

2
src/blackcore/context/contextownaircraft.cpp
View File

@@ -30,7 +30,7 @@ namespace BlackCore
switch (mode)
{
case CCoreFacadeConfig::Local:
case CCoreFacadeConfig::LocalInDbusServer:
case CCoreFacadeConfig::LocalInDBusServer:
return (new CContextOwnAircraft(mode, parent))->registerWithDBus(server);
case CCoreFacadeConfig::Remote:
return new CContextOwnAircraftProxy(BlackMisc::CDBusServer::coreServiceName(), conn, mode, parent);

2
src/blackcore/context/contextownaircraftimpl.cpp
View File

@@ -73,7 +73,7 @@ namespace BlackCore
CContextOwnAircraft *CContextOwnAircraft::registerWithDBus(CDBusServer *server)
{
if (!server || m_mode != CCoreFacadeConfig::LocalInDbusServer) return this;
if (!server || m_mode != CCoreFacadeConfig::LocalInDBusServer) return this;
server->addObject(IContextOwnAircraft::ObjectPath(), this);
return this;
}

2
src/blackcore/context/contextsimulator.cpp
View File

@@ -45,7 +45,7 @@ namespace BlackCore
switch (mode)
{
case CCoreFacadeConfig::Local:
case CCoreFacadeConfig::LocalInDbusServer:
case CCoreFacadeConfig::LocalInDBusServer:
return (new CContextSimulator(mode, parent))->registerWithDBus(server);
case CCoreFacadeConfig::Remote:
return new CContextSimulatorProxy(BlackMisc::CDBusServer::coreServiceName(), conn, mode, parent);

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

@@ -70,7 +70,7 @@ namespace BlackCore
CContextSimulator *CContextSimulator::registerWithDBus(CDBusServer *server)
{
if (!server || this->m_mode != CCoreFacadeConfig::LocalInDbusServer) return this;
if (!server || this->m_mode != CCoreFacadeConfig::LocalInDBusServer) return this;
server->addObject(CContextSimulator::ObjectPath(), this);
return this;
}