refs #199 , adjusted context classes

* removed usingLocalObjects() now in CContext
* removed getRuntime() now in CContext
* Constructors no longer public, context can only be obtained via runtime object
* runtime class is friend class
This commit is contained in:
Klaus Basan
2014-04-01 11:48:45 +02:00
parent 0b033fdcac
commit 77fd3bcd70
28 changed files with 161 additions and 290 deletions

View File

@@ -9,15 +9,16 @@
#define BLACKCORE_CONTEXTSIMULATOR_INTERFACENAME "net.vatsim.PilotClient.BlackCore.ContextSimulator"
#define BLACKCORE_CONTEXTSIMULATOR_OBJECTPATH "/Simulator"
#include "context.h"
#include "blackcore/dbus_server.h"
#include "blackcore/coreruntime.h"
#include "blackcore/context_runtime.h"
#include "blackmisc/avaircraft.h"
#include <QObject>
namespace BlackCore
{
//! \brief Network context
class IContextSimulator : public QObject
class IContextSimulator : public CContext
{
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTSIMULATOR_INTERFACENAME)
@@ -38,18 +39,9 @@ namespace BlackCore
return s;
}
//! \brief Constructor
IContextSimulator(QObject *parent = nullptr) : QObject(parent) {}
//! Destructor
virtual ~IContextSimulator() {}
/*!
* \brief Using local objects?
* \return
*/
virtual bool usingLocalObjects() const = 0;
signals:
//! Emitted when the simulator connection changes
void connectionChanged(bool value);
@@ -59,9 +51,14 @@ namespace BlackCore
//! Returns true when simulator is connected and available
virtual bool isConnected() const = 0;
/*!
//! Get user aircraft value object
virtual BlackMisc::Aviation::CAircraft getOwnAircraft() const = 0;
protected:
friend class CRuntime;
//! \brief Constructor
IContextSimulator(CRuntimeConfig::ContextMode mode, CRuntime *runtime) : CContext(mode, runtime) {}
};
} // namespace BlackCore