flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-30 11:55:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #395, refs #413, refs #403 Post merge tasks

Browse Source 
* missing exports for new classes
* public non virtual convertToQString, propertyByIndex
* removed left-over of watchdog
* virtual destructor for avionicsbase.h
This commit is contained in:
Klaus Basan
2015-05-07 03:21:45 +02:00
committed by Mathew Sutcliffe
parent e7f65ba0b6
commit f18cfed087
16 changed files with 47 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackmisc/simulation/airspaceaircraftsnapshot.h
View File

@@ -12,6 +12,7 @@
#ifndef BLACKMISC_SIMULATION_AIRSPACEAIRCRAFTANALYZER_H
#define BLACKMISC_SIMULATION_AIRSPACEAIRCRAFTANALYZER_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/simulation/simulatedaircraftlist.h"
#include "blackmisc/aviation/callsignset.h"
#include "blackmisc/propertyindex.h"
@@ -22,7 +23,7 @@ namespace BlackMisc
namespace Simulation
{
//! Current situation in the sky analyzed.
class CAirspaceAircraftSnapshot : public CValueObject<CAirspaceAircraftSnapshot>
class BLACKMISC_EXPORT CAirspaceAircraftSnapshot : public CValueObject<CAirspaceAircraftSnapshot>
{
public:
//! Default constructor
@@ -74,14 +75,13 @@ namespace BlackMisc
bool isRenderingEnabled() const { return m_renderingEnabled; }
//! \copydoc CValueObject::propertyByIndex
virtual CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
CVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const;
//! \copydoc CValueObject::setPropertyByIndex
virtual void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index) override;
void setPropertyByIndex(const CVariant &variant, const BlackMisc::CPropertyIndex &index);
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAirspaceAircraftSnapshot)

4
src/blackmisc/simulation/ownaircraftprovider.h
View File

@@ -21,7 +21,7 @@ namespace BlackMisc
{
//! Direct threadsafe in memory access to own aircraft
class IOwnAircraftProvider
class BLACKMISC_EXPORT IOwnAircraftProvider
{
public:
@@ -83,7 +83,7 @@ namespace BlackMisc
};
//! Delegating class which can be directly used to access an \sa IOwnAircraftProvider instance
class COwnAircraftAware
class BLACKMISC_EXPORT COwnAircraftAware
{
public:
//! \copydoc IOwnAircraftProvider::getOwnAircraft

3
src/blackmisc/simulation/ownaircraftproviderdummy.h
View File

@@ -12,6 +12,7 @@
#ifndef BLACKMISC_SIMULATION_OWNAIRCRAFTPROVIDERDUMMY_H
#define BLACKMISC_SIMULATION_OWNAIRCRAFTPROVIDERDUMMY_H
#include "blackmisc/blackmiscexport.h"
#include "blackmisc/simulation/ownaircraftprovider.h"
namespace BlackMisc
@@ -19,7 +20,7 @@ namespace BlackMisc
namespace Simulation
{
//! For testing, thread safety not implemented in this class
class COwnAircraftProviderDummy :
class BLACKMISC_EXPORT COwnAircraftProviderDummy :
public QObject,
public IOwnAircraftProvider
{

2
src/blackmisc/simulation/remoteaircraftprovider.h
View File

@@ -109,7 +109,7 @@ namespace BlackMisc
};
//! Class which can be directly used to access an \sa IRemoteAircraftProvider object
class CRemoteAircraftAware
class BLACKMISC_EXPORT CRemoteAircraftAware
{
public:
//! \copydoc IRemoteAircraftProvider::getAircraftInRange