From 8845d1d35c136170ee002f2113c98651d0c99e8e Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 26 Jul 2019 17:08:33 +0200 Subject: [PATCH] Ref T709, style --- src/plugins/simulator/xplane/simulatorxplane.h | 6 +++--- src/xswiftbus/dbusserver.cpp | 3 +-- src/xswiftbus/dbusserver.h | 6 ++---- src/xswiftbus/traffic.cpp | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/plugins/simulator/xplane/simulatorxplane.h b/src/plugins/simulator/xplane/simulatorxplane.h index ef414d704..1bd588a7a 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.h +++ b/src/plugins/simulator/xplane/simulatorxplane.h @@ -235,7 +235,7 @@ namespace BlackSimPlugin BlackMisc::CSetting m_xSwiftBusServerSettings { this, &CSimulatorXPlane::onXSwiftBusSettingsChanged }; static constexpr qint64 TimeoutAdding = 10000; QDBusConnection m_dBusConnection { "default" }; - QDBusServiceWatcher *m_watcher { nullptr }; + QDBusServiceWatcher *m_watcher { nullptr }; CXSwiftBusServiceProxy *m_serviceProxy { nullptr }; CXSwiftBusTrafficProxy *m_trafficProxy { nullptr }; CXSwiftBusWeatherProxy *m_weatherProxy { nullptr }; @@ -310,8 +310,8 @@ namespace BlackSimPlugin virtual BlackCore::ISimulator *create(const BlackMisc::Simulation::CSimulatorPluginInfo &info, BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, - BlackMisc::Network::IClientProvider *clientProvider) override; + BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, + BlackMisc::Network::IClientProvider *clientProvider) override; //! \copydoc BlackCore::ISimulatorFactory::createListener virtual BlackCore::ISimulatorListener *createListener(const BlackMisc::Simulation::CSimulatorPluginInfo &info) override { return new CSimulatorXPlaneListener(info); } diff --git a/src/xswiftbus/dbusserver.cpp b/src/xswiftbus/dbusserver.cpp index 7db38828a..306d7699e 100644 --- a/src/xswiftbus/dbusserver.cpp +++ b/src/xswiftbus/dbusserver.cpp @@ -18,7 +18,6 @@ namespace XSwiftBus { - CDBusServer::CDBusServer() { dbus_threads_init_default(); @@ -78,6 +77,7 @@ namespace XSwiftBus void CDBusServer::onNewConnection(DBusServer *, DBusConnection *conn) { + // called by listener and the DBus connection for xSwiftBus afterwards INFO_LOG("onNewConnection"); auto dbusConnection = std::make_shared(conn); m_newConnectionFunc(dbusConnection); @@ -88,5 +88,4 @@ namespace XSwiftBus auto *obj = static_cast(data); obj->onNewConnection(server, conn); } - } diff --git a/src/xswiftbus/dbusserver.h b/src/xswiftbus/dbusserver.h index c0c503e81..e9f9bd5f7 100644 --- a/src/xswiftbus/dbusserver.h +++ b/src/xswiftbus/dbusserver.h @@ -24,7 +24,6 @@ namespace XSwiftBus { - class CDBusObject; //! DBus connection @@ -38,7 +37,7 @@ namespace XSwiftBus CDBusServer(); //! Destructor - ~CDBusServer() override; + virtual ~CDBusServer() override; //! Set the dispatcher void setDispatcher(CDBusDispatcher *dispatcher); @@ -77,7 +76,6 @@ namespace XSwiftBus CDBusError m_lastError; NewConnectionFunc m_newConnectionFunc; }; - -} +} // ns #endif // guard diff --git a/src/xswiftbus/traffic.cpp b/src/xswiftbus/traffic.cpp index c5c53e22f..0aa450007 100644 --- a/src/xswiftbus/traffic.cpp +++ b/src/xswiftbus/traffic.cpp @@ -919,7 +919,7 @@ namespace XSwiftBus cameraPosition->x = static_cast(lx + traffic->m_deltaCameraPosition.dx); cameraPosition->y = static_cast(ly + traffic->m_deltaCameraPosition.dy); cameraPosition->z = static_cast(lz + traffic->m_deltaCameraPosition.dz); - cameraPosition->pitch = static_cast(traffic->m_deltaCameraPosition.pitch); + cameraPosition->pitch = static_cast(traffic->m_deltaCameraPosition.pitch); cameraPosition->heading = static_cast(traffic->m_deltaCameraPosition.heading); cameraPosition->roll = 0.0; }