From a121c8b095fd5b5ed1a4c9602cf50c349e4dca66 Mon Sep 17 00:00:00 2001 From: Daniel Poelzleithner Date: Mon, 7 Dec 2020 13:58:46 +0100 Subject: remove more unused arguments --- src/preferences/dialog/dlgprefdeck.cpp | 4 ---- src/preferences/dialog/dlgprefdeck.h | 8 ++------ src/preferences/dialog/dlgprefeffects.h | 1 - src/preferences/dialog/dlgpreferences.cpp | 7 +++++-- src/preferences/dialog/dlgprefsound.cpp | 6 +++--- src/preferences/dialog/dlgprefsound.h | 2 -- 6 files changed, 10 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/src/preferences/dialog/dlgprefdeck.cpp b/src/preferences/dialog/dlgprefdeck.cpp index 0fe98114d1..412954e9f4 100644 --- a/src/preferences/dialog/dlgprefdeck.cpp +++ b/src/preferences/dialog/dlgprefdeck.cpp @@ -36,12 +36,8 @@ constexpr int kDefaultRateRampSensitivity = 250; } DlgPrefDeck::DlgPrefDeck(QWidget* parent, - MixxxMainWindow* mixxx, - PlayerManager* pPlayerManager, UserSettingsPointer pConfig) : DlgPreferencePage(parent), - m_mixxx(mixxx), - m_pPlayerManager(pPlayerManager), m_pConfig(pConfig), m_pControlTrackTimeDisplay(std::make_unique( ConfigKey("[Controls]", "ShowDurationRemaining"))), diff --git a/src/preferences/dialog/dlgprefdeck.h b/src/preferences/dialog/dlgprefdeck.h index dde7bff85a..41644d7656 100644 --- a/src/preferences/dialog/dlgprefdeck.h +++ b/src/preferences/dialog/dlgprefdeck.h @@ -56,9 +56,8 @@ enum class KeyunlockMode { class DlgPrefDeck : public DlgPreferencePage, public Ui::DlgPrefDeckDlg { Q_OBJECT public: - DlgPrefDeck(QWidget *parent, MixxxMainWindow *mixxx, - PlayerManager* pPlayerManager, - UserSettingsPointer pConfig); + DlgPrefDeck(QWidget* parent, + UserSettingsPointer pConfig); ~DlgPrefDeck() override; public slots: @@ -102,8 +101,6 @@ class DlgPrefDeck : public DlgPreferencePage, public Ui::DlgPrefDeckDlg { void setRateRangeForAllDecks(int rangePercent); void setRateDirectionForAllDecks(bool inverted); - MixxxMainWindow* const m_mixxx; - PlayerManager* const m_pPlayerManager; const UserSettingsPointer m_pConfig; const std::unique_ptr m_pControlTrackTimeDisplay; @@ -129,7 +126,6 @@ class DlgPrefDeck : public DlgPreferencePage, public Ui::DlgPrefDeckDlg { bool m_bSetIntroStartAtMainCue; bool m_bDisallowTrackLoadToPlayingDeck; bool m_bCloneDeckOnLoadDoubleTap; - bool m_bAssignHotcueColors; int m_iRateRangePercent; bool m_bRateDownIncreasesSpeed; diff --git a/src/preferences/dialog/dlgprefeffects.h b/src/preferences/dialog/dlgprefeffects.h index 1694c4e146..f8a5e6a688 100644 --- a/src/preferences/dialog/dlgprefeffects.h +++ b/src/preferences/dialog/dlgprefeffects.h @@ -31,7 +31,6 @@ class DlgPrefEffects : public DlgPreferencePage, public Ui::DlgPrefEffectsDlg { EffectSettingsModel m_availableEffectsModel; UserSettingsPointer m_pConfig; EffectsManager* m_pEffectsManager; - EffectSettingsModel* m_pAvailableEffectsModel; }; #endif /* DLGPREFEFFECTS_H */ diff --git a/src/preferences/dialog/dlgpreferences.cpp b/src/preferences/dialog/dlgpreferences.cpp index b52f4b7437..9165312250 100644 --- a/src/preferences/dialog/dlgpreferences.cpp +++ b/src/preferences/dialog/dlgpreferences.cpp @@ -81,6 +81,7 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, #ifndef __LILV__ Q_UNUSED(pLV2Backend); #endif /* __LILV__ */ + Q_UNUSED(pPlayerManager); setupUi(this); contentsTreeWidget->setHeaderHidden(true); @@ -96,7 +97,7 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, } // Construct widgets for use in tabs. - m_soundPage = new DlgPrefSound(this, soundman, pPlayerManager, m_pConfig); + m_soundPage = new DlgPrefSound(this, soundman, m_pConfig); addPageWidget(m_soundPage); m_libraryPage = new DlgPrefLibrary(this, m_pConfig, pLibrary); addPageWidget(m_libraryPage); @@ -113,16 +114,18 @@ DlgPreferences::DlgPreferences(MixxxMainWindow * mixxx, SkinLoader* pSkinLoader, // TODO(rryan) determine why/if this is still true m_vinylControlPage = new DlgPrefVinyl(this, pVCManager, m_pConfig); addPageWidget(m_vinylControlPage); + Q_UNUSED(m_noVinylControlPage); #else m_noVinylControlPage = new DlgPrefNoVinyl(this, soundman, m_pConfig); addPageWidget(m_noVinylControlPage); + Q_UNUSED(m_vinylControlPage); #endif m_interfacePage = new DlgPrefInterface(this, mixxx, pSkinLoader, m_pConfig); addPageWidget(m_interfacePage); m_waveformPage = new DlgPrefWaveform(this, mixxx, m_pConfig, pLibrary); addPageWidget(m_waveformPage); - m_deckPage = new DlgPrefDeck(this, mixxx, pPlayerManager, m_pConfig); + m_deckPage = new DlgPrefDeck(this, m_pConfig); addPageWidget(m_deckPage); m_colorsPage = new DlgPrefColors(this, m_pConfig, pLibrary); addPageWidget(m_colorsPage); diff --git a/src/preferences/dialog/dlgprefsound.cpp b/src/preferences/dialog/dlgprefsound.cpp index f97cdfa256..8bfc7bf9ea 100644 --- a/src/preferences/dialog/dlgprefsound.cpp +++ b/src/preferences/dialog/dlgprefsound.cpp @@ -32,11 +32,11 @@ * Construct a new sound preferences pane. Initializes and populates all the * all the controls to the values obtained from SoundManager. */ -DlgPrefSound::DlgPrefSound(QWidget* pParent, SoundManager* pSoundManager, - PlayerManager* pPlayerManager, UserSettingsPointer pSettings) +DlgPrefSound::DlgPrefSound(QWidget* pParent, + SoundManager* pSoundManager, + UserSettingsPointer pSettings) : DlgPreferencePage(pParent), m_pSoundManager(pSoundManager), - m_pPlayerManager(pPlayerManager), m_pSettings(pSettings), m_config(pSoundManager), m_settingsModified(false), diff --git a/src/preferences/dialog/dlgprefsound.h b/src/preferences/dialog/dlgprefsound.h index 6682555925..2ef52be534 100644 --- a/src/preferences/dialog/dlgprefsound.h +++ b/src/preferences/dialog/dlgprefsound.h @@ -44,7 +44,6 @@ class DlgPrefSound : public DlgPreferencePage, public Ui::DlgPrefSoundDlg { Q_OBJECT; public: DlgPrefSound(QWidget *parent, SoundManager *soundManager, - PlayerManager* pPlayerManager, UserSettingsPointer pSettings); virtual ~DlgPrefSound(); @@ -99,7 +98,6 @@ class DlgPrefSound : public DlgPreferencePage, public Ui::DlgPrefSoundDlg { bool eventFilter(QObject* object, QEvent* event) override; SoundManager *m_pSoundManager; - PlayerManager *m_pPlayerManager; UserSettingsPointer m_pSettings; SoundManagerConfig m_config; ControlProxy* m_pMasterAudioLatencyOverloadCount; -- cgit v1.2.3