From 84d927ad503ddccc3477508d9321fc2c55b1599f Mon Sep 17 00:00:00 2001 From: taj_ny Date: Tue, 17 Mar 2026 08:50:08 +0100 Subject: [PATCH] rename [something]Impl virtual methods to do[something] --- src/libinputactions/actions/Action.cpp | 2 +- src/libinputactions/actions/Action.h | 4 ++-- src/libinputactions/actions/ActionGroup.cpp | 2 +- src/libinputactions/actions/ActionGroup.h | 2 +- src/libinputactions/actions/CommandAction.cpp | 2 +- src/libinputactions/actions/CommandAction.h | 2 +- src/libinputactions/actions/CustomAction.cpp | 2 +- src/libinputactions/actions/CustomAction.h | 2 +- src/libinputactions/actions/InputAction.cpp | 2 +- src/libinputactions/actions/InputAction.h | 2 +- src/libinputactions/actions/PlasmaGlobalShortcutAction.cpp | 2 +- src/libinputactions/actions/PlasmaGlobalShortcutAction.h | 2 +- src/libinputactions/actions/ReplaceTextAction.cpp | 2 +- src/libinputactions/actions/ReplaceTextAction.h | 2 +- src/libinputactions/actions/SleepAction.cpp | 2 +- src/libinputactions/actions/SleepAction.h | 2 +- src/libinputactions/conditions/CanReplaceTextCondition.cpp | 2 +- src/libinputactions/conditions/CanReplaceTextCondition.h | 2 +- src/libinputactions/conditions/Condition.cpp | 4 ++-- src/libinputactions/conditions/Condition.h | 2 +- src/libinputactions/conditions/ConditionGroup.cpp | 2 +- src/libinputactions/conditions/ConditionGroup.h | 2 +- src/libinputactions/conditions/CustomCondition.cpp | 2 +- src/libinputactions/conditions/CustomCondition.h | 2 +- src/libinputactions/conditions/VariableCondition.cpp | 2 +- src/libinputactions/conditions/VariableCondition.h | 2 +- 26 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/libinputactions/actions/Action.cpp b/src/libinputactions/actions/Action.cpp index 997cd71..9cccb66 100644 --- a/src/libinputactions/actions/Action.cpp +++ b/src/libinputactions/actions/Action.cpp @@ -39,7 +39,7 @@ void Action::aboutToExecute() void Action::execute(const ActionExecutionArguments &args) { qCDebug(INPUTACTIONS) << QString("Executing action \"%1\"").arg(m_id); - executeImpl(args); + doExecute(args); } bool Action::async() const diff --git a/src/libinputactions/actions/Action.h b/src/libinputactions/actions/Action.h index b247436..8292b09 100644 --- a/src/libinputactions/actions/Action.h +++ b/src/libinputactions/actions/Action.h @@ -60,7 +60,7 @@ class Action void aboutToExecute(); /** * Do not call directly, use ActionExecutor instead. - * @see executeImpl + * @see doExecute */ void execute(const ActionExecutionArguments &args); /** @@ -101,7 +101,7 @@ class Action /** * This method is not guaranteed to be called from the main thread. */ - virtual void executeImpl(const ActionExecutionArguments &args) {} + virtual void doExecute(const ActionExecutionArguments &args) {} private: std::shared_ptr m_condition; diff --git a/src/libinputactions/actions/ActionGroup.cpp b/src/libinputactions/actions/ActionGroup.cpp index e33692c..26fe920 100644 --- a/src/libinputactions/actions/ActionGroup.cpp +++ b/src/libinputactions/actions/ActionGroup.cpp @@ -29,7 +29,7 @@ ActionGroup::ActionGroup(ActionGroupExecutionMode mode) { } -void ActionGroup::executeImpl(const ActionExecutionArguments &args) +void ActionGroup::doExecute(const ActionExecutionArguments &args) { // TODO Each action introduces latency const auto checkCanExecute = [](const auto &action) { diff --git a/src/libinputactions/actions/ActionGroup.h b/src/libinputactions/actions/ActionGroup.h index 93c8561..bb041a4 100644 --- a/src/libinputactions/actions/ActionGroup.h +++ b/src/libinputactions/actions/ActionGroup.h @@ -55,7 +55,7 @@ class ActionGroup : public Action void reset() override; protected: - void executeImpl(const ActionExecutionArguments &args) override; + void doExecute(const ActionExecutionArguments &args) override; private: std::vector> m_actions; diff --git a/src/libinputactions/actions/CommandAction.cpp b/src/libinputactions/actions/CommandAction.cpp index 6726024..8ed7fbb 100644 --- a/src/libinputactions/actions/CommandAction.cpp +++ b/src/libinputactions/actions/CommandAction.cpp @@ -32,7 +32,7 @@ bool CommandAction::async() const return m_wait || m_command.expensive(); } -void CommandAction::executeImpl(const ActionExecutionArguments &args) +void CommandAction::doExecute(const ActionExecutionArguments &args) { const auto command = m_command.get().value_or(""); if (command.isEmpty()) { diff --git a/src/libinputactions/actions/CommandAction.h b/src/libinputactions/actions/CommandAction.h index 0a35ec2..71cd6e9 100644 --- a/src/libinputactions/actions/CommandAction.h +++ b/src/libinputactions/actions/CommandAction.h @@ -46,7 +46,7 @@ class CommandAction void setWait(bool value) { m_wait = value; } protected: - void executeImpl(const ActionExecutionArguments &args) override; + void doExecute(const ActionExecutionArguments &args) override; private: Value m_command; diff --git a/src/libinputactions/actions/CustomAction.cpp b/src/libinputactions/actions/CustomAction.cpp index 9cc3abb..ead1ede 100644 --- a/src/libinputactions/actions/CustomAction.cpp +++ b/src/libinputactions/actions/CustomAction.cpp @@ -38,7 +38,7 @@ bool CustomAction::mergeable() const return m_mergeable; } -void CustomAction::executeImpl(const ActionExecutionArguments &args) +void CustomAction::doExecute(const ActionExecutionArguments &args) { m_function(args); } diff --git a/src/libinputactions/actions/CustomAction.h b/src/libinputactions/actions/CustomAction.h index f500cd3..094f905 100644 --- a/src/libinputactions/actions/CustomAction.h +++ b/src/libinputactions/actions/CustomAction.h @@ -36,7 +36,7 @@ class CustomAction : public Action bool mergeable() const override; protected: - void executeImpl(const ActionExecutionArguments &args) override; + void doExecute(const ActionExecutionArguments &args) override; private: std::function m_function; diff --git a/src/libinputactions/actions/InputAction.cpp b/src/libinputactions/actions/InputAction.cpp index c62c78b..2d7debf 100644 --- a/src/libinputactions/actions/InputAction.cpp +++ b/src/libinputactions/actions/InputAction.cpp @@ -41,7 +41,7 @@ InputAction::InputAction(std::vector sequence) } } -void InputAction::executeImpl(const ActionExecutionArguments &args) +void InputAction::doExecute(const ActionExecutionArguments &args) { for (const auto &item : m_sequence) { const auto keyboardText = item.keyboardText.get(); diff --git a/src/libinputactions/actions/InputAction.h b/src/libinputactions/actions/InputAction.h index b042d43..014d48d 100644 --- a/src/libinputactions/actions/InputAction.h +++ b/src/libinputactions/actions/InputAction.h @@ -65,7 +65,7 @@ class InputAction : public Action void setDelay(std::chrono::milliseconds value) { m_delay = std::move(value); } protected: - void executeImpl(const ActionExecutionArguments &args) override; + void doExecute(const ActionExecutionArguments &args) override; private: std::vector m_sequence; diff --git a/src/libinputactions/actions/PlasmaGlobalShortcutAction.cpp b/src/libinputactions/actions/PlasmaGlobalShortcutAction.cpp index 2ef0a0d..74cbc86 100644 --- a/src/libinputactions/actions/PlasmaGlobalShortcutAction.cpp +++ b/src/libinputactions/actions/PlasmaGlobalShortcutAction.cpp @@ -28,7 +28,7 @@ PlasmaGlobalShortcutAction::PlasmaGlobalShortcutAction(QString component, QStrin { } -void PlasmaGlobalShortcutAction::executeImpl(const ActionExecutionArguments &args) +void PlasmaGlobalShortcutAction::doExecute(const ActionExecutionArguments &args) { g_plasmaGlobalShortcutInvoker->invoke(m_component, m_shortcut); } diff --git a/src/libinputactions/actions/PlasmaGlobalShortcutAction.h b/src/libinputactions/actions/PlasmaGlobalShortcutAction.h index 275efe5..e1ea795 100644 --- a/src/libinputactions/actions/PlasmaGlobalShortcutAction.h +++ b/src/libinputactions/actions/PlasmaGlobalShortcutAction.h @@ -33,7 +33,7 @@ class PlasmaGlobalShortcutAction : public Action const QString &shortcut() const { return m_shortcut; } protected: - void executeImpl(const ActionExecutionArguments &args) override; + void doExecute(const ActionExecutionArguments &args) override; private: QString m_component; diff --git a/src/libinputactions/actions/ReplaceTextAction.cpp b/src/libinputactions/actions/ReplaceTextAction.cpp index c006ba7..6157f81 100644 --- a/src/libinputactions/actions/ReplaceTextAction.cpp +++ b/src/libinputactions/actions/ReplaceTextAction.cpp @@ -28,7 +28,7 @@ ReplaceTextAction::ReplaceTextAction(std::vector rules) { } -void ReplaceTextAction::executeImpl(const ActionExecutionArguments &args) +void ReplaceTextAction::doExecute(const ActionExecutionArguments &args) { TextSubstitutionRule *rule{}; QThreadHelpers::runOnThread( diff --git a/src/libinputactions/actions/ReplaceTextAction.h b/src/libinputactions/actions/ReplaceTextAction.h index adeb265..418028e 100644 --- a/src/libinputactions/actions/ReplaceTextAction.h +++ b/src/libinputactions/actions/ReplaceTextAction.h @@ -50,7 +50,7 @@ class ReplaceTextAction : public Action bool async() const override; protected: - void executeImpl(const ActionExecutionArguments &args) override; + void doExecute(const ActionExecutionArguments &args) override; private: std::vector m_rules; diff --git a/src/libinputactions/actions/SleepAction.cpp b/src/libinputactions/actions/SleepAction.cpp index 93dbd1f..86aaf0d 100644 --- a/src/libinputactions/actions/SleepAction.cpp +++ b/src/libinputactions/actions/SleepAction.cpp @@ -32,7 +32,7 @@ bool SleepAction::async() const return true; } -void SleepAction::executeImpl(const ActionExecutionArguments &args) +void SleepAction::doExecute(const ActionExecutionArguments &args) { QThread::msleep(m_time.count()); } diff --git a/src/libinputactions/actions/SleepAction.h b/src/libinputactions/actions/SleepAction.h index b479f2a..897fceb 100644 --- a/src/libinputactions/actions/SleepAction.h +++ b/src/libinputactions/actions/SleepAction.h @@ -34,7 +34,7 @@ class SleepAction : public Action bool async() const override; protected: - void executeImpl(const ActionExecutionArguments &args) override; + void doExecute(const ActionExecutionArguments &args) override; private: std::chrono::milliseconds m_time; diff --git a/src/libinputactions/conditions/CanReplaceTextCondition.cpp b/src/libinputactions/conditions/CanReplaceTextCondition.cpp index 7fd8db8..1401856 100644 --- a/src/libinputactions/conditions/CanReplaceTextCondition.cpp +++ b/src/libinputactions/conditions/CanReplaceTextCondition.cpp @@ -30,7 +30,7 @@ CanReplaceTextCondition::CanReplaceTextCondition(std::vectorcanReplaceSurroundingText(rule.regex()); diff --git a/src/libinputactions/conditions/CanReplaceTextCondition.h b/src/libinputactions/conditions/CanReplaceTextCondition.h index 064d8e5..5d44ae8 100644 --- a/src/libinputactions/conditions/CanReplaceTextCondition.h +++ b/src/libinputactions/conditions/CanReplaceTextCondition.h @@ -34,7 +34,7 @@ class CanReplaceTextCondition : public Condition const std::vector &rules() const { return m_rules; } protected: - bool evaluateImpl(const ConditionEvaluationArguments &arguments) override; + bool doEvaluate(const ConditionEvaluationArguments &arguments) override; private: std::vector m_rules; diff --git a/src/libinputactions/conditions/Condition.cpp b/src/libinputactions/conditions/Condition.cpp index 6031f1e..fb3fabe 100644 --- a/src/libinputactions/conditions/Condition.cpp +++ b/src/libinputactions/conditions/Condition.cpp @@ -41,7 +41,7 @@ bool Condition::satisfied(const ConditionEvaluationArguments &arguments) bool Condition::evaluate(const ConditionEvaluationArguments &arguments) { try { - return evaluateImpl(arguments) == !m_negate; + return doEvaluate(arguments) == !m_negate; } catch (const std::exception &e) { qWarning(INPUTACTIONS).noquote() << "Failed to evaluate condition: " << e.what(); if (g_globalConfig->sendNotificationOnError() && !m_exceptionNotificationShown) { @@ -53,7 +53,7 @@ bool Condition::evaluate(const ConditionEvaluationArguments &arguments) } } -bool Condition::evaluateImpl(const ConditionEvaluationArguments &arguments) +bool Condition::doEvaluate(const ConditionEvaluationArguments &arguments) { return true; } diff --git a/src/libinputactions/conditions/Condition.h b/src/libinputactions/conditions/Condition.h index c858cea..12b544a 100644 --- a/src/libinputactions/conditions/Condition.h +++ b/src/libinputactions/conditions/Condition.h @@ -57,7 +57,7 @@ class Condition /** * @see evaluate */ - virtual bool evaluateImpl(const ConditionEvaluationArguments &arguments); + virtual bool doEvaluate(const ConditionEvaluationArguments &arguments); private: bool m_exceptionNotificationShown{}; diff --git a/src/libinputactions/conditions/ConditionGroup.cpp b/src/libinputactions/conditions/ConditionGroup.cpp index 2b43ad6..d3e5c27 100644 --- a/src/libinputactions/conditions/ConditionGroup.cpp +++ b/src/libinputactions/conditions/ConditionGroup.cpp @@ -27,7 +27,7 @@ ConditionGroup::ConditionGroup(ConditionGroupMode mode) { } -bool ConditionGroup::evaluateImpl(const ConditionEvaluationArguments &arguments) +bool ConditionGroup::doEvaluate(const ConditionEvaluationArguments &arguments) { const auto pred = [&arguments](auto &condition) { return condition->evaluate(arguments); diff --git a/src/libinputactions/conditions/ConditionGroup.h b/src/libinputactions/conditions/ConditionGroup.h index ba219a0..69bda61 100644 --- a/src/libinputactions/conditions/ConditionGroup.h +++ b/src/libinputactions/conditions/ConditionGroup.h @@ -48,7 +48,7 @@ class ConditionGroup : public Condition void prepend(const std::shared_ptr &condition); protected: - bool evaluateImpl(const ConditionEvaluationArguments &arguments) override; + bool doEvaluate(const ConditionEvaluationArguments &arguments) override; std::vector> m_conditions; ConditionGroupMode m_mode; diff --git a/src/libinputactions/conditions/CustomCondition.cpp b/src/libinputactions/conditions/CustomCondition.cpp index 487ab38..e827b4a 100644 --- a/src/libinputactions/conditions/CustomCondition.cpp +++ b/src/libinputactions/conditions/CustomCondition.cpp @@ -26,7 +26,7 @@ CustomCondition::CustomCondition(std::function function); protected: - bool evaluateImpl(const ConditionEvaluationArguments &arguments) override; + bool doEvaluate(const ConditionEvaluationArguments &arguments) override; private: std::function m_function; diff --git a/src/libinputactions/conditions/VariableCondition.cpp b/src/libinputactions/conditions/VariableCondition.cpp index c94d6d4..15bbcb1 100644 --- a/src/libinputactions/conditions/VariableCondition.cpp +++ b/src/libinputactions/conditions/VariableCondition.cpp @@ -39,7 +39,7 @@ VariableCondition::VariableCondition(const QString &variableName, const ValuegetVariable(m_variableName); if (!variable) { diff --git a/src/libinputactions/conditions/VariableCondition.h b/src/libinputactions/conditions/VariableCondition.h index d545f84..633f904 100644 --- a/src/libinputactions/conditions/VariableCondition.h +++ b/src/libinputactions/conditions/VariableCondition.h @@ -39,7 +39,7 @@ class VariableCondition : public Condition ComparisonOperator comparisonOperator() const { return m_comparisonOperator; } protected: - bool evaluateImpl(const ConditionEvaluationArguments &arguments) override; + bool doEvaluate(const ConditionEvaluationArguments &arguments) override; private: QString m_variableName;