flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-05 17:35:34 +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

18
src/blackcore/context_audio_impl.h
View File

@@ -20,20 +20,13 @@ namespace BlackCore
{
Q_CLASSINFO("D-Bus Interface", BLACKCORE_CONTEXTAUDIO_INTERFACENAME)
Q_OBJECT
friend class CRuntime;
public:
//! \brief Destructor
virtual ~CContextAudio();
//! \brief Register myself in DBus
CContextAudio *registerWithDBus(CDBusServer *server)
{
Q_ASSERT(server);
server->addObject(IContextAudio::ObjectPath(), this);
return this;
}
public slots:
//! \copydoc IContextAudio::setOwnAircraft()
virtual void setOwnAircraft(const BlackMisc::Aviation::CAircraft &ownAircraft) override;
@@ -105,8 +98,15 @@ namespace BlackCore
//! \brief Constructor
CContextAudio(CRuntimeConfig::ContextMode mode, CRuntime *runtime);
//! \brief Register myself in DBus
CContextAudio *registerWithDBus(CDBusServer *server)
{
Q_ASSERT(server);
server->addObject(IContextAudio::ObjectPath(), this);
return this;
}
private slots:
friend class CRuntime;
void settingsChanged(uint typeValue);
private: