From b408c8ffedc9af5a976a9b33cd40b4f33e5e2424 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 15 Sep 2019 14:51:43 +0200 Subject: [PATCH] Style --- src/blackgui/components/interpolationlogdisplay.h | 2 +- src/blackmisc/simulation/simulatedaircraftlist.h | 2 +- src/plugins/simulator/fs9/lobbyclient.h | 8 ++++---- src/plugins/simulator/fs9/simulatorfs9.cpp | 3 +-- src/plugins/simulator/fs9/simulatorfs9.h | 10 +++++----- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/blackgui/components/interpolationlogdisplay.h b/src/blackgui/components/interpolationlogdisplay.h index 4935b68a9..a7c92972c 100644 --- a/src/blackgui/components/interpolationlogdisplay.h +++ b/src/blackgui/components/interpolationlogdisplay.h @@ -166,7 +166,7 @@ namespace BlackGui BlackMisc::Aviation::CAircraftSituationList m_lastInterpolations; //!< list of last interpolations BlackMisc::Aviation::CCallsign m_callsign; //!< current callsign int m_elvRequested = 0; //!< counted via signal - int m_elvReceived = 0; //!< counted via signal + int m_elvReceived = 0; //!< counted via signal static const QString &startText(); static const QString &stopText(); diff --git a/src/blackmisc/simulation/simulatedaircraftlist.h b/src/blackmisc/simulation/simulatedaircraftlist.h index 3b55b8b89..55ea6a91b 100644 --- a/src/blackmisc/simulation/simulatedaircraftlist.h +++ b/src/blackmisc/simulation/simulatedaircraftlist.h @@ -96,7 +96,7 @@ namespace BlackMisc //! Set aircraft parts and mark as synchronized int setAircraftPartsSynchronized(const Aviation::CCallsign &callsign, const Aviation::CAircraftParts &parts, bool onlyFirst = true); - //! Set aircraft parts + //! Set aircraft situation int setAircraftSituation(const Aviation::CCallsign &callsign, const Aviation::CAircraftSituation &situation, bool onlyFirst = true); //! Set ground elevation diff --git a/src/plugins/simulator/fs9/lobbyclient.h b/src/plugins/simulator/fs9/lobbyclient.h index 8cc58a9bf..528b98b9f 100644 --- a/src/plugins/simulator/fs9/lobbyclient.h +++ b/src/plugins/simulator/fs9/lobbyclient.h @@ -22,7 +22,7 @@ namespace BlackSimPlugin CLobbyClient(QObject *parent = nullptr); //! Destructor - virtual ~CLobbyClient(); + virtual ~CLobbyClient() override; //! Initialize DirectPlay HRESULT initDirectPlay(); @@ -45,9 +45,9 @@ namespace BlackSimPlugin //! DirectPlay message handler HRESULT directPlayLobbyMessageHandler(DWORD messageId, void *msgBuffer); - IDirectPlay8Peer *m_directPlayPeer = nullptr; //!< DirectPlay peer address - IDirectPlay8Address *m_deviceAddress = nullptr; //!< DirectPlay device address - IDirectPlay8Address *m_hostAddress = nullptr; //!< DirectPlay device address + IDirectPlay8Peer *m_directPlayPeer = nullptr; //!< DirectPlay peer address + IDirectPlay8Address *m_deviceAddress = nullptr; //!< DirectPlay device address + IDirectPlay8Address *m_hostAddress = nullptr; //!< DirectPlay device address IDirectPlay8LobbyClient *m_dpLobbyClient = nullptr; QString m_hostname = "localhost"; diff --git a/src/plugins/simulator/fs9/simulatorfs9.cpp b/src/plugins/simulator/fs9/simulatorfs9.cpp index a9adb474a..78a2d9f70 100644 --- a/src/plugins/simulator/fs9/simulatorfs9.cpp +++ b/src/plugins/simulator/fs9/simulatorfs9.cpp @@ -40,8 +40,6 @@ namespace BlackSimPlugin { CAircraftSituation aircraftSituationFromFS9(const MPPositionVelocity &positionVelocity) { - CAircraftSituation situation; - double dHigh = positionVelocity.lat_i; double dLow = positionVelocity.lat_f; @@ -78,6 +76,7 @@ namespace BlackSimPlugin dLow = dLow / 65536.0; + CAircraftSituation situation; situation.setPosition(position); situation.setAltitude(CAltitude(dHigh + dLow, CAltitude::MeanSeaLevel, CLengthUnit::m())); const double groundSpeed = positionVelocity.ground_velocity / 65536.0; diff --git a/src/plugins/simulator/fs9/simulatorfs9.h b/src/plugins/simulator/fs9/simulatorfs9.h index e03ba727d..df63546ab 100644 --- a/src/plugins/simulator/fs9/simulatorfs9.h +++ b/src/plugins/simulator/fs9/simulatorfs9.h @@ -141,9 +141,9 @@ namespace BlackSimPlugin //! Check connection to FS9 bool checkConnection(bool canLobbyConnect); - QTimer *m_timer = nullptr; + QTimer *m_timer = nullptr; bool m_isConnecting = false; - bool m_isStarted = false; + bool m_isStarted = false; QSharedPointer m_fs9Host; QSharedPointer m_lobbyClient; }; @@ -165,10 +165,10 @@ namespace BlackSimPlugin //! \copydoc BlackCore::ISimulatorFactory::create virtual BlackCore::ISimulator *create( const BlackMisc::Simulation::CSimulatorPluginInfo &info, - BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, + BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider, BlackMisc::Simulation::IRemoteAircraftProvider *remoteAircraftProvider, - BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, - BlackMisc::Network::IClientProvider *clientProvider + BlackMisc::Weather::IWeatherGridProvider *weatherGridProvider, + BlackMisc::Network::IClientProvider *clientProvider ) override; //! \copydoc BlackCore::ISimulatorFactory::createListener