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

@@ -45,9 +45,6 @@ namespace BlackCore
//! Destructor
virtual ~IContextNetwork() {}
//! \brief Using local objects?
virtual bool usingLocalObjects() const = 0;
signals:
//! Send status message
@@ -170,12 +167,8 @@ namespace BlackCore
virtual void requestAtisUpdates() = 0;
protected:
friend class CRuntime;
//! Constructor
IContextNetwork(CRuntimeConfig::ContextMode mode, CRuntime *runtime = nullptr) : CContext(mode, runtime) {}
IContextNetwork(CRuntimeConfig::ContextMode mode, CRuntime *runtime) : CContext(mode, runtime) {}
};
}