refs #77, refs #288 fixed gcc / doxygen warnings as far as possible

This commit is contained in:
Klaus Basan
2014-11-18 17:33:20 +01:00
committed by Roland Winklmeier
parent ce78b65079
commit 4ce5144516
7 changed files with 12 additions and 6 deletions

View File

@@ -195,7 +195,10 @@ namespace BlackCore
void CContextAudio::setVolumes(int com1Volume, int com2Volume) void CContextAudio::setVolumes(int com1Volume, int com2Volume)
{ {
if (m_channelCom1->getVolume() == com1Volume && m_channelCom2->getVolume() == com2Volume) { return; } //! \todo Fix when VATLIB 2.0 is available
int channelV1 = static_cast<int>(m_channelCom1->getVolume());
int channelV2 = static_cast<int>(m_channelCom2->getVolume());
if (channelV1 == com1Volume && channelV2 == com2Volume) { return; }
bool enable1 = com1Volume > 0; bool enable1 = com1Volume > 0;
bool enable2 = com2Volume > 0; bool enable2 = com2Volume > 0;

View File

@@ -145,7 +145,7 @@ namespace BlackCore
BlackCore::ISimulator *m_simulator = nullptr; BlackCore::ISimulator *m_simulator = nullptr;
QTimer *m_updateTimer = nullptr; QTimer *m_updateTimer = nullptr;
QDir m_pluginsDir = nullptr; QDir m_pluginsDir;
QSet<ISimulatorFactory *> m_simulatorFactories; QSet<ISimulatorFactory *> m_simulatorFactories;
QFuture<bool> m_canConnectResult; QFuture<bool> m_canConnectResult;
}; };

View File

@@ -183,6 +183,9 @@ namespace BlackGui
case INetwork::LoginAsObserver: case INetwork::LoginAsObserver:
CLogMessage(this).info("login in observer mode"); CLogMessage(this).info("login in observer mode");
break; break;
case INetwork::LoginNormal:
default:
break;
} }
// Server // Server

View File

@@ -226,7 +226,7 @@ namespace BlackGui
void CLedWidget::toggleValue() void CLedWidget::toggleValue()
{ {
m_value = (m_value == Off) ? m_value = On : m_value = Off; m_value = (m_value == Off) ? On : Off;
setLed(); setLed();
} }

View File

@@ -21,7 +21,7 @@ namespace Ui { class CLoginModeButtons; }
namespace BlackGui namespace BlackGui
{ {
//! Display login modes (normal, stealth, ...)
class CLoginModeButtons : public QGroupBox class CLoginModeButtons : public QGroupBox
{ {
Q_OBJECT Q_OBJECT

View File

@@ -19,7 +19,7 @@ namespace BlackGui
{ } { }
CUpperCaseValidator::CUpperCaseValidator(bool optionalValue, int minLength, int maxLength, QObject *parent) : QValidator(parent), CUpperCaseValidator::CUpperCaseValidator(bool optionalValue, int minLength, int maxLength, QObject *parent) : QValidator(parent),
m_minLength(minLength), m_maxLength(maxLength), m_optionalValue(optionalValue) m_optionalValue(optionalValue), m_minLength(minLength), m_maxLength(maxLength)
{ } { }
QValidator::State CUpperCaseValidator::validate(QString &input, int &pos) const QValidator::State CUpperCaseValidator::validate(QString &input, int &pos) const

View File

@@ -160,7 +160,7 @@ namespace BlackMisc
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
// QSysInfo::WindowsVersion only available on Win platforms // QSysInfo::WindowsVersion only available on Win platforms
return (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based) ? true : false; return (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based) ? true : false;
#elif #else
return false; return false;
#endif #endif
} }