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

@@ -21,14 +21,11 @@ namespace BlackCore
{
Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTAPPLICATION_INTERFACENAME)
Q_OBJECT
friend class CRuntime;
public:
protected:
//! Constructor
CContextApplication(CRuntimeConfig::ContextMode mode, CRuntime *runtime = nullptr);
//! Destructor
virtual ~CContextApplication() {}
CContextApplication(CRuntimeConfig::ContextMode mode, CRuntime *runtime);
//! Register myself in DBus
CContextApplication *registerWithDBus(CDBusServer *server)
@@ -37,11 +34,13 @@ namespace BlackCore
return this;
}
public slots:
public:
//! Destructor
virtual ~CContextApplication() {}
public slots:
//! \copydoc IContextApplication::ping()
virtual qint64 ping(qint64 token) const override;
};
}