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

Formatting

Browse Source
This commit is contained in:
Klaus Basan
2018-03-12 18:04:34 +01:00
parent 4b7237ce1b
commit 55534cbb09
12 changed files with 33 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/blackcore/network.h
View File

@@ -66,9 +66,7 @@ namespace BlackCore
Q_OBJECT
protected:
/*!
* Constructor
*/
//! Constructor
INetwork(
BlackMisc::Network::IClientProvider *clientProvider,
BlackMisc::Simulation::IOwnAircraftProvider *ownAircraftProvider,
@@ -78,30 +76,22 @@ namespace BlackCore
BlackMisc::Simulation::COwnAircraftAware(ownAircraftProvider) {}
public:
/*!
* Destructor.
*/
//! Destructor
virtual ~INetwork() {}
/*!
* Underlying library info.
*/
//! Underlying library info.
virtual const QString &getLibraryInfo(bool detailed) const = 0;
/*!
* Flags for capabilities bitfield.
*/
enum
{
AcceptsAtisResponses = 1 << 0,
SupportsInterimPosUpdates = 1 << 1,
SupportsIcaoCodes = 1 << 2,
SupportsAircraftConfigs = 1 << 3
};
//! Flags for capabilities bitfield
// enum Capability
// {
// AcceptsAtisResponses = 1 << 0,
// SupportsInterimPosUpdates = 1 << 1,
// SupportsIcaoCodes = 1 << 2,
// SupportsAircraftConfigs = 1 << 3
// };
/*!
* Login modes
*/
//! Login modes
enum LoginMode
{
LoginNormal = 0, //!< Normal login
@@ -109,9 +99,7 @@ namespace BlackCore
LoginStealth //!< Login stealth mode
};
/*!
* Status of the connection.
*/
//! Status of the connection.
enum ConnectionStatus
{
Disconnected = 0, //!< Not connected
@@ -124,9 +112,7 @@ namespace BlackCore
};
Q_ENUM(ConnectionStatus)
/*!
* Convert a ConnectionStatus to a string.
*/
//! Convert a ConnectionStatus to a string.
static QString connectionStatusToString(ConnectionStatus status)
{
const int index = staticMetaObject.indexOfEnumerator("ConnectionStatus");

1
src/blackcore/weatherdata.h
View File

@@ -15,7 +15,6 @@
#include "blackcore/blackcoreexport.h"
#include "blackmisc/pq/length.h"
#include "blackmisc/weather/weathergrid.h"
#include <QObject>
namespace BlackCore

2
src/blackgui/components/settingsvatsimreaderscomponent.h
View File

@@ -34,7 +34,7 @@ namespace BlackGui
explicit CSettingsVatsimReadersComponent(QWidget *parent = nullptr);
//! Destructor
~CSettingsVatsimReadersComponent();
virtual ~CSettingsVatsimReadersComponent();
private slots:
void ps_settingsChanged();

2
src/blackgui/guiactionbind.cpp
View File

@@ -90,7 +90,7 @@ namespace BlackGui
Q_ASSERT_X(CInputManager::instance(), Q_FUNC_INFO, "Missing input manager");
if (this->hasTarget())
{
CInputManager::instance()->unbind(this->m_index);
CInputManager::instance()->unbind(m_index);
}
this->reset();
}

4
src/blackgui/models/countrylistmodel.h
View File

@@ -9,8 +9,8 @@
//! \file
#ifndef BLACKGUI_COUNTRYLISTMODEL_H
#define BLACKGUI_COUNTRYLISTMODEL_H
#ifndef BLACKGUI_MODELS_COUNTRYLISTMODEL_H
#define BLACKGUI_MODELS_COUNTRYLISTMODEL_H
#include "blackgui/blackguiexport.h"
#include "blackgui/models/listmodeldbobjects.h"

4
src/blackgui/views/countryview.cpp
View File

@@ -21,5 +21,5 @@ namespace BlackGui
this->standardInit(new CCountryListModel(this));
this->setMenu(MenuDefaultDbViews);
}
}
} // namespace
} // ns
} // ns

9
src/blackgui/views/countryview.h
View File

@@ -9,8 +9,8 @@
//! \file
#ifndef BLACKGUI_COUNTRYVIEW_H
#define BLACKGUI_COUNTRYVIEW_H
#ifndef BLACKGUI_VIEWS_COUNTRYVIEW_H
#define BLACKGUI_VIEWS_COUNTRYVIEW_H
#include "blackgui/blackguiexport.h"
#include "blackgui/models/countrylistmodel.h"
@@ -20,7 +20,6 @@
class QWidget;
namespace BlackMisc { class CCountry; }
namespace BlackGui
{
namespace Views
@@ -32,6 +31,6 @@ namespace BlackGui
//! Constructor
explicit CCountryView(QWidget *parent = nullptr);
};
}
}
} // ns
} // ns
#endif // guard

6
src/blackmisc/aviation/atcstationlist.h
View File

@@ -32,9 +32,9 @@ namespace BlackMisc
//! Value object for a list of ATC stations.
class BLACKMISC_EXPORT CAtcStationList :
public CSequence<CAtcStation>,
public BlackMisc::Aviation::ICallsignObjectList<CAtcStation, CAtcStationList>,
public BlackMisc::Geo::IGeoObjectWithRelativePositionList<CAtcStation, CAtcStationList>,
public BlackMisc::Mixin::MetaType<CAtcStationList>
public Aviation::ICallsignObjectList<CAtcStation, CAtcStationList>,
public Geo::IGeoObjectWithRelativePositionList<CAtcStation, CAtcStationList>,
public Mixin::MetaType<CAtcStationList>
{
public:
BLACKMISC_DECLARE_USING_MIXIN_METATYPE(CAtcStationList)

2
src/blackmisc/aviation/callsignobjectlist.cpp
View File

@@ -101,7 +101,7 @@ namespace BlackMisc
{
CONTAINER r;
if (suffix.isEmpty()) { return r; }
QString sfxUpper(suffix.trimmed().toUpper());
const QString sfxUpper(suffix.trimmed().toUpper());
r = this->container().findBy([ = ](const OBJ & csObj)
{
return (csObj.getCallsign().getSuffix() == sfxUpper);

2
src/blackmisc/connectionguard.cpp
View File

@@ -29,7 +29,7 @@ namespace BlackMisc
CConnectionGuard::~CConnectionGuard()
{
disconnectAll();
this->disconnectAll();
}
int CConnectionGuard::disconnectAll()

5
src/plugins/simulator/fs9/directplaypeer.cpp
View File

@@ -20,6 +20,7 @@
#include <QMutexLocker>
using namespace BlackMisc;
using namespace BlackMisc::Aviation;
namespace BlackSimPlugin
{
@@ -31,7 +32,7 @@ namespace BlackSimPlugin
return cats;
}
CDirectPlayPeer::CDirectPlayPeer(QObject *owner, const BlackMisc::Aviation::CCallsign &callsign)
CDirectPlayPeer::CDirectPlayPeer(QObject *owner, const CCallsign &callsign)
: CContinuousWorker(owner, "peer_" + callsign.toQString()),
m_callsign(callsign),
m_mutexHostList(QMutex::Recursive),
@@ -103,7 +104,7 @@ namespace BlackSimPlugin
// Proceeed only, if the sender is our local player
if (pReceiveMsg->dpnidSender == m_playerUser)
{
QByteArray messageData = QByteArray((char *)pReceiveMsg->pReceiveData, pReceiveMsg->dwReceiveDataSize);
const QByteArray messageData = QByteArray((char *)pReceiveMsg->pReceiveData, pReceiveMsg->dwReceiveDataSize);
emit customPacketReceived(messageData);
}
break;

2
src/plugins/simulator/fs9/directplaypeer.h
View File

@@ -78,7 +78,7 @@ namespace BlackSimPlugin
//! Creates a new DirectPlay device address
HRESULT createHostAddress();
BlackMisc::Aviation::CCallsign m_callsign; //!< Peer callsign
const BlackMisc::Aviation::CCallsign m_callsign; //!< Peer callsign
IDirectPlay8Peer *m_directPlayPeer = nullptr; //!< DirectPlay peer address
IDirectPlay8Address *m_deviceAddress = nullptr; //!< DirectPlay device address