Formatting

This commit is contained in:
Klaus Basan
2014-10-22 14:08:35 +02:00
committed by Roland Winklmeier
parent 6f8d85e864
commit 11e9b37326
6 changed files with 11 additions and 12 deletions

View File

@@ -23,5 +23,4 @@ namespace BlackCore
return nullptr; // audio not mandatory return nullptr; // audio not mandatory
} }
} }
} // namespace
}

View File

@@ -78,7 +78,7 @@ namespace BlackCore
//! \copydoc IContextAudio::setCurrentAudioDevice() //! \copydoc IContextAudio::setCurrentAudioDevice()
virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDevice &audioDevice) override; virtual void setCurrentAudioDevice(const BlackMisc::Audio::CAudioDevice &audioDevice) override;
//! \copydoc IContextAudio::setVolumes() //! \copydoc IContextAudio::setVolumes
virtual void setVolumes(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2) override; virtual void setVolumes(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2) override;
//! \copydoc IContextAudio::isMuted() //! \copydoc IContextAudio::isMuted()

View File

@@ -71,10 +71,10 @@ namespace BlackCore
//! Is channel muted? //! Is channel muted?
virtual bool isMuted() const = 0; virtual bool isMuted() const = 0;
//! Set channel volume //! Set channel volume 0..100
virtual void setVolume(quint32 volume) = 0; virtual void setVolume(quint32 volume) = 0;
//! Get channel volume //! Get channel volume 0..100
virtual quint32 getVolume() const = 0; virtual quint32 getVolume() const = 0;
//! Update room status //! Update room status

View File

@@ -67,7 +67,7 @@ namespace BlackGui
} }
else else
{ {
// KWB remove: qDebug() will be removed soo // KWB remove: qDebug() will be removed soon
qDebug() << this->objectName() << "Skipping update (aircrafts)"; qDebug() << this->objectName() << "Skipping update (aircrafts)";
} }
} }

View File

@@ -71,16 +71,16 @@ namespace BlackMisc
this->m_frequencyStandby = frequency; this->m_frequencyStandby = frequency;
} }
//! Output volume //! Output volume 0..100
qint32 getVolumeOutput() const { return this->m_volumeOutput; } qint32 getVolumeOutput() const { return this->m_volumeOutput; }
//! Input volume //! Input volume 0..100
qint32 getVolumeInput() const { return this->m_volumeInput; } qint32 getVolumeInput() const { return this->m_volumeInput; }
//! Output volume //! Output volume 0.100
void setVolumeOutput(qint32 volume) { this->m_volumeOutput = volume; } void setVolumeOutput(qint32 volume) { this->m_volumeOutput = volume; }
//! Input volume //! Input volume 0..100
void setVolumeInput(qint32 volume) { this->m_volumeInput = volume; } void setVolumeInput(qint32 volume) { this->m_volumeInput = volume; }
//! Enabled? //! Enabled?

View File

@@ -15,9 +15,9 @@
#include <QString> #include <QString>
#include <QMetaEnum> #include <QMetaEnum>
// apart from the below definitions, the following code is OS independent, // Apart from the below definitions, the following code is OS independent,
// though it does not make sense to be used on non WIN machines. // though it does not make sense to be used on non WIN machines.
// But it allows parts as GUI to comile // But it allows such parts to compile on all platforms.
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#ifndef NOMINMAX #ifndef NOMINMAX
#define NOMINMAX #define NOMINMAX