From 8f19fe1cb2ae9a965c5d1e0d39808513b9bf8f11 Mon Sep 17 00:00:00 2001
From: wwmm <wellingtonwallace@gmail.com>
Date: Sat, 9 Mar 2024 16:45:45 -0300
Subject: [PATCH] clang-tidy: implementing some suggestions

---
 include/chart.hpp           |  6 ++++--
 include/ui_helpers.hpp      | 24 ++++++++++++++++++------
 src/app_info.cpp            |  1 +
 src/chart.cpp               | 23 +++++++++++++++++++++++
 src/equalizer_band_box.cpp  | 19 +++++++++++++++++++
 src/preferences_general.cpp | 26 +++++++++++++++++++++-----
 src/preferences_window.cpp  | 10 ++++++++++
 7 files changed, 96 insertions(+), 13 deletions(-)

diff --git a/include/chart.hpp b/include/chart.hpp
index b3cdd1127..458fd62d0 100644
--- a/include/chart.hpp
+++ b/include/chart.hpp
@@ -20,12 +20,14 @@
 #pragma once
 
 #include <adwaita.h>
+#include <gdk/gdk.h>
+#include <glib-object.h>
+#include <glibconfig.h>
+#include <gtk/gtkshortcut.h>
 #define FMT_HEADER_ONLY
 #include <fmt/core.h>
 #include <fmt/format.h>
 #include <sigc++/sigc++.h>
-#include <algorithm>
-#include <ranges>
 #include <string>
 #include <vector>
 #include "ui_helpers.hpp"
diff --git a/include/ui_helpers.hpp b/include/ui_helpers.hpp
index d8b09f156..1cbb5ebc3 100644
--- a/include/ui_helpers.hpp
+++ b/include/ui_helpers.hpp
@@ -20,18 +20,30 @@
 #pragma once
 
 #include <adwaita.h>
+#include <gio/gio.h>
+#include <glib-object.h>
+#include <glib.h>
+#include <glib/gvariant.h>
+#include <glib/gvarianttype.h>
+#include <gtk/deprecated/gtkcomboboxtext.h>
+#include <gtk/gtk.h>
+#include <gtk/gtkdropdown.h>
+#include <gtk/gtklabel.h>
+#include <gtk/gtklevelbar.h>
+#include <gtk/gtkscale.h>
+#include <gtk/gtkshortcut.h>
+#include <gtk/gtkspinbutton.h>
+#include <gtk/gtkstringlist.h>
+#include <gtk/gtkswitch.h>
+#include <gtk/gtktogglebutton.h>
+#include <sys/types.h>
+#include <locale>
 #define FMT_HEADER_ONLY
 #include <fmt/core.h>
 #include <fmt/format.h>
 #include <glib/gi18n.h>
-#include <algorithm>
-#include <iostream>
-#include <map>
-#include <sstream>
 #include <string>
 #include "string_literal_wrapper.hpp"
-#include "tags_app.hpp"
-#include "tags_plugin_name.hpp"
 #include "util.hpp"
 
 namespace ui {
diff --git a/src/app_info.cpp b/src/app_info.cpp
index 1e3ba16e0..a63932164 100644
--- a/src/app_info.cpp
+++ b/src/app_info.cpp
@@ -19,6 +19,7 @@
 
 #include "app_info.hpp"
 #include <STTypes.h>
+#define FMT_HEADER_ONLY
 #include <fmt/core.h>
 #include <fmt/format.h>
 #include <gio/gio.h>
diff --git a/src/chart.cpp b/src/chart.cpp
index 2e2e952e7..1a880a10e 100644
--- a/src/chart.cpp
+++ b/src/chart.cpp
@@ -18,7 +18,30 @@
  */
 
 #include "chart.hpp"
+#include <cairo.h>
+#include <fmt/format.h>
+#include <gdk/gdk.h>
+#include <glib-object.h>
+#include <gobject/gobject.h>
+#include <graphene.h>
+#include <gsk/gsk.h>
+#include <gsk/gskroundedrect.h>
+#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
+#include <gtk/gtkeventcontrollermotion.h>
+#include <gtk/gtkshortcut.h>
+#include <pango/pango-font.h>
+#include <pango/pango-layout.h>
+#include <sys/types.h>
+#include <algorithm>
+#include <array>
+#include <cmath>
+#include <cstddef>
+#include <string>
+#include <vector>
 #include "tags_resources.hpp"
+#include "ui_helpers.hpp"
+#include "util.hpp"
 
 namespace ui::chart {
 
diff --git a/src/equalizer_band_box.cpp b/src/equalizer_band_box.cpp
index 4ab400024..ddc1f2346 100644
--- a/src/equalizer_band_box.cpp
+++ b/src/equalizer_band_box.cpp
@@ -18,6 +18,25 @@
  */
 
 #include "equalizer_band_box.hpp"
+#include <adwaita.h>
+#include <fmt/core.h>
+#include <fmt/format.h>
+#include <gio/gio.h>
+#include <glib-object.h>
+#include <glib.h>
+#include <gobject/gobject.h>
+#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
+#include <gtk/gtkbutton.h>
+#include <gtk/gtkpopover.h>
+#include <gtk/gtkscale.h>
+#include <gtk/gtkspinbutton.h>
+#include <gtk/gtkswitch.h>
+#include "tags_app.hpp"
+#include "tags_equalizer.hpp"
+#include "tags_resources.hpp"
+#include "ui_helpers.hpp"
+#include "util.hpp"
 
 namespace ui::equalizer_band_box {
 
diff --git a/src/preferences_general.cpp b/src/preferences_general.cpp
index 10df17313..34e0e4bbd 100644
--- a/src/preferences_general.cpp
+++ b/src/preferences_general.cpp
@@ -18,6 +18,20 @@
  */
 
 #include "preferences_general.hpp"
+#include <adwaita.h>
+#include <gio/gio.h>
+#include <glib-object.h>
+#include <glib.h>
+#include <gobject/gobject.h>
+#include <gtk/gtk.h>
+#include <gtk/gtkspinbutton.h>
+#include <gtk/gtkswitch.h>
+#include <filesystem>
+#include <fstream>
+#include "tags_app.hpp"
+#include "tags_resources.hpp"
+#include "ui_helpers.hpp"
+#include "util.hpp"
 
 namespace ui::preferences::general {
 
@@ -27,7 +41,8 @@ struct _PreferencesGeneral {
   AdwPreferencesPage parent_instance;
 
   GtkSwitch *enable_autostart, *process_all_inputs, *process_all_outputs, *theme_switch, *shutdown_on_window_close,
-      *use_cubic_volumes, *inactivity_timer_enable, *autohide_popovers, *exclude_monitor_streams, *show_native_plugin_ui;
+      *use_cubic_volumes, *inactivity_timer_enable, *autohide_popovers, *exclude_monitor_streams,
+      *show_native_plugin_ui;
 
   GtkSpinButton *inactivity_timeout, *meters_update_interval, *lv2ui_update_frequency;
 
@@ -128,12 +143,13 @@ void preferences_general_init(PreferencesGeneral* self) {
   // initializing some widgets
 
   gsettings_bind_widgets<"process-all-inputs", "process-all-outputs", "use-dark-theme", "shutdown-on-window-close",
-                         "use-cubic-volumes", "autohide-popovers", "exclude-monitor-streams", "inactivity-timer-enable", "inactivity-timeout",
-                         "meters-update-interval", "lv2ui-update-frequency", "show-native-plugin-ui">(
+                         "use-cubic-volumes", "autohide-popovers", "exclude-monitor-streams", "inactivity-timer-enable",
+                         "inactivity-timeout", "meters-update-interval", "lv2ui-update-frequency",
+                         "show-native-plugin-ui">(
       self->settings, self->process_all_inputs, self->process_all_outputs, self->theme_switch,
       self->shutdown_on_window_close, self->use_cubic_volumes, self->autohide_popovers, self->exclude_monitor_streams,
-      self->inactivity_timer_enable, self->inactivity_timeout, self->meters_update_interval, self->lv2ui_update_frequency,
-      self->show_native_plugin_ui);
+      self->inactivity_timer_enable, self->inactivity_timeout, self->meters_update_interval,
+      self->lv2ui_update_frequency, self->show_native_plugin_ui);
 
 #ifdef ENABLE_LIBPORTAL
   libportal::init(self->enable_autostart, self->shutdown_on_window_close);
diff --git a/src/preferences_window.cpp b/src/preferences_window.cpp
index f7a9a7e7c..a58eecd58 100644
--- a/src/preferences_window.cpp
+++ b/src/preferences_window.cpp
@@ -18,7 +18,17 @@
  */
 
 #include "preferences_window.hpp"
+#include <adwaita.h>
+#include <glib-object.h>
+#include <gobject/gobject.h>
+#include <gtk/gtk.h>
+#include <string>
 #include "config.h"
+#include "preferences_general.hpp"
+#include "preferences_spectrum.hpp"
+#include "tags_app.hpp"
+#include "tags_resources.hpp"
+#include "util.hpp"
 
 namespace ui::preferences::window {