flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 23:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace callsign type QString with CCallsign

Browse Source
This commit is contained in:
Roland Winklmeier
2015-05-18 23:02:47 +02:00
parent 0d21f70d3b
commit c8a035f49a
6 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/simulator/fs9/directplay_peer.cpp
View File

@@ -24,8 +24,8 @@ namespace BlackSimPlugin
{
namespace Fs9
{
CDirectPlayPeer::CDirectPlayPeer(QObject *owner, const QString &callsign)
: CContinuousWorker(owner, "peer_" + callsign),
CDirectPlayPeer::CDirectPlayPeer(QObject *owner, const BlackMisc::Aviation::CCallsign &callsign)
: CContinuousWorker(owner, "peer_" + callsign.toQString()),
m_callsign(callsign),
m_mutexHostList(QMutex::Recursive),
m_callbackWrapper(this, &CDirectPlayPeer::directPlayMessageHandler)

5
src/plugins/simulator/fs9/directplay_peer.h
View File

@@ -14,6 +14,7 @@
#include "host_node.h"
#include "callback_wrapper.h"
#include "blackmisc/worker.h"
#include "blackmisc/aviation/callsign.h"
#include <QObject>
#include <QList>
#include <QMutex>
@@ -33,7 +34,7 @@ namespace BlackSimPlugin
public:
//! Constructor
CDirectPlayPeer(QObject *owner, const QString &callsign);
CDirectPlayPeer(QObject *owner, const BlackMisc::Aviation::CCallsign &callsign);
//! Destructor
virtual ~CDirectPlayPeer();
@@ -71,7 +72,7 @@ namespace BlackSimPlugin
//! Creates a new DirectPlay device address
HRESULT createHostAddress();
QString m_callsign; //!< Peer callsign
BlackMisc::Aviation::CCallsign m_callsign; //!< Peer callsign
IDirectPlay8Peer *m_directPlayPeer = nullptr; //!< DirectPlay peer address
IDirectPlay8Address *m_deviceAddress = nullptr; //!< DirectPlay device address

10
src/plugins/simulator/fs9/fs9_client.cpp
View File

@@ -29,7 +29,7 @@ namespace BlackSimPlugin
namespace Fs9
{
CFs9Client::CFs9Client(
BlackCore::IInterpolator *interpolator, QObject *owner, const QString &callsign, const CTime &updateInterval) :
BlackCore::IInterpolator *interpolator, QObject *owner, const BlackMisc::Aviation::CCallsign &callsign, const CTime &updateInterval) :
CDirectPlayPeer(owner, callsign),
m_updateInterval(updateInterval), m_interpolator(interpolator)
{
@@ -170,7 +170,7 @@ namespace BlackSimPlugin
return hr;
}
HRESULT CFs9Client::connectToSession(const QString &callsign)
HRESULT CFs9Client::connectToSession(const CCallsign &callsign)
{
HRESULT hr = S_OK;
@@ -178,10 +178,10 @@ namespace BlackSimPlugin
QMutexLocker locker(&m_mutexHostList);
QScopedArrayPointer<wchar_t> wszPlayername(new wchar_t[callsign.size() + 1]);
QScopedArrayPointer<wchar_t> wszPlayername(new wchar_t[callsign.toQString().size() + 1]);
callsign.toWCharArray(wszPlayername.data());
wszPlayername[callsign.size()] = 0;
callsign.toQString().toWCharArray(wszPlayername.data());
wszPlayername[callsign.toQString().size()] = 0;
ZeroMemory(&m_playerInfo, sizeof(PLAYER_INFO_STRUCT));
strcpy(m_playerInfo.szAircraft, "Boeing 737-400 Paint1");

7
src/plugins/simulator/fs9/fs9_client.h
View File

@@ -14,6 +14,7 @@
#include "blackcore/interpolator.h"
#include "blackmisc/aviation/aircraftsituation.h"
#include "blackmisc/pq/time.h"
#include "blackmisc/aviation/callsign.h"
#include <QMutex>
#include <QScopedPointer>
@@ -38,7 +39,7 @@ namespace BlackSimPlugin
};
//! Constructor
CFs9Client(BlackCore::IInterpolator *interpolator, QObject *owner, const QString &callsign, const BlackMisc::PhysicalQuantities::CTime &updateInterval);
CFs9Client(BlackCore::IInterpolator *interpolator, QObject *owner, const BlackMisc::Aviation::CCallsign &callsign, const BlackMisc::PhysicalQuantities::CTime &updateInterval);
//! Destructor
virtual ~CFs9Client();
@@ -55,7 +56,7 @@ namespace BlackSimPlugin
signals:
//! Client status changed
void statusChanged(const QString &callsign, BlackSimPlugin::Fs9::CFs9Client::ClientStatus);
void statusChanged(const BlackMisc::Aviation::CCallsign &callsign, BlackSimPlugin::Fs9::CFs9Client::ClientStatus);
protected slots:
//! Timer event slot
@@ -79,7 +80,7 @@ namespace BlackSimPlugin
HRESULT createHostAddress();
//! Start hosting session
HRESULT connectToSession(const QString &playername);
HRESULT connectToSession(const BlackMisc::Aviation::CCallsign &callsign);
HRESULT closeConnection();

2
src/plugins/simulator/fs9/fs9_host.cpp
View File

@@ -80,7 +80,7 @@ namespace BlackSimPlugin
{
initDirectPlay();
createHostAddress();
startHosting(CProject::systemNameAndVersion(), m_callsign);
startHosting(CProject::systemNameAndVersion(), m_callsign.toQString());
}
void CFs9Host::cleanup()

2
src/plugins/simulator/fs9/simulator_fs9.cpp
View File

@@ -103,7 +103,7 @@ namespace BlackSimPlugin
this->physicallyRemoveRemoteAircraft(callsign);
}
CFs9Client *client = new CFs9Client(m_interpolator, this, callsign.toQString(), CTime(25, CTimeUnit::ms()));
CFs9Client *client = new CFs9Client(m_interpolator, this, callsign, CTime(25, CTimeUnit::ms()));
client->setHostAddress(fs9Host->getHostAddress());
client->setPlayerUserId(fs9Host->getPlayerUserId());