From 5eff302078523f50224f4e310b252c8cbb7c2210 Mon Sep 17 00:00:00 2001
From: aqua <aqua@iserlohn-fortress.net>
Date: Sat, 10 Sep 2022 19:50:59 +0300
Subject: Fix some clang-tidy warnings

---
 CMakePresets.json     |  1 -
 hooks/clang-tidy.sh   |  9 +++++++++
 src/application.cpp   |  1 +
 src/application.hpp   |  8 ++++----
 src/urlbar/urlbar.cpp |  2 --
 src/urlbar/urlbar.hpp | 12 +++---------
 6 files changed, 17 insertions(+), 16 deletions(-)
 create mode 100755 hooks/clang-tidy.sh

diff --git a/CMakePresets.json b/CMakePresets.json
index de1ec900..b36af7d3 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -14,7 +14,6 @@
         "CMAKE_CXX_STANDARD": "20",
         "CMAKE_CXX_STANDARD_REQUIRED": "YES",
         "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
-        "CMAKE_CXX_CLANG_TIDY": "clang-tidy",
         "MEMORYCHECK_COMMAND": "valgrind",
         "MEMORYCHECK_COMMAND_OPTIONS": "--leak-check=full --show-leak-kinds=all --gen-suppressions=all"
       }
diff --git a/hooks/clang-tidy.sh b/hooks/clang-tidy.sh
new file mode 100755
index 00000000..c51b4f7b
--- /dev/null
+++ b/hooks/clang-tidy.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env sh
+
+if [[ ! -f .clang-tidy ]]; then
+    echo Cannot find .clang-tidy
+    exit 1
+fi
+
+echo Running clang-tidy
+clang-tidy -p cmake-build-debug $(git diff --staged --name-only --diff-filter=AM)
diff --git a/src/application.cpp b/src/application.cpp
index 55343030..38ad7477 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -23,6 +23,7 @@
 // ---------------------------------------------------------------------------------------------------------------
 // Ctor and Dtor
 
+// NOLINTNEXTLINE(modernize-avoid-c-arrays)
 Application::Application(int &argc, char *argv[]) : SingleApplication(argc, argv, true)
 {
   // constructor needs to allow secondary instances (allowSecondary = true)
diff --git a/src/application.hpp b/src/application.hpp
index cc38bda9..f435ef8d 100644
--- a/src/application.hpp
+++ b/src/application.hpp
@@ -23,9 +23,9 @@ class RekonqWindow;
 class PluginLoader;
 class RekonqSettings;
 
-typedef QList<QPointer<PluginLoader>> RekonqPluginList;
-typedef QList<QPointer<RekonqWindow>> RekonqWindowList;
-typedef QList<QPointer<RekonqView>> RekonqViewList;
+using RekonqPluginList = QList<QPointer<PluginLoader>>;
+using RekonqWindowList = QList<QPointer<RekonqWindow>>;
+using RekonqViewList = QList<QPointer<RekonqView>>;
 
 // ---------------------------------------------------------------------------------------------------------------
 
@@ -36,7 +36,7 @@ class Application : public SingleApplication {
   Q_OBJECT
 
 public:
-  Application(int &argc, char *argv[]);
+  Application(int &argc, char *argv[]); // NOLINT(modernize-avoid-c-arrays)
   ~Application() override;
 
   REKONQ_TEST_VIRTUAL bool registerPlugin(const QString &path) REKONQ_TEST_PURE;
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index f3a34a36..fcd9f7d3 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -30,8 +30,6 @@ IconButton::IconButton(QWidget *parent) : QToolButton(parent)
   setContextMenuPolicy(Qt::PreventContextMenu);
 }
 
-void IconButton::mouseReleaseEvent(QMouseEvent *event) { emit clicked(event->globalPos()); }
-
 // -----------------------------------------------------------------------------------------------------------
 
 QString guessUrlWithCustomFirstLevel(const QString &str1, const QString &str2)
diff --git a/src/urlbar/urlbar.hpp b/src/urlbar/urlbar.hpp
index da34151e..98e8368d 100644
--- a/src/urlbar/urlbar.hpp
+++ b/src/urlbar/urlbar.hpp
@@ -24,16 +24,10 @@ class IconButton : public QToolButton {
 
 public:
   explicit IconButton(QWidget *parent = nullptr);
-
-signals:
-  void clicked(QPoint);
-
-protected:
-  void mouseReleaseEvent(QMouseEvent *event);
 };
 
 // Definitions
-typedef QList<IconButton *> IconButtonPointerList;
+using IconButtonPointerList = QList<IconButton *>;
 
 class UrlBar : public QLineEdit {
   Q_OBJECT
@@ -91,8 +85,8 @@ public slots:
   // void showSSLInfo(QPoint);
 
 protected:
-  void paintEvent(QPaintEvent *event);
-  void resizeEvent(QResizeEvent *);
+  void paintEvent(QPaintEvent *event) override;
+  void resizeEvent(QResizeEvent *) override;
   /*
       void keyReleaseEvent(QKeyEvent *event);
       void dropEvent(QDropEvent *event);
-- 
cgit v1.2.1