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

Ref T709, style

Browse Source
This commit is contained in:
Klaus Basan
2019-07-26 17:08:33 +02:00
committed by Mat Sutcliffe
parent f2bf038501
commit a5cefcf18c
4 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/simulator/xplane/simulatorxplane.h
View File

@@ -235,7 +235,7 @@ namespace BlackSimPlugin
BlackMisc::CSetting<BlackMisc::Simulation::Settings::TXSwiftBusSettings> m_xSwiftBusServerSettings { this, &CSimulatorXPlane::onXSwiftBusSettingsChanged }; BlackMisc::CSetting<BlackMisc::Simulation::Settings::TXSwiftBusSettings> m_xSwiftBusServerSettings { this, &CSimulatorXPlane::onXSwiftBusSettingsChanged };
static constexpr qint64 TimeoutAdding = 10000; static constexpr qint64 TimeoutAdding = 10000;
QDBusConnection m_dBusConnection { "default" }; QDBusConnection m_dBusConnection { "default" };
QDBusServiceWatcher *m_watcher { nullptr }; QDBusServiceWatcher *m_watcher { nullptr };
CXSwiftBusServiceProxy *m_serviceProxy { nullptr }; CXSwiftBusServiceProxy *m_serviceProxy { nullptr };
CXSwiftBusTrafficProxy *m_trafficProxy { nullptr }; CXSwiftBusTrafficProxy *m_trafficProxy { nullptr };
CXSwiftBusWeatherProxy *m_weatherProxy { nullptr }; CXSwiftBusWeatherProxy *m_weatherProxy { nullptr };
@@ -310,8 +310,8 @@ namespace BlackSimPlugin
virtual BlackCore::ISimulator *create(const BlackMisc::Simulation::CSimulatorPluginInfo &info, virtual BlackCore::ISimulator *create(const BlackMisc::Simulation::CSimulatorPluginInfo &info,
BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider,
BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider,
BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider,
BlackMisc::Network::IClientProvider *clientProvider) override; BlackMisc::Network::IClientProvider *clientProvider) override;
//! \copydoc BlackCore::ISimulatorFactory::createListener //! \copydoc BlackCore::ISimulatorFactory::createListener
virtual BlackCore::ISimulatorListener *createListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info) override { return new CSimulatorXPlaneListener(info); } virtual BlackCore::ISimulatorListener *createListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info) override { return new CSimulatorXPlaneListener(info); }

3
src/xswiftbus/dbusserver.cpp
View File

@@ -18,7 +18,6 @@
namespace XSwiftBus namespace XSwiftBus
{ {
CDBusServer::CDBusServer() CDBusServer::CDBusServer()
{ {
dbus_threads_init_default(); dbus_threads_init_default();
@@ -78,6 +77,7 @@ namespace XSwiftBus
void CDBusServer::onNewConnection(DBusServer *, DBusConnection *conn) void CDBusServer::onNewConnection(DBusServer *, DBusConnection *conn)
{ {
// called by listener and the DBus connection for xSwiftBus afterwards
INFO_LOG("onNewConnection"); INFO_LOG("onNewConnection");
auto dbusConnection = std::make_shared<CDBusConnection>(conn); auto dbusConnection = std::make_shared<CDBusConnection>(conn);
m_newConnectionFunc(dbusConnection); m_newConnectionFunc(dbusConnection);
@@ -88,5 +88,4 @@ namespace XSwiftBus
auto *obj = static_cast<CDBusServer *>(data); auto *obj = static_cast<CDBusServer *>(data);
obj->onNewConnection(server, conn); obj->onNewConnection(server, conn);
} }
} }

6
src/xswiftbus/dbusserver.h
View File

@@ -24,7 +24,6 @@
namespace XSwiftBus namespace XSwiftBus
{ {
class CDBusObject; class CDBusObject;
//! DBus connection //! DBus connection
@@ -38,7 +37,7 @@ namespace XSwiftBus
CDBusServer(); CDBusServer();
//! Destructor //! Destructor
~CDBusServer() override; virtual ~CDBusServer() override;
//! Set the dispatcher //! Set the dispatcher
void setDispatcher(CDBusDispatcher *dispatcher); void setDispatcher(CDBusDispatcher *dispatcher);
@@ -77,7 +76,6 @@ namespace XSwiftBus
CDBusError m_lastError; CDBusError m_lastError;
NewConnectionFunc m_newConnectionFunc; NewConnectionFunc m_newConnectionFunc;
}; };
} // ns
}
#endif // guard #endif // guard

2
src/xswiftbus/traffic.cpp
View File

@@ -919,7 +919,7 @@ namespace XSwiftBus
cameraPosition->x = static_cast<float>(lx + traffic->m_deltaCameraPosition.dx); cameraPosition->x = static_cast<float>(lx + traffic->m_deltaCameraPosition.dx);
cameraPosition->y = static_cast<float>(ly + traffic->m_deltaCameraPosition.dy); cameraPosition->y = static_cast<float>(ly + traffic->m_deltaCameraPosition.dy);
cameraPosition->z = static_cast<float>(lz + traffic->m_deltaCameraPosition.dz); cameraPosition->z = static_cast<float>(lz + traffic->m_deltaCameraPosition.dz);
cameraPosition->pitch = static_cast<float>(traffic->m_deltaCameraPosition.pitch); cameraPosition->pitch = static_cast<float>(traffic->m_deltaCameraPosition.pitch);
cameraPosition->heading = static_cast<float>(traffic->m_deltaCameraPosition.heading); cameraPosition->heading = static_cast<float>(traffic->m_deltaCameraPosition.heading);
cameraPosition->roll = 0.0; cameraPosition->roll = 0.0;
} }