From 6ae6e39a17d179c37eb407686b6af061b1216354 Mon Sep 17 00:00:00 2001 From: Johannes Lorenz Date: Sat, 4 Jun 2022 23:50:57 +0200 Subject: [PATCH] Lv2ControlBase: Remove unused virtuals They were never used. Possibly they were just in the code because the code originated from #4662 (where the virtuals would also be omittable...). --- include/Lv2ControlBase.h | 5 ----- plugins/Lv2Effect/Lv2FxControls.cpp | 16 ---------------- plugins/Lv2Effect/Lv2FxControls.h | 3 --- plugins/Lv2Instrument/Lv2Instrument.cpp | 16 ---------------- plugins/Lv2Instrument/Lv2Instrument.h | 2 -- 5 files changed, 42 deletions(-) diff --git a/include/Lv2ControlBase.h b/include/Lv2ControlBase.h index c6b08db8cf6..dd1c549b556 100644 --- a/include/Lv2ControlBase.h +++ b/include/Lv2ControlBase.h @@ -142,11 +142,6 @@ class LMMS_EXPORT Lv2ControlBase : public LinkedModelGroups const class TimePos &time, f_cnt_t offset); private: - //! Return the DataFile settings type - virtual DataFile::Types settingsType() = 0; - //! Inform the plugin about a file name change - virtual void setNameFromFile(const QString &fname) = 0; - //! Independent processors //! If this is a mono effect, the vector will have size 2 in order to //! fulfill LMMS' requirement of having stereo input and output diff --git a/plugins/Lv2Effect/Lv2FxControls.cpp b/plugins/Lv2Effect/Lv2FxControls.cpp index a865151dd77..a7fbfc78221 100644 --- a/plugins/Lv2Effect/Lv2FxControls.cpp +++ b/plugins/Lv2Effect/Lv2FxControls.cpp @@ -86,20 +86,4 @@ void Lv2FxControls::changeControl() // TODO: what is that? } - - -DataFile::Types Lv2FxControls::settingsType() -{ - return DataFile::EffectSettings; -} - - - - -void Lv2FxControls::setNameFromFile(const QString &name) -{ - effect()->setDisplayName(name); -} - - } // namespace lmms diff --git a/plugins/Lv2Effect/Lv2FxControls.h b/plugins/Lv2Effect/Lv2FxControls.h index 952e4db6c11..1d7553a3440 100644 --- a/plugins/Lv2Effect/Lv2FxControls.h +++ b/plugins/Lv2Effect/Lv2FxControls.h @@ -60,9 +60,6 @@ private slots: void changeControl(); private: - DataFile::Types settingsType() override; - void setNameFromFile(const QString &name) override; - friend class gui::Lv2FxControlDialog; friend class Lv2Effect; }; diff --git a/plugins/Lv2Instrument/Lv2Instrument.cpp b/plugins/Lv2Instrument/Lv2Instrument.cpp index ae7e371190d..77130bcc260 100644 --- a/plugins/Lv2Instrument/Lv2Instrument.cpp +++ b/plugins/Lv2Instrument/Lv2Instrument.cpp @@ -196,25 +196,9 @@ QString Lv2Instrument::nodeName() const -DataFile::Types Lv2Instrument::settingsType() -{ - return DataFile::InstrumentTrackSettings; -} - - - - -void Lv2Instrument::setNameFromFile(const QString &name) -{ - instrumentTrack()->setName(name); -} - - - namespace gui { - /* Lv2InsView */ diff --git a/plugins/Lv2Instrument/Lv2Instrument.h b/plugins/Lv2Instrument/Lv2Instrument.h index e9a6cc2fd6a..38ffdd680d2 100644 --- a/plugins/Lv2Instrument/Lv2Instrument.h +++ b/plugins/Lv2Instrument/Lv2Instrument.h @@ -97,8 +97,6 @@ private slots: private: QString nodeName() const override; - DataFile::Types settingsType() override; - void setNameFromFile(const QString &name) override; #ifdef LV2_INSTRUMENT_USE_MIDI std::array m_runningNotes = {};