diff --git a/src/blackgui/components/audiovolumecomponent.h b/src/blackgui/components/audiovolumecomponent.h index 8475be16c..90b6dd686 100644 --- a/src/blackgui/components/audiovolumecomponent.h +++ b/src/blackgui/components/audiovolumecomponent.h @@ -21,7 +21,6 @@ class QWidget; namespace Ui { class CAudioVolumeComponent; } - namespace BlackGui { namespace Components diff --git a/src/blackmisc/digestsignal.cpp b/src/blackmisc/digestsignal.cpp index f6f11f9ef..9fd55ffe8 100644 --- a/src/blackmisc/digestsignal.cpp +++ b/src/blackmisc/digestsignal.cpp @@ -25,11 +25,11 @@ namespace BlackMisc m_inputsCount++; if (m_inputsCount >= m_maxInputsPerDigest) { - ps_timeout(); + timerTimeout(); } } - void CDigestSignal::ps_timeout() + void CDigestSignal::timerTimeout() { m_timer.stop(); m_inputsCount = 0; @@ -38,7 +38,7 @@ namespace BlackMisc void CDigestSignal::init(int maxDelayMs) { - QObject::connect(&m_timer, &QTimer::timeout, this, &CDigestSignal::ps_timeout); + QObject::connect(&m_timer, &QTimer::timeout, this, &CDigestSignal::timerTimeout); m_timer.setSingleShot(true); m_timer.setInterval(maxDelayMs); } diff --git a/src/blackmisc/digestsignal.h b/src/blackmisc/digestsignal.h index 46cce0ff3..586a07726 100644 --- a/src/blackmisc/digestsignal.h +++ b/src/blackmisc/digestsignal.h @@ -55,11 +55,10 @@ namespace BlackMisc //! Received input signal, or manually trigger void inputSignal(); - private slots: - //! Timer timed out - void ps_timeout(); - private: + //! Timer timed out + void timerTimeout(); + //! Init in ctor void init(int maxDelayMs);