From 346c16b4e2ea26f47e0e370a490b7794492a9ebb Mon Sep 17 00:00:00 2001 From: Akshay Nair Date: Sun, 23 Mar 2025 19:48:53 +0530 Subject: Apply clang-tidy suggestions --- src/keymap/KeymapEvaluator.hpp | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) (limited to 'src/keymap/KeymapEvaluator.hpp') diff --git a/src/keymap/KeymapEvaluator.hpp b/src/keymap/KeymapEvaluator.hpp index b98a881..4f8184b 100644 --- a/src/keymap/KeymapEvaluator.hpp +++ b/src/keymap/KeymapEvaluator.hpp @@ -1,43 +1,42 @@ #pragma once #include -#include -#include #include +#include #include #include "keymap/KeySeqParser.hpp" #include "utils.hpp" -typedef std::function KeyAction; +using KeyAction = std::function; struct KeyMap { - KeySequence keySequence; + KeySequence key_sequence; KeyAction action; }; -enum KeyMode { Normal, Insert }; +enum KeyMode : uint8_t { Normal, Insert }; class KeymapEvaluator : public QObject { Q_OBJECT public: - KeymapEvaluator(); + KeymapEvaluator() = default; - void addKeymap(KeyMode mode, QString key, KeyAction action); + void add_keymap(KeyMode mode, const QString &key, KeyAction action); bool evaluate(Qt::KeyboardModifiers modifiers, Qt::Key key); - KeyMode modeFromString(QString modeString); + KeyMode mode_from_string(const QString &mode_string); - DEFINE_SETTER(setCurrentMode, currentMode) - DEFINE_GETTER(getCurrentMode, currentMode) + DEFINE_SETTER(set_current_mode, current_mode) + DEFINE_GETTER(get_current_mode, current_mode) -private: - const QList *currentModeKeys(); - bool isInsertableMode(); +protected: + const QList *current_mode_keys(); + bool is_insertable_mode(); private: - QMap> modalKeys; - KeySeqParser keySeqParser; - KeyMode currentMode = KeyMode::Normal; - KeySequence activeKeySequence; + QMap> modal_keys; + KeySeqParser key_seq_parser; + KeyMode current_mode = KeyMode::Normal; + KeySequence active_key_sequence; }; -- cgit v1.3.1