1 files changed, 16 insertions, 17 deletions

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 <QWidget>
-#include <QtCore/qmap.h>
-#include <QtCore/qnamespace.h>
 #include <QtCore>
+#include <cstdint>
 #include <functional>
 
 #include "keymap/KeySeqParser.hpp"
 #include "utils.hpp"
 
-typedef std::function<void()> KeyAction;
+using KeyAction = std::function<void()>;
 
 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<KeyMap> *currentModeKeys();
-  bool isInsertableMode();
+protected:
+  const QList<KeyMap> *current_mode_keys();
+  bool is_insertable_mode();
 
 private:
-  QMap<KeyMode, QList<KeyMap>> modalKeys;
-  KeySeqParser keySeqParser;
-  KeyMode currentMode = KeyMode::Normal;
-  KeySequence activeKeySequence;
+  QMap<KeyMode, QList<KeyMap>> modal_keys;
+  KeySeqParser key_seq_parser;
+  KeyMode current_mode = KeyMode::Normal;
+  KeySequence active_key_sequence;
 };