Merge pull request #11619 from daschuer/classlayout

Improve class definition layout of new classes 

19 files changed, 89 insertions, 79 deletions

diff --git a/src/waveform/renderers/allshader/waveformrendermark.cpp b/src/waveform/renderers/allshader/waveformrendermark.cpp
index 4f27e4ba80..357a0e10d6 100644
--- a/src/waveform/renderers/allshader/waveformrendermark.cpp
+++ b/src/waveform/renderers/allshader/waveformrendermark.cpp
@@ -33,7 +33,8 @@ constexpr int kMaxCueLabelLength = 23;
 } // namespace
 
 allshader::WaveformRenderMark::WaveformRenderMark(WaveformWidgetRenderer* waveformWidget)
-        : WaveformRenderer(waveformWidget) {
+        : WaveformRenderer(waveformWidget),
+          m_bCuesUpdates(false) {
 }
 
 allshader::WaveformRenderMark::~WaveformRenderMark() {
diff --git a/src/waveform/renderers/allshader/waveformrendermark.h b/src/waveform/renderers/allshader/waveformrendermark.h
index 4f77e5f821..b17a9dc494 100644
--- a/src/waveform/renderers/allshader/waveformrendermark.h
+++ b/src/waveform/renderers/allshader/waveformrendermark.h
@@ -55,7 +55,7 @@ class allshader::WaveformRenderMark final : public QObject, public allshader::Wa
     mixxx::RGBAShader m_rgbaShader;
     mixxx::TextureShader m_textureShader;
     std::unique_ptr<QOpenGLTexture> m_pPlayPosMarkTexture;
-    bool m_bCuesUpdates{};
+    bool m_bCuesUpdates;
 
     void drawMark(const QRectF& rect, QColor color);
     void drawTexture(float x, float y, QOpenGLTexture* texture);
diff --git a/src/widget/openglwindow.cpp b/src/widget/openglwindow.cpp
index c2249a9e8e..b797ea8ebe 100644
--- a/src/widget/openglwindow.cpp
+++ b/src/widget/openglwindow.cpp
@@ -7,8 +7,9 @@
 #include "widget/trackdroptarget.h"
 #include "widget/wglwidget.h"
 
-OpenGLWindow::OpenGLWindow(WGLWidget* widget)
-        : m_pWidget(widget) {
+OpenGLWindow::OpenGLWindow(WGLWidget* pWidget)
+        : m_pWidget(pWidget),
+          m_dirty(false) {
     QSurfaceFormat format;
     format.setVersion(2, 1);
     format.setProfile(QSurfaceFormat::CoreProfile);
@@ -53,26 +54,26 @@ void OpenGLWindow::widgetDestroyed() {
     m_pWidget = nullptr;
 }
 
-bool OpenGLWindow::event(QEvent* ev) {
+bool OpenGLWindow::event(QEvent* pEv) {
     // From here we call QApplication::sendEvent(m_pWidget, ev) to trigger
     // handling of the event as if it were received by the main window.
     // With drag move and drag leave events it may happen that this function
     // gets called recursive, potentially resulting in infinite recursion
     // and a stack overflow. The boolean m_handlingEvent protects against
     // this recursion.
-    const auto t = ev->type();
+    const auto t = pEv->type();
 
-    bool result = QOpenGLWindow::event(ev);
+    bool result = QOpenGLWindow::event(pEv);
 
     if (m_pWidget) {
         // Tooltip don't work by forwarding the events. This mimics the
         // tooltip behavior.
         if (t == QEvent::MouseMove) {
             ToolTipQOpenGL::singleton().start(
-                    m_pWidget, dynamic_cast<QMouseEvent*>(ev)->globalPos());
+                    m_pWidget, dynamic_cast<QMouseEvent*>(pEv)->globalPos());
         }
         if (t == QEvent::Leave) {
-            ToolTipQOpenGL::singleton().stop(m_pWidget);
+            ToolTipQOpenGL::singleton().stop();
         }
 
         if (t == QEvent::DragEnter || t == QEvent::DragMove ||
@@ -80,10 +81,10 @@ bool OpenGLWindow::event(QEvent* ev) {
             // Drag & Drop events are not delivered correctly when using QApplication::sendEvent
             // and even result in a recursive call to this method, so we use our own mechanism.
             if (m_pWidget->trackDropTarget()) {
-                return m_pWidget->trackDropTarget()->handleDragAndDropEventFromWindow(ev);
+                return m_pWidget->trackDropTarget()->handleDragAndDropEventFromWindow(pEv);
             }
 
-            ev->ignore();
+            pEv->ignore();
             return false;
         }
 
@@ -101,7 +102,7 @@ bool OpenGLWindow::event(QEvent* ev) {
         // container widget that contains this QOpenGLWindow. With this mouse
         // events, keyboard events, etc all arrive as intended, including the
         // events for the WWaveformViewer that contains the waveform widget.
-        QApplication::sendEvent(m_pWidget, ev);
+        QApplication::sendEvent(m_pWidget, pEv);
     }
 
     return result;
diff --git a/src/widget/openglwindow.h b/src/widget/openglwindow.h
index 3d725ba462..e275ff132d 100644
--- a/src/widget/openglwindow.h
+++ b/src/widget/openglwindow.h
@@ -9,11 +9,8 @@ class WGLWidget;
 class OpenGLWindow : public QOpenGLWindow {
     Q_OBJECT
 
-    WGLWidget* m_pWidget;
-    bool m_dirty{};
-
   public:
-    OpenGLWindow(WGLWidget* widget);
+    OpenGLWindow(WGLWidget* pWidget);
     ~OpenGLWindow();
 
     void widgetDestroyed();
@@ -22,5 +19,8 @@ class OpenGLWindow : public QOpenGLWindow {
     void initializeGL() override;
     void paintGL() override;
     void resizeGL(int w, int h) override;
-    bool event(QEvent* ev) override;
+    bool event(QEvent* pEv) override;
+
+    WGLWidget* m_pWidget;
+    bool m_dirty;
 };
diff --git a/src/widget/tooltipqopengl.cpp b/src/widget/tooltipqopengl.cpp
index 12c5aa4a20..1dc782ee56 100644
--- a/src/widget/tooltipqopengl.cpp
+++ b/src/widget/tooltipqopengl.cpp
@@ -1,20 +1,22 @@
 #include "widget/tooltipqopengl.h"
 
-#include <widget/wglwidget.h>
-
 #include <QStyle>
 #include <QTimer>
 #include <QToolTip>
 #include <memory>
 
-ToolTipQOpenGL::ToolTipQOpenGL() {
+#include "widget/wglwidget.h"
+
+ToolTipQOpenGL::ToolTipQOpenGL()
+        : m_active(true),
+          m_pWidget(nullptr) {
     m_timer.setSingleShot(true);
     connect(&m_timer, &QTimer::timeout, this, &ToolTipQOpenGL::onTimeout);
 }
 
 void ToolTipQOpenGL::onTimeout() {
-    if (m_widget) {
-        QToolTip::showText(m_pos, m_widget->toolTip(), m_widget);
+    if (m_pWidget) {
+        QToolTip::showText(m_pos, m_pWidget->toolTip(), m_pWidget);
     }
 }
 
@@ -30,14 +32,15 @@ void ToolTipQOpenGL::setActive(bool active) {
     }
 }
 
-void ToolTipQOpenGL::start(WGLWidget* widget, QPoint pos) {
+void ToolTipQOpenGL::start(WGLWidget* pWidget, QPoint pos) {
     if (m_active) {
-        m_widget = widget;
+        m_pWidget = pWidget;
         m_pos = pos;
-        m_timer.start(widget->style()->styleHint(QStyle::SH_ToolTip_WakeUpDelay));
+        m_timer.start(pWidget->style()->styleHint(QStyle::SH_ToolTip_WakeUpDelay));
     }
 }
 
-void ToolTipQOpenGL::stop(WGLWidget* widget) {
+void ToolTipQOpenGL::stop() {
     m_timer.stop();
+    m_pWidget = nullptr;
 }
diff --git a/src/widget/tooltipqopengl.h b/src/widget/tooltipqopengl.h
index 05777cfe76..ff5d817916 100644
--- a/src/widget/tooltipqopengl.h
+++ b/src/widget/tooltipqopengl.h
@@ -10,18 +10,20 @@ class WGLWidget;
 // singleton mimics the standard tooltip behaviour for them.
 class ToolTipQOpenGL : public QObject {
     Q_OBJECT
-
-    bool m_active{true};
-    QTimer m_timer;
-    QPoint m_pos{};
-    WGLWidget* m_widget{};
-    ToolTipQOpenGL();
-
   public:
     static ToolTipQOpenGL& singleton();
     void setActive(bool active);
-    void start(WGLWidget* widget, QPoint pos);
-    void stop(WGLWidget* widget);
+    void start(WGLWidget* pWidget, QPoint pos);
+    void stop();
+
   private slots:
     void onTimeout();
+
+  private:
+    ToolTipQOpenGL();
+
+    bool m_active;
+    QTimer m_timer;
+    QPoint m_pos;
+    WGLWidget* m_pWidget;
 };
diff --git a/src/widget/wglwidgetqglwidget.h b/src/widget/wglwidgetqglwidget.h
index 99b3837d50..163e56b9ac 100644
--- a/src/widget/wglwidgetqglwidget.h
+++ b/src/widget/wglwidgetqglwidget.h
@@ -8,7 +8,7 @@
 
 class WGLWidget : public QGLWidget {
   public:
-    WGLWidget(QWidget* parent);
+    WGLWidget(QWidget* pParent);
 
     bool isContextValid() const;
     bool isContextSharing() const;
diff --git a/src/widget/wglwidgetqopengl.cpp b/src/widget/wglwidgetqopengl.cpp
index 9e5bd33d72..25a4a6ef2a 100644
--- a/src/widget/wglwidgetqopengl.cpp
+++ b/src/widget/wglwidgetqopengl.cpp
@@ -4,8 +4,11 @@
 #include "widget/tooltipqopengl.h"
 #include "widget/wglwidget.h"
 
-WGLWidget::WGLWidget(QWidget* parent)
-        : QWidget(parent) {
+WGLWidget::WGLWidget(QWidget* pParent)
+        : QWidget(pParent),
+          m_pOpenGLWindow(nullptr),
+          m_pContainerWidget(nullptr),
+          m_pTrackDropTarget(nullptr) {
     // When the widget is resized or moved, the QOpenGLWindow visibly resizes
     // or moves before the widgets do. This can be solved by calling
     //   setAttribute(Qt::WA_PaintOnScreen);
@@ -14,7 +17,7 @@ WGLWidget::WGLWidget(QWidget* parent)
 }
 
 WGLWidget::~WGLWidget() {
-    ToolTipQOpenGL::singleton().stop(this);
+    ToolTipQOpenGL::singleton().stop();
     if (m_pOpenGLWindow) {
         m_pOpenGLWindow->widgetDestroyed();
     }
diff --git a/src/widget/wglwidgetqopengl.h b/src/widget/wglwidgetqopengl.h
index 7666d823f8..78b4cd48e8 100644
--- a/src/widget/wglwidgetqopengl.h
+++ b/src/widget/wglwidgetqopengl.h
@@ -15,11 +15,6 @@ class OpenGLWindow;
 class TrackDropTarget;
 
 class WGLWidget : public QWidget {
-  private:
-    OpenGLWindow* m_pOpenGLWindow{};
-    QWidget* m_pContainerWidget{};
-    TrackDropTarget* m_pTrackDropTarget{};
-
   public:
     WGLWidget(QWidget* parent);
     ~WGLWidget();
@@ -48,4 +43,9 @@ class WGLWidget : public QWidget {
     void resizeEvent(QResizeEvent* event) override;
 
     QPaintDevice* paintDevice();
+
+  private:
+    OpenGLWindow* m_pOpenGLWindow;
+    QWidget* m_pContainerWidget;
+    TrackDropTarget* m_pTrackDropTarget;
 };
diff --git a/src/widget/winitialglwidget.cpp b/src/widget/winitialglwidget.cpp
index cc6a443310..b8deeb8b0e 100644
--- a/src/widget/winitialglwidget.cpp
+++ b/src/widget/winitialglwidget.cpp
@@ -2,8 +2,8 @@
 
 #include <QOpenGLFunctions>
 
-WInitialGLWidget::WInitialGLWidget(QWidget* parent)
-        : WGLWidget(parent) {
+WInitialGLWidget::WInitialGLWidget(QWidget* pParent)
+        : WGLWidget(pParent) {
 }
 
 void WInitialGLWidget::paintGL() {
diff --git a/src/widget/winitialglwidget.h b/src/widget/winitialglwidget.h
index bdd506b7c8..13aa9239eb 100644
--- a/src/widget/winitialglwidget.h
+++ b/src/widget/winitialglwidget.h
@@ -5,7 +5,7 @@
 class WInitialGLWidget : public WGLWidget {
     Q_OBJECT
   public:
-    WInitialGLWidget(QWidget* parent);
+    WInitialGLWidget(QWidget* pParent);
 
     void initializeGL() override;
     void paintGL() override;
diff --git a/src/widget/wspinny.cpp b/src/widget/wspinny.cpp
index 6a1407f4b6..a48c8b7817 100644
--- a/src/widget/wspinny.cpp
+++ b/src/widget/wspinny.cpp
@@ -1,12 +1,12 @@
 #include "widget/wspinny.h"
 
 WSpinny::WSpinny(
-        QWidget* parent,
+        QWidget* pParent,
         const QString& group,
         UserSettingsPointer pConfig,
         VinylControlManager* pVCMan,
         BaseTrackPlayer* pPlayer)
-        : WSpinnyBase(parent, group, pConfig, pVCMan, pPlayer) {
+        : WSpinnyBase(pParent, group, pConfig, pVCMan, pPlayer) {
 }
 
 void WSpinny::draw() {
diff --git a/src/widget/wspinnybase.cpp b/src/widget/wspinnybase.cpp
index 0dd7a9b4fd..5269920121 100644
--- a/src/widget/wspinnybase.cpp
+++ b/src/widget/wspinnybase.cpp
@@ -22,12 +22,12 @@
 
 // The SampleBuffers format enables antialiasing.
 WSpinnyBase::WSpinnyBase(
-        QWidget* parent,
+        QWidget* pParent,
         const QString& group,
         UserSettingsPointer pConfig,
         VinylControlManager* pVCMan,
         BaseTrackPlayer* pPlayer)
-        : WGLWidget(parent),
+        : WGLWidget(pParent),
           WBaseWidget(this),
           m_group(group),
           m_pConfig(pConfig),
@@ -246,8 +246,8 @@ void WSpinnyBase::setLoadedCover(const QPixmap& pixmap) {
 }
 
 void WSpinnyBase::slotLoadTrack(TrackPointer pTrack) {
-    if (m_loadedTrack) {
-        disconnect(m_loadedTrack.get(),
+    if (m_pLoadedTrack) {
+        disconnect(m_pLoadedTrack.get(),
                 &Track::coverArtUpdated,
                 this,
                 &WSpinnyBase::slotTrackCoverArtUpdated);
@@ -256,9 +256,9 @@ void WSpinnyBase::slotLoadTrack(TrackPointer pTrack) {
 
     setLoadedCover(QPixmap());
 
-    m_loadedTrack = pTrack;
-    if (m_loadedTrack) {
-        connect(m_loadedTrack.get(),
+    m_pLoadedTrack = pTrack;
+    if (m_pLoadedTrack) {
+        connect(m_pLoadedTrack.get(),
                 &Track::coverArtUpdated,
                 this,
                 &WSpinnyBase::slotTrackCoverArtUpdated);
@@ -269,13 +269,13 @@ void WSpinnyBase::slotLoadTrack(TrackPointer pTrack) {
 
 void WSpinnyBase::slotLoadingTrack(TrackPointer pNewTrack, TrackPointer pOldTrack) {
     Q_UNUSED(pNewTrack);
-    if (m_loadedTrack && pOldTrack == m_loadedTrack) {
-        disconnect(m_loadedTrack.get(),
+    if (m_pLoadedTrack && pOldTrack == m_pLoadedTrack) {
+        disconnect(m_pLoadedTrack.get(),
                 &Track::coverArtUpdated,
                 this,
                 &WSpinnyBase::slotTrackCoverArtUpdated);
     }
-    m_loadedTrack.reset();
+    m_pLoadedTrack.reset();
     m_lastRequestedCover = CoverInfo();
 
     setLoadedCover(QPixmap());
@@ -283,8 +283,8 @@ void WSpinnyBase::slotLoadingTrack(TrackPointer pNewTrack, TrackPointer pOldTrac
 }
 
 void WSpinnyBase::slotTrackCoverArtUpdated() {
-    if (m_loadedTrack) {
-        CoverArtCache::requestTrackCover(this, m_loadedTrack);
+    if (m_pLoadedTrack) {
+        CoverArtCache::requestTrackCover(this, m_pLoadedTrack);
     }
 }
 
@@ -297,25 +297,25 @@ void WSpinnyBase::slotCoverFound(
     Q_UNUSED(requestedCacheKey);
     Q_UNUSED(coverInfoUpdated); // CoverArtCache has taken care, updating the Track.
     if (pRequestor == this &&
-            m_loadedTrack &&
-            m_loadedTrack->getLocation() == coverInfo.trackLocation) {
+            m_pLoadedTrack &&
+            m_pLoadedTrack->getLocation() == coverInfo.trackLocation) {
         setLoadedCover(pixmap);
         coverChanged();
     }
 }
 
 void WSpinnyBase::slotCoverInfoSelected(const CoverInfoRelative& coverInfo) {
-    if (m_loadedTrack != nullptr) {
+    if (m_pLoadedTrack != nullptr) {
         // Will trigger slotTrackCoverArtUpdated().
-        m_loadedTrack->setCoverInfo(coverInfo);
+        m_pLoadedTrack->setCoverInfo(coverInfo);
     }
 }
 
 void WSpinnyBase::slotReloadCoverArt() {
-    if (!m_loadedTrack) {
+    if (!m_pLoadedTrack) {
         return;
     }
-    const auto future = guessTrackCoverInfoConcurrently(m_loadedTrack);
+    const auto future = guessTrackCoverInfoConcurrently(m_pLoadedTrack);
     // Don't wait for the result and keep running in the background
     Q_UNUSED(future)
 }
@@ -562,7 +562,7 @@ void WSpinnyBase::mouseMoveEvent(QMouseEvent* e) {
 }
 
 void WSpinnyBase::mousePressEvent(QMouseEvent* e) {
-    if (m_loadedTrack == nullptr) {
+    if (m_pLoadedTrack == nullptr) {
         return;
     }
 
@@ -608,7 +608,7 @@ void WSpinnyBase::mousePressEvent(QMouseEvent* e) {
         }
     } else {
         if (!m_loadedCover.isNull()) {
-            m_pDlgCoverArt->init(m_loadedTrack);
+            m_pDlgCoverArt->init(m_pLoadedTrack);
         } else if (!m_pDlgCoverArt->isVisible() && m_bShowCover) {
 #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
             m_pCoverMenu->popup(e->globalPosition().toPoint());
diff --git a/src/widget/wspinnybase.h b/src/widget/wspinnybase.h
index 33f9f3d4bf..ac3bc0f342 100644
--- a/src/widget/wspinnybase.h
+++ b/src/widget/wspinnybase.h
@@ -28,7 +28,7 @@ class WSpinnyBase : public WGLWidget,
                     public TrackDropTarget {
     Q_OBJECT
   public:
-    WSpinnyBase(QWidget* parent,
+    WSpinnyBase(QWidget* pParent,
             const QString& group,
             UserSettingsPointer pConfig,
             VinylControlManager* pVCMan,
@@ -118,7 +118,7 @@ class WSpinnyBase : public WGLWidget,
     ControlProxy* m_pSlipEnabled;
     ControlProxy* m_pShowCoverProxy;
 
-    TrackPointer m_loadedTrack;
+    TrackPointer m_pLoadedTrack;
     QPixmap m_loadedCover;
     QPixmap m_loadedCoverScaled;
     CoverInfo m_lastRequestedCover;
diff --git a/src/widget/wvumeter.cpp b/src/widget/wvumeter.cpp
index abc845f349..636e38db0b 100644
--- a/src/widget/wvumeter.cpp
+++ b/src/widget/wvumeter.cpp
@@ -1,8 +1,8 @@
 #include "widget/wvumeter.h"
 #include "util/math.h"
 
-WVuMeter::WVuMeter(QWidget* parent)
-        : WVuMeterBase(parent) {
+WVuMeter::WVuMeter(QWidget* pParent)
+        : WVuMeterBase(pParent) {
 }
 
 void WVuMeter::draw() {
diff --git a/src/widget/wvumeterglsl.cpp b/src/widget/wvumeterglsl.cpp
index 8a751b58e6..9d2c899596 100644
--- a/src/widget/wvumeterglsl.cpp
+++ b/src/widget/wvumeterglsl.cpp
@@ -4,8 +4,8 @@
 #include "util/math.h"
 #include "util/texture.h"
 
-WVuMeterGLSL::WVuMeterGLSL(QWidget* parent)
-        : WVuMeterBase(parent) {
+WVuMeterGLSL::WVuMeterGLSL(QWidget* pParent)
+        : WVuMeterBase(pParent) {
 }
 
 WVuMeterGLSL::~WVuMeterGLSL() {
diff --git a/src/widget/wvumeterglsl.h b/src/widget/wvumeterglsl.h
index 4070836994..99d93d5b7b 100644
--- a/src/widget/wvumeterglsl.h
+++ b/src/widget/wvumeterglsl.h
@@ -11,7 +11,7 @@
 class WVuMeterGLSL : public WVuMeterBase {
     Q_OBJECT
   public:
-    explicit WVuMeterGLSL(QWidget* parent = nullptr);
+    explicit WVuMeterGLSL(QWidget* pParent = nullptr);
     ~WVuMeterGLSL() override;
 
   private:
diff --git a/src/widget/wvumeterlegacy.cpp b/src/widget/wvumeterlegacy.cpp
index c8c062a63f..bd39e0abdd 100644
--- a/src/widget/wvumeterlegacy.cpp
+++ b/src/widget/wvumeterlegacy.cpp
@@ -13,8 +13,8 @@
 #define DEFAULT_HOLDTIME 400
 #define DEFAULT_HOLDSIZE 5
 
-WVuMeterLegacy::WVuMeterLegacy(QWidget* parent)
-        : WWidget(parent),
+WVuMeterLegacy::WVuMeterLegacy(QWidget* pParent)
+        : WWidget(pParent),
           m_dParameter(0),
           m_dPeakParameter(0),
           m_dLastParameter(0),
diff --git a/src/widget/wvumeterlegacy.h b/src/widget/wvumeterlegacy.h
index a329c810c4..8573452d58 100644
--- a/src/widget/wvumeterlegacy.h
+++ b/src/widget/wvumeterlegacy.h
@@ -8,7 +8,7 @@
 class WVuMeterLegacy : public WWidget {
     Q_OBJECT
   public:
-    explicit WVuMeterLegacy(QWidget* parent = nullptr);
+    explicit WVuMeterLegacy(QWidget* pParent = nullptr);
 
     void setup(const QDomNode& node, const SkinContext& context);
     void setPixmapBackground(