Formatting, minor tweaks

refs #369, refs #371, refs #372
This commit is contained in:
Klaus Basan
2015-02-09 19:50:21 +01:00
parent f0db7ed660
commit 45bace425d
6 changed files with 13 additions and 12 deletions

View File

@@ -72,10 +72,10 @@ namespace BlackCore
//! Set new output device
virtual void setOutputDevice(const BlackMisc::Audio::CAudioDeviceInfo &device) = 0;
//! Set output volume between 0 ... 300 %
//! Set output volume between 0 ... 300%
virtual void setOutputVolume(int volume) = 0;
//! Get output volume
//! Get output volume between 0 ... 300%
virtual int getOutputVolume() const = 0;
};
}

View File

@@ -23,10 +23,10 @@ namespace BlackCore
case CRuntimeConfig::LocalInDbusServer:
return (new CContextNetwork(mode, runtime))->registerWithDBus(server);
case CRuntimeConfig::Remote:
return new BlackCore::CContextNetworkProxy(BlackCore::CDBusServer::ServiceName, conn, mode, runtime);
return new CContextNetworkProxy(BlackCore::CDBusServer::ServiceName, conn, mode, runtime);
case CRuntimeConfig::NotUsed:
default:
return new BlackCore::CContextNetworkEmpty(runtime);
return new CContextNetworkEmpty(runtime);
}
}

View File

@@ -28,9 +28,6 @@ namespace BlackCore
//! Constructor
CContextNetworkEmpty(CRuntime *runtime) : IContextNetwork(CRuntimeConfig::NotUsed, runtime) {}
//! Destructor
virtual ~CContextNetworkEmpty() {}
public slots: // IContextNetwork overrides
//! \copydoc IContextNetwork::readAtcBookingsFromSource()

View File

@@ -206,7 +206,7 @@ namespace BlackCore
Q_ASSERT(factory);
// We assume we run in the same process as the own aircraft context
// Hence we pass in memory refernce to own aircraft object
// Hence we pass in memory reference to own aircraft object
Q_ASSERT(this->getIContextOwnAircraft()->isUsingImplementingObject());
Q_ASSERT(this->getIContextNetwork()->isUsingImplementingObject());
IOwnAircraftProvider *ownAircraftProvider = this->getRuntime()->getCContextOwnAircraft();