refactor: KeyboardSettingsPage (#4937)

Chatterino · Nov 4, 2023 · f8b2398 · f8b2398
1 parent b3ed328
commit f8b2398
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 32 deletions.
diff --git a/src/widgets/settingspages/KeyboardSettingsPage.cpp b/src/widgets/settingspages/KeyboardSettingsPage.cpp
@@ -1,4 +1,4 @@
-#include "KeyboardSettingsPage.hpp"
+#include "widgets/settingspages/KeyboardSettingsPage.hpp"
 
 #include "Application.hpp"
 #include "common/QLogging.hpp"
@@ -15,14 +15,41 @@
 #include <QMessageBox>
 #include <QTableView>
 
+namespace {
+
+using namespace chatterino;
+
+void tableCellClicked(const QModelIndex &clicked, EditableModelView *view,
+                      HotkeyModel *model)
+{
+    auto hotkey = getApp()->hotkeys->getHotkeyByName(
+        clicked.siblingAtColumn(0).data(Qt::EditRole).toString());
+    if (!hotkey)
+    {
+        return;  // clicked on header or invalid hotkey
+    }
+    EditHotkeyDialog dialog(hotkey);
+    bool wasAccepted = dialog.exec() == 1;
+
+    if (wasAccepted)
+    {
+        auto newHotkey = dialog.data();
+        auto vectorIndex =
+            getApp()->hotkeys->replaceHotkey(hotkey->name(), newHotkey);
+        getApp()->hotkeys->save();
+    }
+}
+
+}  // namespace
+
 namespace chatterino {
 
 KeyboardSettingsPage::KeyboardSettingsPage()
 {
     LayoutCreator<KeyboardSettingsPage> layoutCreator(this);
     auto layout = layoutCreator.emplace<QVBoxLayout>();
 
-    auto model = getApp()->hotkeys->createModel(nullptr);
+    auto *model = getApp()->hotkeys->createModel(nullptr);
     EditableModelView *view =
         layout.emplace<EditableModelView>(model).getElement();
 
@@ -35,7 +62,7 @@ KeyboardSettingsPage::KeyboardSettingsPage()
         1, QHeaderView::Stretch);
 
     // We can safely ignore this signal connection since we own the view
-    std::ignore = view->addButtonPressed.connect([view, model] {
+    std::ignore = view->addButtonPressed.connect([] {
         EditHotkeyDialog dialog(nullptr);
         bool wasAccepted = dialog.exec() == 1;
 
@@ -48,11 +75,11 @@ KeyboardSettingsPage::KeyboardSettingsPage()
     });
 
     QObject::connect(view->getTableView(), &QTableView::doubleClicked,
-                     [this, view, model](const QModelIndex &clicked) {
-                         this->tableCellClicked(clicked, view, model);
+                     [view, model](const QModelIndex &clicked) {
+                         tableCellClicked(clicked, view, model);
                      });
 
-    QPushButton *resetEverything = new QPushButton("Reset to defaults");
+    auto *resetEverything = new QPushButton("Reset to defaults");
     QObject::connect(resetEverything, &QPushButton::clicked, [this]() {
         auto reply = QMessageBox::question(
             this, "Reset hotkeys",
@@ -67,26 +94,4 @@ KeyboardSettingsPage::KeyboardSettingsPage()
     view->addCustomButton(resetEverything);
 }
 
-void KeyboardSettingsPage::tableCellClicked(const QModelIndex &clicked,
-                                            EditableModelView *view,
-                                            HotkeyModel *model)
-{
-    auto hotkey = getApp()->hotkeys->getHotkeyByName(
-        clicked.siblingAtColumn(0).data(Qt::EditRole).toString());
-    if (!hotkey)
-    {
-        return;  // clicked on header or invalid hotkey
-    }
-    EditHotkeyDialog dialog(hotkey);
-    bool wasAccepted = dialog.exec() == 1;
-
-    if (wasAccepted)
-    {
-        auto newHotkey = dialog.data();
-        auto vectorIndex =
-            getApp()->hotkeys->replaceHotkey(hotkey->name(), newHotkey);
-        getApp()->hotkeys->save();
-    }
-}
-
 }  // namespace chatterino
diff --git a/src/widgets/settingspages/KeyboardSettingsPage.hpp b/src/widgets/settingspages/KeyboardSettingsPage.hpp
@@ -11,10 +11,6 @@ class KeyboardSettingsPage : public SettingsPage
 {
 public:
     KeyboardSettingsPage();
-
-private:
-    void tableCellClicked(const QModelIndex &clicked, EditableModelView *view,
-                          HotkeyModel *model);
 };
 
 }  // namespace chatterino