From 18722203f331faa9fe96cf55691667011eff65bf Mon Sep 17 00:00:00 2001 From: Michael Gregorius Date: Sat, 8 Jul 2023 14:20:27 +0200 Subject: [PATCH] Remove enum for knob types --- include/FloatModelEditorBase.h | 12 +----------- src/gui/LadspaWidgetFactory.cpp | 2 +- src/gui/widgets/FloatModelEditorBase.cpp | 13 ++----------- 3 files changed, 4 insertions(+), 23 deletions(-) diff --git a/include/FloatModelEditorBase.h b/include/FloatModelEditorBase.h index 1a8b6e40f..d9fbd957b 100644 --- a/include/FloatModelEditorBase.h +++ b/include/FloatModelEditorBase.h @@ -43,12 +43,6 @@ namespace lmms::gui class SimpleTextFloat; -enum knobTypesTemp -{ - knobDark_28Temp, knobBright_26Temp, knobSmall_17Temp, knobVintage_32Temp, knobStyledTemp -} ; - - void convertPixmapToGrayScaleTemp(QPixmap &pixMap); class LMMS_EXPORT FloatModelEditorBase : public QWidget, public FloatModelView @@ -81,7 +75,6 @@ class LMMS_EXPORT FloatModelEditorBase : public QWidget, public FloatModelView void initUi( const QString & _name ); //!< to be called by ctors public: - FloatModelEditorBase( knobTypesTemp _knob_num, QWidget * _parent = nullptr, const QString & _name = QString() ); FloatModelEditorBase( QWidget * _parent = nullptr, const QString & _name = QString() ); //!< default ctor FloatModelEditorBase( const FloatModelEditorBase& other ) = delete; @@ -197,10 +190,7 @@ private: QColor m_arcInactiveColor; QColor m_textColor; - - knobTypesTemp m_knobNum; - -} ; +}; } // namespace lmms::gui diff --git a/src/gui/LadspaWidgetFactory.cpp b/src/gui/LadspaWidgetFactory.cpp index ac1f9beb3..70868e791 100644 --- a/src/gui/LadspaWidgetFactory.cpp +++ b/src/gui/LadspaWidgetFactory.cpp @@ -68,7 +68,7 @@ QWidget * LadspaWidgetFactory::createWidget(LadspaControl * ladspaControl, QWidg knob->setLabel(name); break;*/ { - FloatModelEditorBase * fme = new FloatModelEditorBase(knobBright_26Temp, parent, name); + FloatModelEditorBase * fme = new FloatModelEditorBase(parent, name); fme->setModel(ladspaControl->knobModel()); fme->setLabel(name); fme->setHintText(QObject::tr("Value:"), ""); diff --git a/src/gui/widgets/FloatModelEditorBase.cpp b/src/gui/widgets/FloatModelEditorBase.cpp index 535c0aa9a..2d85ccd62 100644 --- a/src/gui/widgets/FloatModelEditorBase.cpp +++ b/src/gui/widgets/FloatModelEditorBase.cpp @@ -59,7 +59,7 @@ SimpleTextFloat * FloatModelEditorBase::s_textFloat = nullptr; -FloatModelEditorBase::FloatModelEditorBase( knobTypesTemp _knob_num, QWidget * _parent, const QString & _name ) : +FloatModelEditorBase::FloatModelEditorBase(QWidget * _parent, const QString & _name ) : QWidget( _parent ), FloatModelView( new FloatModel( 0, 0, 0, 1, nullptr, _name, true ), this ), m_label( "" ), @@ -70,20 +70,11 @@ FloatModelEditorBase::FloatModelEditorBase( knobTypesTemp _knob_num, QWidget * _ m_buttonPressed( false ), m_angle( -10 ), m_lineWidth( 0 ), - m_textColor( 255, 255, 255 ), - m_knobNum( _knob_num ) + m_textColor( 255, 255, 255 ) { initUi( _name ); } -FloatModelEditorBase::FloatModelEditorBase( QWidget * _parent, const QString & _name ) : - FloatModelEditorBase( knobBright_26Temp, _parent, _name ) -{ -} - - - - void FloatModelEditorBase::initUi( const QString & _name ) { if( s_textFloat == nullptr )