refs #199, cleaned up contexts a bit after rebasing to current master

* friend CRuntime on top
* fixed some public constructors (made protected)
* Also made registerWithDBus protected
* Fixed some copy/paste issues in getIContextXXX
* Reordered private/public sections
This commit is contained in:
Klaus Basan
2014-04-01 22:16:26 +02:00
parent 6e3b081fd2
commit 679b34c7f4
16 changed files with 123 additions and 125 deletions

View File

@@ -24,7 +24,6 @@ namespace BlackCore
Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTSIMULATOR_INTERFACENAME)
public:
//! \brief Service name
static const QString &InterfaceName()
{
@@ -55,8 +54,6 @@ namespace BlackCore
virtual BlackMisc::Aviation::CAircraft getOwnAircraft() const = 0;
protected:
friend class CRuntime;
//! \brief Constructor
IContextSimulator(CRuntimeConfig::ContextMode mode, CRuntime *runtime) : CContext(mode, runtime) {}
};