From 709383d6bfc16f4586057a2a90f0f6dd2955c8ed Mon Sep 17 00:00:00 2001 From: Uwe Klotz Date: Fri, 17 Apr 2020 21:28:27 +0200 Subject: [PATCH 1/2] Remove unsused class WidgetHider --- CMakeLists.txt | 1 - build/depends.py | 1 - src/preferences/dialog/dlgprefrecord.h | 2 -- src/util/widgethider.cpp | 27 -------------------------- src/util/widgethider.h | 23 ---------------------- 5 files changed, 54 deletions(-) delete mode 100644 src/util/widgethider.cpp delete mode 100644 src/util/widgethider.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c7cee24f471..c1cac0e47f7d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -613,7 +613,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/util/timer.cpp src/util/valuetransformer.cpp src/util/version.cpp - src/util/widgethider.cpp src/util/widgetrendertimer.cpp src/util/workerthread.cpp src/util/workerthreadscheduler.cpp diff --git a/build/depends.py b/build/depends.py index bad5ca59e9a9..d4752340f95f 100644 --- a/build/depends.py +++ b/build/depends.py @@ -1317,7 +1317,6 @@ def sources(self, build): "src/util/logger.cpp", "src/util/logging.cpp", "src/util/cmdlineargs.cpp", - "src/util/widgethider.cpp", "src/util/autohidpi.cpp", "src/util/screensaver.cpp", "src/util/indexrange.cpp", diff --git a/src/preferences/dialog/dlgprefrecord.h b/src/preferences/dialog/dlgprefrecord.h index 29696a87a7bb..82807f124a2f 100644 --- a/src/preferences/dialog/dlgprefrecord.h +++ b/src/preferences/dialog/dlgprefrecord.h @@ -9,14 +9,12 @@ #include "preferences/usersettings.h" #include "preferences/dlgpreferencepage.h" #include "encoder/encoder.h" -#include "util/widgethider.h" class ControlObject; class ControlProxy; class DlgPrefRecord : public DlgPreferencePage, public Ui::DlgPrefRecordDlg { Q_OBJECT - WidgetHider m_hider; public: DlgPrefRecord(QWidget *parent, UserSettingsPointer _config); virtual ~DlgPrefRecord(); diff --git a/src/util/widgethider.cpp b/src/util/widgethider.cpp deleted file mode 100644 index 2ef3030e2e33..000000000000 --- a/src/util/widgethider.cpp +++ /dev/null @@ -1,27 +0,0 @@ -#include "util/widgethider.h" - -#include - -WidgetHider::WidgetHider(QObject* parent) - : QObject(parent) { -} - -bool WidgetHider::eventFilter(QObject* watched, QEvent* event) { - return QObject::eventFilter(watched,event); -} - -void WidgetHider::retainSizeFor(QWidget* widget) -{ - QSizePolicy sp_retain = widget->sizePolicy(); - sp_retain.setRetainSizeWhenHidden(true); - widget->setSizePolicy(sp_retain); -} - -void WidgetHider::hideWidget(QWidget* widget) { - widget->setVisible(false); -} - -void WidgetHider::showWidget(QWidget* widget) -{ - widget->setVisible(true); -} diff --git a/src/util/widgethider.h b/src/util/widgethider.h deleted file mode 100644 index 26b62d107516..000000000000 --- a/src/util/widgethider.h +++ /dev/null @@ -1,23 +0,0 @@ -#ifndef MIXXX_UTIL_WIDGETHIDER_H -#define MIXXX_UTIL_WIDGETHIDER_H - -#include -#include - -// TODO: The following is needed so that the encoder settings don't change size -// and position when hiding some of the options. -// With QT 5.2 onwards, there is an easier solution: -// http://doc.qt.io/qt-5/qsizepolicy.html#setRetainSizeWhenHidden -// Source based on: -// http://stackoverflow.com/questions/10794532/how-to-make-a-qt-widget-invisible-without-changing-the-position-of-the-other-qt/34663079#34663079 -class WidgetHider : public QObject { - Q_OBJECT - public: - WidgetHider(QObject* parent = 0); - bool eventFilter(QObject*, QEvent* ev) override; - void retainSizeFor(QWidget* widget); - void hideWidget(QWidget* w); - void showWidget(QWidget* w); -}; - -#endif // MIXXX_UTIL_WIDGETHIDER_H From b7eac725c7bad493ab4d99777c497d7655d317e7 Mon Sep 17 00:00:00 2001 From: Uwe Klotz Date: Fri, 17 Apr 2020 21:28:50 +0200 Subject: [PATCH 2/2] Delete undefined and unused functions --- src/preferences/dialog/dlgprefrecord.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/preferences/dialog/dlgprefrecord.h b/src/preferences/dialog/dlgprefrecord.h index 82807f124a2f..72707cbd7f99 100644 --- a/src/preferences/dialog/dlgprefrecord.h +++ b/src/preferences/dialog/dlgprefrecord.h @@ -37,9 +37,6 @@ class DlgPrefRecord : public DlgPreferencePage, public Ui::DlgPrefRecordDlg { void apply(const QString &); private: - void retainSizeFor(QWidget* widget); - inline void showWidget(QWidget* widget); - inline void hideWidget(QWidget* widget); void setupEncoderUI(); void loadMetaData(); void updateTextQuality();