From c8734755c5df1bea2101ccee1ab98f6e3c087d16 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Thu, 1 May 2025 11:38:11 -0400 Subject: [PATCH] chore: InputFilter, use default for deconstructors / constructors --- src/lib/server/InputFilter.cpp | 33 --------------------------------- src/lib/server/InputFilter.h | 14 +++++++------- 2 files changed, 7 insertions(+), 40 deletions(-) diff --git a/src/lib/server/InputFilter.cpp b/src/lib/server/InputFilter.cpp index 0912f00b1..5f35bbcf9 100644 --- a/src/lib/server/InputFilter.cpp +++ b/src/lib/server/InputFilter.cpp @@ -19,15 +19,6 @@ // ----------------------------------------------------------------------------- // Input Filter Condition Classes // ----------------------------------------------------------------------------- -InputFilter::Condition::Condition() -{ - // do nothing -} - -InputFilter::Condition::~Condition() -{ - // do nothing -} void InputFilter::Condition::enablePrimary(PrimaryClient *) { @@ -57,11 +48,6 @@ InputFilter::KeystrokeCondition::KeystrokeCondition(IEventQueue *events, KeyID k // do nothing } -InputFilter::KeystrokeCondition::~KeystrokeCondition() -{ - // do nothing -} - KeyID InputFilter::KeystrokeCondition::getKey() const { return m_key; @@ -132,11 +118,6 @@ InputFilter::MouseButtonCondition::MouseButtonCondition(IEventQueue *events, But // do nothing } -InputFilter::MouseButtonCondition::~MouseButtonCondition() -{ - // do nothing -} - ButtonID InputFilter::MouseButtonCondition::getButton() const { return m_button; @@ -195,11 +176,6 @@ InputFilter::ScreenConnectedCondition::ScreenConnectedCondition(IEventQueue *eve // do nothing } -InputFilter::ScreenConnectedCondition::~ScreenConnectedCondition() -{ - // do nothing -} - InputFilter::Condition *InputFilter::ScreenConnectedCondition::clone() const { return new ScreenConnectedCondition(m_events, m_screen); @@ -225,15 +201,6 @@ InputFilter::EFilterStatus InputFilter::ScreenConnectedCondition::match(const Ev // ----------------------------------------------------------------------------- // Input Filter Action Classes // ----------------------------------------------------------------------------- -InputFilter::Action::Action() -{ - // do nothing -} - -InputFilter::Action::~Action() -{ - // do nothing -} InputFilter::LockCursorToScreenAction::LockCursorToScreenAction(IEventQueue *events, Mode mode) : m_mode(mode), diff --git a/src/lib/server/InputFilter.h b/src/lib/server/InputFilter.h index 633f635af..567c2fa2a 100644 --- a/src/lib/server/InputFilter.h +++ b/src/lib/server/InputFilter.h @@ -35,8 +35,8 @@ public: class Condition { public: - Condition(); - virtual ~Condition(); + Condition() = default; + virtual ~Condition() = default; virtual Condition *clone() const = 0; virtual std::string format() const = 0; @@ -53,7 +53,7 @@ public: public: KeystrokeCondition(IEventQueue *events, IPlatformScreen::KeyInfo *); KeystrokeCondition(IEventQueue *events, KeyID key, KeyModifierMask mask); - ~KeystrokeCondition() override; + ~KeystrokeCondition() override = default; KeyID getKey() const; KeyModifierMask getMask() const; @@ -78,7 +78,7 @@ public: public: MouseButtonCondition(IEventQueue *events, IPlatformScreen::ButtonInfo *); MouseButtonCondition(IEventQueue *events, ButtonID, KeyModifierMask mask); - ~MouseButtonCondition() override; + ~MouseButtonCondition() override = default; ButtonID getButton() const; KeyModifierMask getMask() const; @@ -99,7 +99,7 @@ public: { public: ScreenConnectedCondition(IEventQueue *events, const std::string &screen); - ~ScreenConnectedCondition() override; + ~ScreenConnectedCondition() override = default; // Condition overrides Condition *clone() const override; @@ -118,8 +118,8 @@ public: class Action { public: - Action(); - virtual ~Action(); + Action() = default; + virtual ~Action() = default; virtual Action *clone() const = 0; virtual std::string format() const = 0;