From 51ce3778b669c935128f26809b9f18640bc2e876 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 17 Aug 2019 15:29:05 +0200 Subject: [PATCH] FS9 style --- src/plugins/simulator/fs9/directplaypeer.h | 6 ++-- src/plugins/simulator/fs9/fs9host.cpp | 40 +++++++++++----------- src/plugins/simulator/fs9/fs9host.h | 8 ++--- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/plugins/simulator/fs9/directplaypeer.h b/src/plugins/simulator/fs9/directplaypeer.h index 564d0a2b0..5ce6e7f2d 100644 --- a/src/plugins/simulator/fs9/directplaypeer.h +++ b/src/plugins/simulator/fs9/directplaypeer.h @@ -38,7 +38,7 @@ namespace BlackSimPlugin CDirectPlayPeer(QObject *parent, const BlackMisc::Aviation::CCallsign &callsign); //! Destructor - virtual ~CDirectPlayPeer(); + virtual ~CDirectPlayPeer() override; //! Returns users DirectPlay ID DPNID getPlayerUserId() const { return m_playerUser; } @@ -78,8 +78,8 @@ namespace BlackSimPlugin const BlackMisc::Aviation::CCallsign m_callsign; //!< Peer callsign - IDirectPlay8Peer *m_directPlayPeer = nullptr; //!< DirectPlay peer address - IDirectPlay8Address *m_deviceAddress = nullptr; //!< DirectPlay device address + IDirectPlay8Peer *m_directPlayPeer = nullptr; //!< DirectPlay peer address + IDirectPlay8Address *m_deviceAddress = nullptr; //!< DirectPlay device address QList m_hostNodeList; //!< List of enumerated hosts quint32 m_packetIndex = 0; //!< Multiplayer packet index diff --git a/src/plugins/simulator/fs9/fs9host.cpp b/src/plugins/simulator/fs9/fs9host.cpp index afaaf8a71..5609fa2b2 100644 --- a/src/plugins/simulator/fs9/fs9host.cpp +++ b/src/plugins/simulator/fs9/fs9host.cpp @@ -45,11 +45,11 @@ namespace BlackSimPlugin DWORD dwNumAddresses = 0; HRESULT hr; - QVector addresses(dwNumAddresses); + QVector addresses(static_cast(dwNumAddresses)); m_directPlayPeer->GetLocalHostAddresses(addresses.data(), &dwNumAddresses, 0); - addresses.resize(dwNumAddresses); - ZeroMemory( addresses.data(), dwNumAddresses * sizeof(LPDIRECTPLAY8ADDRESS) ); - if (FAILED (hr = m_directPlayPeer->GetLocalHostAddresses(addresses.data(), &dwNumAddresses, 0))) + addresses.resize(static_cast(dwNumAddresses)); + ZeroMemory(addresses.data(), dwNumAddresses * sizeof(LPDIRECTPLAY8ADDRESS)); + if (FAILED(hr = m_directPlayPeer->GetLocalHostAddresses(addresses.data(), &dwNumAddresses, 0))) { logDirectPlayError(hr); return address; @@ -62,7 +62,7 @@ namespace BlackSimPlugin for (uint ii = 0; ii < dwNumAddresses; ++ii) { - LPDIRECTPLAY8ADDRESS pAddress = addresses[ii]; + LPDIRECTPLAY8ADDRESS pAddress = addresses[static_cast(ii)]; SafeRelease(pAddress); } } @@ -90,8 +90,8 @@ namespace BlackSimPlugin DPN_APPLICATION_DESC dpAppDesc; - QScopedArrayPointer wszSession(new wchar_t[session.size() + 1]); - QScopedArrayPointer wszPlayername(new wchar_t[callsign.size() + 1]); + QScopedArrayPointer wszSession(new wchar_t[static_cast(session.size()) + 1]); + QScopedArrayPointer wszPlayername(new wchar_t[static_cast(callsign.size()) + 1]); session.toWCharArray(wszSession.data()); wszSession[session.size()] = 0; @@ -125,12 +125,12 @@ namespace BlackSimPlugin dpAppDesc.pwszSessionName = wszSession.data(); // We are now ready to host the app - if (FAILED(hr = m_directPlayPeer->Host(&dpAppDesc, // AppDesc - &m_deviceAddress, 1, // Device Address + if (FAILED(hr = m_directPlayPeer->Host(&dpAppDesc, // AppDesc + &m_deviceAddress, 1, // Device Address nullptr, - nullptr, // Reserved - nullptr, // Player Context - 0))) // dwFlags + nullptr, // Reserved + nullptr, // Player Context + 0))) // dwFlags { logDirectPlayError(hr); return hr; @@ -143,17 +143,17 @@ namespace BlackSimPlugin // Enumerate the number of stalled DirectPlay peers DWORD dwNumPlayers = 0; - hr = m_directPlayPeer->EnumPlayersAndGroups( nullptr, &dwNumPlayers, DPNENUM_PLAYERS ); + hr = m_directPlayPeer->EnumPlayersAndGroups(nullptr, &dwNumPlayers, DPNENUM_PLAYERS); - if(hr == DPNERR_BUFFERTOOSMALL) + if (hr == DPNERR_BUFFERTOOSMALL) { QScopedArrayPointer stalledPeers(new DPNID[dwNumPlayers]); - hr = m_directPlayPeer->EnumPlayersAndGroups( stalledPeers.data(), &dwNumPlayers, DPNENUM_PLAYERS ); + hr = m_directPlayPeer->EnumPlayersAndGroups(stalledPeers.data(), &dwNumPlayers, DPNENUM_PLAYERS); // Destroy all stalled peers for (DWORD i = 0; i < dwNumPlayers; ++i) { - m_directPlayPeer->DestroyPeer(stalledPeers[i], nullptr, 0, 0); + m_directPlayPeer->DestroyPeer(stalledPeers[static_cast(i)], nullptr, 0, 0); } } @@ -182,17 +182,17 @@ namespace BlackSimPlugin // Enumerate the number of stalled DirectPlay peers DWORD dwNumPlayers = 0; - hr = m_directPlayPeer->EnumPlayersAndGroups( nullptr, &dwNumPlayers, DPNENUM_PLAYERS ); + hr = m_directPlayPeer->EnumPlayersAndGroups(nullptr, &dwNumPlayers, DPNENUM_PLAYERS); - if(hr == DPNERR_BUFFERTOOSMALL) + if (hr == DPNERR_BUFFERTOOSMALL) { QScopedArrayPointer stalledPeers(new DPNID[dwNumPlayers]); - hr = m_directPlayPeer->EnumPlayersAndGroups( stalledPeers.data(), &dwNumPlayers, DPNENUM_PLAYERS ); + hr = m_directPlayPeer->EnumPlayersAndGroups(stalledPeers.data(), &dwNumPlayers, DPNENUM_PLAYERS); // Destroy all stalled peers for (DWORD i = 0; i < dwNumPlayers; ++i) { - m_directPlayPeer->DestroyPeer(stalledPeers[i], nullptr, 0, 0); + m_directPlayPeer->DestroyPeer(stalledPeers[static_cast(i)], nullptr, 0, 0); } } diff --git a/src/plugins/simulator/fs9/fs9host.h b/src/plugins/simulator/fs9/fs9host.h index 6462b2c2a..aba137316 100644 --- a/src/plugins/simulator/fs9/fs9host.h +++ b/src/plugins/simulator/fs9/fs9host.h @@ -34,7 +34,7 @@ namespace BlackSimPlugin CFs9Host(QObject *owner); //! Destructor - virtual ~CFs9Host(); + virtual ~CFs9Host() override; //! Returns true if the users simulator is connected bool isConnected() const { return m_playerUser != 0; } @@ -59,9 +59,9 @@ namespace BlackSimPlugin HostStatus m_hostStatus = Terminated; }; - } -} + } // ns +} // ns Q_DECLARE_METATYPE(BlackSimPlugin::Fs9::CFs9Host::HostStatus) -#endif // DIRECTPLAY_HOST_H +#endif // guard