1 files changed, 14 insertions, 12 deletions
diff --git a/src/preferences/dialog/dlgprefdeck.h b/src/preferences/dialog/dlgprefdeck.h
index 41788ab9cf..dde7bff85a 100644
--- a/src/preferences/dialog/dlgprefdeck.h
+++ b/src/preferences/dialog/dlgprefdeck.h
@@ -1,7 +1,7 @@
-#ifndef DLGPREFDECK_H
-#define DLGPREFDECK_H
+#pragma once
 
 #include <QWidget>
+#include <memory>
 
 #include "engine/controls/cuecontrol.h"
 #include "engine/controls/ratecontrol.h"
@@ -9,6 +9,7 @@
 #include "preferences/dialog/ui_dlgprefdeckdlg.h"
 #include "preferences/dlgpreferencepage.h"
 #include "preferences/usersettings.h"
+#include "util/parented_ptr.h"
 
 class ControlProxy;
 class ControlPotmeter;
@@ -58,7 +59,7 @@ class DlgPrefDeck : public DlgPreferencePage, public Ui::DlgPrefDeckDlg  {
     DlgPrefDeck(QWidget *parent, MixxxMainWindow *mixxx,
                     PlayerManager* pPlayerManager,
                     UserSettingsPointer pConfig);
-    virtual ~DlgPrefDeck();
+    ~DlgPrefDeck() override;
 
   public slots:
     void slotUpdate() override;
@@ -101,19 +102,22 @@ class DlgPrefDeck : public DlgPreferencePage, public Ui::DlgPrefDeckDlg  {
     void setRateRangeForAllDecks(int rangePercent);
     void setRateDirectionForAllDecks(bool inverted);
 
-    UserSettingsPointer m_pConfig;
-    ControlObject* m_pControlTrackTimeDisplay;
-    ControlObject* m_pControlTrackTimeFormat;
-    ControlProxy* m_pNumDecks;
-    ControlProxy* m_pNumSamplers;
+    MixxxMainWindow* const m_mixxx;
+    PlayerManager* const m_pPlayerManager;
+    const UserSettingsPointer m_pConfig;
+
+    const std::unique_ptr<ControlObject> m_pControlTrackTimeDisplay;
+    const std::unique_ptr<ControlObject> m_pControlTrackTimeFormat;
+
+    const parented_ptr<ControlProxy> m_pNumDecks;
+    const parented_ptr<ControlProxy> m_pNumSamplers;
+
     QList<ControlProxy*> m_cueControls;
     QList<ControlProxy*> m_rateControls;
     QList<ControlProxy*> m_rateDirectionControls;
     QList<ControlProxy*> m_rateRangeControls;
     QList<ControlProxy*> m_keylockModeControls;
     QList<ControlProxy*> m_keyunlockModeControls;
-    MixxxMainWindow *m_mixxx;
-    PlayerManager* m_pPlayerManager;
 
     int m_iNumConfiguredDecks;
     int m_iNumConfiguredSamplers;
@@ -143,5 +147,3 @@ class DlgPrefDeck : public DlgPreferencePage, public Ui::DlgPrefDeckDlg  {
     double m_dRatePermCoarse;
     double m_dRatePermFine;
 };
-
-#endif