flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-06 10:15:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

49
src/blackcore/context_runtime.h
View File

@@ -26,29 +26,6 @@ namespace BlackCore
{
Q_OBJECT
private:
bool m_init; /*!< flag */
CDBusServer *m_dbusServer;
bool m_initDBusConnection;
QDBusConnection m_dbusConnection;
IContextNetwork *m_contextNetwork;
IContextAudio *m_contextAudio;
IContextSettings *m_contextSettings;
IContextApplication *m_contextApplication;
IContextSimulator *m_contextSimulator;
//! Init
void init(const CRuntimeConfig &config);
//! initialization of DBus connection (where applicable)
void initDBusConnection();
//! initialization of DBus connection (where applicable)
void initDBusServer(const QString &dBusAddress);
//! post init tasks, mainly connecting context signal slots
void initPostSetup();
public:
//! Constructor
CRuntime(const CRuntimeConfig &config, QObject *parent = nullptr);
@@ -93,8 +70,34 @@ namespace BlackCore
IContextSimulator *getIContextSimulator();
private:
bool m_init; /*!< flag */
CDBusServer *m_dbusServer;
bool m_initDBusConnection;
QDBusConnection m_dbusConnection;
IContextNetwork *m_contextNetwork;
IContextAudio *m_contextAudio;
IContextSettings *m_contextSettings;
IContextApplication *m_contextApplication;
IContextSimulator *m_contextSimulator;
//! Init
void init(const CRuntimeConfig &config);
//! initialization of DBus connection (where applicable)
void initDBusConnection();
//! initialization of DBus connection (where applicable)
void initDBusServer(const QString &dBusAddress);
//! post init tasks, mainly connecting context signal slots
void initPostSetup();
CContextAudio *getCContextAudio();
CContextAudio *getCContextAudio() const;
CContextSimulator *getCContextSimulator();
CContextSimulator *getCContextSimulator() const;
};
}
#endif // guard