From 9d433ff8b4f2f79c5eb4f01804c7efc2d363888b Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles@charleskerr.com>
Date: Sun, 7 Jan 2024 14:21:05 -0600
Subject: [PATCH] fix: misc-include-cleaner clang-tidy warnings (#6502)

---
 gtk/.clang-tidy                     |  1 +
 gtk/Actions.cc                      |  7 ++-----
 gtk/Application.cc                  |  1 -
 gtk/FileList.cc                     |  1 -
 gtk/MessageLogWindow.cc             |  1 -
 gtk/PathButton.cc                   |  6 ++++--
 gtk/Percents.cc                     |  1 -
 gtk/PrefsDialog.cc                  |  1 -
 gtk/Session.cc                      |  1 -
 gtk/TorrentCellRenderer.cc          | 16 +++++-----------
 gtk/Utils.cc                        | 19 +++++++------------
 libtransmission/.clang-tidy         |  1 +
 libtransmission/announce-list.cc    |  2 --
 libtransmission/cache.cc            |  1 -
 libtransmission/inout.cc            |  1 -
 libtransmission/tr-utp.cc           |  1 +
 qt/.clang-tidy                      |  1 +
 qt/Application.cc                   |  1 -
 qt/Formatter.cc                     |  2 --
 qt/IconCache.cc                     |  2 --
 qt/Prefs.cc                         |  9 ++-------
 qt/Session.cc                       |  1 -
 qt/TorrentDelegateMin.cc            |  2 --
 qt/Utils.cc                         |  5 +----
 qt/VariantHelpers.cc                |  1 -
 tests/libtransmission/.clang-tidy   |  2 ++
 tests/libtransmission/utils-test.cc |  1 -
 27 files changed, 27 insertions(+), 61 deletions(-)

diff --git a/gtk/.clang-tidy b/gtk/.clang-tidy
index 340e9d0ed..fafe6ed79 100644
--- a/gtk/.clang-tidy
+++ b/gtk/.clang-tidy
@@ -12,6 +12,7 @@ Checks: >
   -cppcoreguidelines-narrowing-conversions,
   hicpp-*,
   misc-*,
+  -misc-include-cleaner,
   modernize-*,
   -modernize-use-trailing-return-type,
   performance-*,
diff --git a/gtk/Actions.cc b/gtk/Actions.cc
index 73e769248..00f46d05f 100644
--- a/gtk/Actions.cc
+++ b/gtk/Actions.cc
@@ -10,24 +10,21 @@
 #include "Session.h"
 #include "Utils.h"
 
-#include <libtransmission/transmission.h>
 #include <libtransmission/quark.h>
 
-#include <giomm/liststore.h>
-#include <giomm/menuattributeiter.h>
-#include <giomm/menulinkiter.h>
 #include <giomm/simpleaction.h>
 #include <glibmm/i18n.h>
 #include <glibmm/variant.h>
 
 #include <array>
-#include <stack>
 #include <string>
 #include <string_view>
 #include <unordered_map>
 
 #if GTKMM_CHECK_VERSION(4, 0, 0)
 #include <giomm/liststore.h>
+#include <giomm/menuattributeiter.h>
+#include <giomm/menulinkiter.h>
 #include <gtkmm/shortcut.h>
 #include <gtkmm/shortcutaction.h>
 #include <gtkmm/shortcuttrigger.h>
diff --git a/gtk/Application.cc b/gtk/Application.cc
index ccccb04ab..2ea2f855f 100644
--- a/gtk/Application.cc
+++ b/gtk/Application.cc
@@ -74,7 +74,6 @@
 #include <sstream>
 #include <string>
 #include <thread>
-#include <tuple>
 #include <utility>
 #include <vector>
 
diff --git a/gtk/FileList.cc b/gtk/FileList.cc
index 3537c9ff8..5704f98d0 100644
--- a/gtk/FileList.cc
+++ b/gtk/FileList.cc
@@ -35,7 +35,6 @@
 #include <fmt/core.h>
 
 #include <algorithm>
-#include <cstddef>
 #include <list>
 #include <memory>
 #include <queue>
diff --git a/gtk/MessageLogWindow.cc b/gtk/MessageLogWindow.cc
index f9afa9429..9536b8787 100644
--- a/gtk/MessageLogWindow.cc
+++ b/gtk/MessageLogWindow.cc
@@ -12,7 +12,6 @@
 #include "Session.h"
 #include "Utils.h"
 
-#include <libtransmission/transmission.h>
 #include <libtransmission/log.h>
 
 #include <giomm/simpleaction.h>
diff --git a/gtk/PathButton.cc b/gtk/PathButton.cc
index 7d6bf3ba7..1ab245329 100644
--- a/gtk/PathButton.cc
+++ b/gtk/PathButton.cc
@@ -8,14 +8,16 @@
 #include "Utils.h"
 
 #include <giomm/file.h>
-#include <glibmm/error.h>
 #include <glibmm/i18n.h>
-#include <glibmm/property.h>
 #include <gtkmm/box.h>
+#if GTKMM_CHECK_VERSION(4, 0, 0)
+#include <glibmm/error.h>
+#include <glibmm/property.h>
 #include <gtkmm/filechooserdialog.h>
 #include <gtkmm/image.h>
 #include <gtkmm/label.h>
 #include <gtkmm/separator.h>
+#endif
 
 #include <vector>
 
diff --git a/gtk/Percents.cc b/gtk/Percents.cc
index 786a71f5b..832b118dd 100644
--- a/gtk/Percents.cc
+++ b/gtk/Percents.cc
@@ -1,6 +1,5 @@
 #include "Percents.h"
 
-#include <libtransmission/transmission.h>
 #include <libtransmission/utils.h>
 
 std::string Percents::to_string() const
diff --git a/gtk/PrefsDialog.cc b/gtk/PrefsDialog.cc
index 780c6e68f..6c05ee891 100644
--- a/gtk/PrefsDialog.cc
+++ b/gtk/PrefsDialog.cc
@@ -14,7 +14,6 @@
 #include "Utils.h"
 
 #include <libtransmission/transmission.h>
-#include <libtransmission/version.h>
 #include <libtransmission/web-utils.h>
 
 #include <glibmm/date.h>
diff --git a/gtk/Session.cc b/gtk/Session.cc
index 739a68c92..b56997de3 100644
--- a/gtk/Session.cc
+++ b/gtk/Session.cc
@@ -18,7 +18,6 @@
 #include <libtransmission/log.h>
 #include <libtransmission/rpcimpl.h>
 #include <libtransmission/torrent-metainfo.h>
-#include <libtransmission/tr-assert.h>
 #include <libtransmission/utils.h> // tr_time()
 #include <libtransmission/variant.h>
 #include <libtransmission/web-utils.h> // tr_urlIsValid()
diff --git a/gtk/TorrentCellRenderer.cc b/gtk/TorrentCellRenderer.cc
index 4f0b5235c..1f7634fbc 100644
--- a/gtk/TorrentCellRenderer.cc
+++ b/gtk/TorrentCellRenderer.cc
@@ -36,16 +36,10 @@
 #include <cstring> // strchr()
 #include <memory>
 #include <optional>
-#include <string>
-#include <string_view>
 
 /* #define TEST_RTL */
 
-using namespace std::string_literals;
-
-/***
-****
-***/
+// ---
 
 namespace
 {
@@ -240,7 +234,7 @@ void set_error_color(
     Gtk::Widget& widget,
     Gtk::CellRendererState flags)
 {
-    static auto const error_color_name = Glib::ustring("tr_error_color"s);
+    static auto const error_color_name = Glib::ustring{ "tr_error_color" };
 
     auto color = Gdk::RGBA();
     if (torrent.get_error_code() != 0 && (flags & TR_GTK_CELL_RENDERER_STATE(SELECTED)) == Gtk::CellRendererState{} &&
@@ -256,9 +250,9 @@ void set_error_color(
 
 std::optional<Gdk::RGBA> get_progress_bar_color(Torrent const& torrent, Gtk::Widget const& widget)
 {
-    static auto const down_color_name = Glib::ustring("tr_transfer_down_color"s);
-    static auto const up_color_name = Glib::ustring("tr_transfer_up_color"s);
-    static auto const idle_color_name = Glib::ustring("tr_transfer_idle_color"s);
+    static auto const down_color_name = Glib::ustring{ "tr_transfer_down_color" };
+    static auto const up_color_name = Glib::ustring{ "tr_transfer_up_color" };
+    static auto const idle_color_name = Glib::ustring{ "tr_transfer_idle_color" };
 
     auto const* color_name = &idle_color_name;
     switch (torrent.get_activity())
diff --git a/gtk/Utils.cc b/gtk/Utils.cc
index f877a4816..d6ac64acd 100644
--- a/gtk/Utils.cc
+++ b/gtk/Utils.cc
@@ -26,8 +26,6 @@
 #include <glibmm/quark.h>
 #include <glibmm/spawn.h>
 #include <gtkmm/cellrenderertext.h>
-#include <gtkmm/eventcontroller.h>
-#include <gtkmm/gesture.h>
 #include <gtkmm/liststore.h>
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/treemodel.h>
@@ -35,6 +33,8 @@
 
 #if GTKMM_CHECK_VERSION(4, 0, 0)
 #include <gdkmm/clipboard.h>
+#include <gtkmm/eventcontroller.h>
+#include <gtkmm/gesture.h>
 #include <gtkmm/gestureclick.h>
 #else
 #include <gdkmm/window.h>
@@ -45,7 +45,6 @@
 
 #include <functional>
 #include <memory>
-#include <optional>
 #include <stack>
 #include <stdexcept>
 #include <utility>
@@ -54,6 +53,8 @@
 #include <gtk/gtk.h>
 
 #if GTK_CHECK_VERSION(4, 0, 0) && defined(GDK_WINDOWING_X11)
+#include <optional>
+
 #include <gdk/x11/gdkx.h>
 #endif
 
@@ -645,9 +646,7 @@ void gtr_open_uri(Glib::ustring const& uri)
     }
 }
 
-/***
-****
-***/
+// ---
 
 namespace
 {
@@ -735,9 +734,7 @@ void gtr_priority_combo_init(Gtk::ComboBox& combo)
         });
 }
 
-/***
-****
-***/
+// ---
 
 void gtr_widget_set_visible(Gtk::Widget& widget, bool is_visible)
 {
@@ -847,9 +844,7 @@ void gtr_window_raise([[maybe_unused]] Gtk::Window& window)
 #endif
 }
 
-/***
-****
-***/
+// ---
 
 void gtr_unrecognized_url_dialog(Gtk::Widget& parent, Glib::ustring const& url)
 {
diff --git a/libtransmission/.clang-tidy b/libtransmission/.clang-tidy
index c84e72510..67169063e 100644
--- a/libtransmission/.clang-tidy
+++ b/libtransmission/.clang-tidy
@@ -23,6 +23,7 @@ Checks: >
   cppcoreguidelines-virtual-class-destructor,
   google-explicit-constructor,
   misc-*,
+  -misc-include-cleaner,
   -misc-no-recursion,
   -misc-non-private-member-variables-in-classes,
   modernize-*,
diff --git a/libtransmission/announce-list.cc b/libtransmission/announce-list.cc
index ef19a5445..1f37155cf 100644
--- a/libtransmission/announce-list.cc
+++ b/libtransmission/announce-list.cc
@@ -8,8 +8,6 @@
 #include <string_view>
 #include <utility>
 
-#include <fmt/core.h>
-
 #include <small/map.hpp>
 
 #include "libtransmission/transmission.h"
diff --git a/libtransmission/cache.cc b/libtransmission/cache.cc
index f55aff521..fdf2b0bce 100644
--- a/libtransmission/cache.cc
+++ b/libtransmission/cache.cc
@@ -9,7 +9,6 @@
 #include <cstdint> // uint8_t
 #include <iterator> // std::distance(), std::next(), std::prev()
 #include <memory>
-#include <mutex>
 #include <numeric> // std::accumulate()
 #include <utility> // std::make_pair()
 #include <vector>
diff --git a/libtransmission/inout.cc b/libtransmission/inout.cc
index e237a48af..747e303bf 100644
--- a/libtransmission/inout.cc
+++ b/libtransmission/inout.cc
@@ -9,7 +9,6 @@
 #include <cstddef>
 #include <optional>
 #include <string_view>
-#include <utility> // std::move
 
 #include <fmt/core.h>
 
diff --git a/libtransmission/tr-utp.cc b/libtransmission/tr-utp.cc
index 61c4869f8..745fd1898 100644
--- a/libtransmission/tr-utp.cc
+++ b/libtransmission/tr-utp.cc
@@ -7,6 +7,7 @@
 #include <cstdint>
 
 #include <fmt/core.h>
+#include <fmt/format.h> // fmt::ptr
 
 #include <libutp/utp.h>
 
diff --git a/qt/.clang-tidy b/qt/.clang-tidy
index 867a46fcd..39b76cb64 100644
--- a/qt/.clang-tidy
+++ b/qt/.clang-tidy
@@ -23,6 +23,7 @@ Checks: >
   -hicpp-multiway-paths-covered,
   -hicpp-signed-bitwise,
   misc-*,
+  -misc-include-cleaner,
   -misc-no-recursion,
   -misc-non-private-member-variables-in-classes,
   modernize-*,
diff --git a/qt/Application.cc b/qt/Application.cc
index 902a2488a..9f8d244fb 100644
--- a/qt/Application.cc
+++ b/qt/Application.cc
@@ -33,7 +33,6 @@
 #include <libtransmission/version.h>
 
 #include "AddData.h"
-#include "Formatter.h"
 #include "InteropHelper.h"
 #include "MainWindow.h"
 #include "OptionsDialog.h"
diff --git a/qt/Formatter.cc b/qt/Formatter.cc
index cda61b447..1160f6003 100644
--- a/qt/Formatter.cc
+++ b/qt/Formatter.cc
@@ -3,8 +3,6 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <libtransmission/transmission.h>
-
 #include <libtransmission/values.h>
 
 #include "Formatter.h"
diff --git a/qt/IconCache.cc b/qt/IconCache.cc
index 121cbe70e..480dcd544 100644
--- a/qt/IconCache.cc
+++ b/qt/IconCache.cc
@@ -30,8 +30,6 @@
 #endif
 #endif
 
-#include <libtransmission/transmission.h>
-
 #include <optional>
 #include <utility>
 
diff --git a/qt/Prefs.cc b/qt/Prefs.cc
index bedc63b91..47c738eff 100644
--- a/qt/Prefs.cc
+++ b/qt/Prefs.cc
@@ -19,7 +19,6 @@
 #endif
 
 #include <libtransmission/transmission.h>
-#include <libtransmission/utils.h>
 #include <libtransmission/variant.h>
 
 #include "CustomVariantType.h"
@@ -30,9 +29,7 @@
 using ::trqt::variant_helpers::dictAdd;
 using ::trqt::variant_helpers::getValue;
 
-/***
-****
-***/
+// ---
 
 namespace
 {
@@ -513,9 +510,7 @@ QDateTime Prefs::getDateTime(int key) const
     return values_[key].toDateTime();
 }
 
-/***
-****
-***/
+// ---
 
 void Prefs::toggleBool(int key)
 {
diff --git a/qt/Session.cc b/qt/Session.cc
index 683b48b4a..471b3a5da 100644
--- a/qt/Session.cc
+++ b/qt/Session.cc
@@ -37,7 +37,6 @@
 #include "RpcQueue.h"
 #include "SessionDialog.h"
 #include "Torrent.h"
-#include "Utils.h"
 #include "VariantHelpers.h"
 
 using ::trqt::variant_helpers::dictAdd;
diff --git a/qt/TorrentDelegateMin.cc b/qt/TorrentDelegateMin.cc
index 3956a6196..cf5959b9f 100644
--- a/qt/TorrentDelegateMin.cc
+++ b/qt/TorrentDelegateMin.cc
@@ -17,8 +17,6 @@
 #include <QPixmapCache>
 #include <QStyleOptionProgressBar>
 
-#include <libtransmission/transmission.h>
-
 #include <libtransmission/utils.h>
 
 #include "StyleHelper.h"
diff --git a/qt/Utils.cc b/qt/Utils.cc
index b1fee892e..78d1c1a85 100644
--- a/qt/Utils.cc
+++ b/qt/Utils.cc
@@ -21,13 +21,10 @@
 #include <QStyle>
 
 #include <libtransmission/transmission.h>
-#include <libtransmission/utils.h> // tr_formatter
 
 #include "Utils.h"
 
-/***
-****
-***/
+// ---
 
 namespace
 {
diff --git a/qt/VariantHelpers.cc b/qt/VariantHelpers.cc
index 928060eb5..aabf28a43 100644
--- a/qt/VariantHelpers.cc
+++ b/qt/VariantHelpers.cc
@@ -13,7 +13,6 @@
 #include <QUrl>
 
 #include "Application.h" // qApp
-#include "Filters.h"
 #include "Speed.h"
 #include "Torrent.h"
 
diff --git a/tests/libtransmission/.clang-tidy b/tests/libtransmission/.clang-tidy
index ada65ff76..6f39896a9 100644
--- a/tests/libtransmission/.clang-tidy
+++ b/tests/libtransmission/.clang-tidy
@@ -5,6 +5,7 @@ Checks: >
   bugprone-*,
   -bugprone-easily-swappable-parameters,
   -bugprone-narrowing-conversions,
+  -bugprone-unchecked-optional-access,
   cert-*,
   clang-analyzer-optin*,
   cppcoreguidelines-*,
@@ -21,6 +22,7 @@ Checks: >
   hicpp-*,
   -hicpp-signed-bitwise,
   misc-*,
+  -misc-include-cleaner,
   -misc-non-private-member-variables-in-classes,
   modernize-*,
   -modernize-use-trailing-return-type,
diff --git a/tests/libtransmission/utils-test.cc b/tests/libtransmission/utils-test.cc
index cae7b71aa..04fe1f8ab 100644
--- a/tests/libtransmission/utils-test.cc
+++ b/tests/libtransmission/utils-test.cc
@@ -3,7 +3,6 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <algorithm>
 #include <array>
 #include <cmath> // sqrt()
 #include <cstdlib> // setenv(), unsetenv()