chore: clean up #includes

2026-02-14 23:19:34 +00:00 · 2026-02-11 22:22:59 -06:00
parent faeca817cf
commit 8ad8d5595b
30 changed files with 13 additions and 40 deletions
--- a/gtk/.clang-format
+++ b/gtk/.clang-format
@@ -5,10 +5,10 @@ IncludeBlocks: Regroup
 IncludeCategories:
  - Regex: '^<libtransmission-app/'
    Priority: 3
-  - Regex: '^<libtransmission/transmission.h>'
+  - Regex: '^[<"]libtransmission/transmission.h[">]'
    Priority: 4
    SortPriority: 3
-  - Regex: '^<libtransmission/'
+  - Regex: '^[<"]libtransmission/'
    Priority: 4
    SortPriority: 4
  - Regex: '^[<"]lib/base/'
--- a/gtk/Application.cc
+++ b/gtk/Application.cc
@@ -24,11 +24,10 @@
 #include "Torrent.h"
 #include "Utils.h"

-#include <libtransmission/transmission.h>
-#include <libtransmission/api-compat.h>
-#include <libtransmission/rpcimpl.h>
-#include <libtransmission/utils.h>
-#include <libtransmission/version.h>
+#include "libtransmission/transmission.h"
+#include "libtransmission/api-compat.h"
+#include "libtransmission/rpcimpl.h"
+#include "libtransmission/version.h"

 #include "lib/base/log.h"
 #include "lib/base/quark.h"
--- a/gtk/DetailsDialog.cc
+++ b/gtk/DetailsDialog.cc
@@ -9,13 +9,14 @@
 #include "FileList.h"
 #include "GtkCompat.h"
 #include "HigWorkarea.h" // GUI_PAD, GUI_PAD_BIG, GUI_PAD_SMALL
-#include "libtransmission/utils.h"
-#include "libtransmission/web-utils.h"
 #include "Prefs.h"
 #include "PrefsDialog.h"
 #include "Session.h"
 #include "Utils.h"

+#include "libtransmission/utils.h"
+#include "libtransmission/web-utils.h"
+
 #include "lib/base/file-utils.h"
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-macros.h"
--- a/gtk/SystemTrayIcon.cc
+++ b/gtk/SystemTrayIcon.cc
@@ -10,7 +10,6 @@
 #include "Utils.h"

 #include <libtransmission/transmission.h>
-#include <libtransmission/utils.h>

 #include <glibmm/i18n.h>
 #include <glibmm/ustring.h>
--- a/gtk/TorrentCellRenderer.cc
+++ b/gtk/TorrentCellRenderer.cc
@@ -10,7 +10,6 @@
 #include "Torrent.h"

 #include <libtransmission/transmission.h>
-#include <libtransmission/utils.h> /* tr_truncd() */

 #include <cairomm/context.h>
 #include <cairomm/refptr.h>
--- a/gtk/TorrentFilter.cc
+++ b/gtk/TorrentFilter.cc
@@ -6,9 +6,10 @@
 #include "TorrentFilter.h"

 #include "FilterBase.hh"
-#include "libtransmission/transmission.h"
 #include "Utils.h"

+#include "libtransmission/transmission.h"
+
 #include "lib/base/tr-macros.h"

 #include <algorithm>
--- a/gtk/main.cc
+++ b/gtk/main.cc
@@ -4,14 +4,12 @@

 #include "Application.h"
 #include "GtkCompat.h"
+#include "libtransmission-app/app.h"
 #include "Notify.h"
 #include "Prefs.h"
 #include "Utils.h"

-#include "libtransmission-app/app.h"
-
 #include "libtransmission/transmission.h"
-#include "libtransmission/utils.h"
 #include "libtransmission/version.h"

 #include "lib/base/serializer.h"
--- a/libtransmission-app/converters.cc
+++ b/libtransmission-app/converters.cc
@@ -19,8 +19,6 @@
 #include "lib/base/string-utils.h"
 #include "lib/base/variant.h"

-#include "libtransmission/utils.h"
-
 #include "libtransmission-app/display-modes.h"
 #include "libtransmission-app/converters.h"

--- a/libtransmission/announcer-http.cc
+++ b/libtransmission/announcer-http.cc
@@ -39,7 +39,6 @@
 #include "libtransmission/peer-mgr.h" /* pex */
 #include "libtransmission/session.h"
 #include "libtransmission/types.h"
-#include "libtransmission/utils.h"
 #include "libtransmission/web-utils.h"
 #include "libtransmission/web.h"

--- a/libtransmission/blocklist.cc
+++ b/libtransmission/blocklist.cc
@@ -40,7 +40,6 @@
 #include "libtransmission/crypto-utils.h"
 #include "libtransmission/net.h"
 #include "libtransmission/types.h"
-#include "libtransmission/utils.h" // for _()

 using namespace std::literals;

--- a/libtransmission/crypto-utils-ccrypto.cc
+++ b/libtransmission/crypto-utils-ccrypto.cc
@@ -17,7 +17,6 @@

 #include "libtransmission/crypto-utils.h"
 #include "libtransmission/types.h"
-#include "libtransmission/utils.h"

 #define TR_CRYPTO_X509_FALLBACK
 #include "crypto-utils-fallback.cc" // NOLINT(bugprone-suspicious-include)
--- a/libtransmission/crypto-utils-mbedtls.cc
+++ b/libtransmission/crypto-utils-mbedtls.cc
@@ -20,7 +20,6 @@

 #include "libtransmission/crypto-utils.h"
 #include "libtransmission/types.h"
-#include "libtransmission/utils.h"

 #define TR_CRYPTO_X509_FALLBACK
 #include "libtransmission/crypto-utils-fallback.cc" // NOLINT(bugprone-suspicious-include)
--- a/libtransmission/crypto-utils-openssl.cc
+++ b/libtransmission/crypto-utils-openssl.cc
@@ -28,7 +28,6 @@

 #include "libtransmission/crypto-utils.h"
 #include "libtransmission/types.h"
-#include "libtransmission/utils.h"

 #if !defined(WITH_OPENSSL)
 #error OPENSSL module
--- a/libtransmission/crypto-utils-wolfssl.cc
+++ b/libtransmission/crypto-utils-wolfssl.cc
@@ -20,7 +20,6 @@

 #include "libtransmission/crypto-utils.h"
 #include "libtransmission/types.h"
-#include "libtransmission/utils.h"

 #ifndef WITH_WOLFSSL
 #error wolfssl module
--- a/libtransmission/inout.cc
+++ b/libtransmission/inout.cc
@@ -26,7 +26,6 @@
 #include "libtransmission/torrent-files.h"
 #include "libtransmission/torrent.h"
 #include "libtransmission/types.h"
-#include "libtransmission/utils.h"

 using namespace std::literals;

--- a/libtransmission/makemeta.cc
+++ b/libtransmission/makemeta.cc
@@ -35,7 +35,6 @@
 #include "libtransmission/session.h" // TR_NAME
 #include "libtransmission/torrent-files.h"
 #include "libtransmission/types.h"
-#include "libtransmission/utils.h" // for _()
 #include "libtransmission/version.h"

 using namespace std::literals;
--- a/libtransmission/open-files.cc
+++ b/libtransmission/open-files.cc
@@ -21,7 +21,6 @@

 #include "libtransmission/open-files.h"
 #include "libtransmission/types.h"
-#include "libtransmission/utils.h" // _()

 namespace
 {
--- a/libtransmission/peer-io.cc
+++ b/libtransmission/peer-io.cc
@@ -35,7 +35,6 @@
 #include "libtransmission/session.h"
 #include "libtransmission/timer.h"
 #include "libtransmission/types.h"
-#include "libtransmission/utils.h" // for _()

 struct sockaddr;

--- a/libtransmission/port-forwarding-upnp.cc
+++ b/libtransmission/port-forwarding-upnp.cc
@@ -28,7 +28,6 @@
 #include "libtransmission/net.h"
 #include "libtransmission/port-forwarding-upnp.h"
 #include "libtransmission/types.h"
-#include "libtransmission/utils.h" // for _(), tr_strerror()

 #ifndef MINIUPNPC_API_VERSION
 #error miniupnpc >= 1.7 is required
--- a/libtransmission/port-forwarding.cc
+++ b/libtransmission/port-forwarding.cc
@@ -18,7 +18,6 @@
 #include "libtransmission/port-forwarding-upnp.h"
 #include "libtransmission/port-forwarding.h"
 #include "libtransmission/timer.h"
-#include "libtransmission/utils.h" // for _()

 struct tr_upnp;

--- a/libtransmission/session-alt-speeds.cc
+++ b/libtransmission/session-alt-speeds.cc
@@ -16,7 +16,6 @@

 #include "libtransmission/session-alt-speeds.h"
 #include "libtransmission/types.h"
-#include "libtransmission/utils.h" // for _()

 using namespace std::literals;

--- a/libtransmission/session-id.cc
+++ b/libtransmission/session-id.cc
@@ -23,7 +23,6 @@
 #include "libtransmission/crypto-utils.h" // for tr_rand_obj()
 #include "libtransmission/platform.h"
 #include "libtransmission/session-id.h"
-#include "libtransmission/utils.h" // for _()

 using namespace std::literals;

--- a/libtransmission/torrent-metainfo.cc
+++ b/libtransmission/torrent-metainfo.cc
@@ -27,7 +27,6 @@
 #include "libtransmission/torrent-files.h"
 #include "libtransmission/torrent-metainfo.h"
 #include "libtransmission/types.h"
-#include "libtransmission/utils.h"

 using namespace std::literals;

--- a/libtransmission/tr-udp.cc
+++ b/libtransmission/tr-udp.cc
@@ -25,7 +25,6 @@
 #include "libtransmission/net.h"
 #include "libtransmission/session.h"
 #include "libtransmission/tr-utp.h"
-#include "libtransmission/utils.h"

 namespace
 {
--- a/libtransmission/tr-utp.cc
+++ b/libtransmission/tr-utp.cc
@@ -22,7 +22,6 @@
 #include "libtransmission/peer-socket.h"
 #include "libtransmission/session.h"
 #include "libtransmission/tr-utp.h"
-#include "libtransmission/utils.h"

 using namespace std::literals;

--- a/libtransmission/watchdir-inotify.cc
+++ b/libtransmission/watchdir-inotify.cc
@@ -27,7 +27,6 @@
 #include "lib/base/tr-strbuf.h"

 #define LIBTRANSMISSION_WATCHDIR_MODULE
-#include "libtransmission/utils.h"
 #include "libtransmission/watchdir.h"
 #include "libtransmission/watchdir-base.h"

--- a/libtransmission/watchdir-kqueue.cc
+++ b/libtransmission/watchdir-kqueue.cc
@@ -27,7 +27,6 @@
 #include "lib/base/tr-strbuf.h"

 #define LIBTRANSMISSION_WATCHDIR_MODULE
-#include "libtransmission/utils.h" // for _()
 #include "libtransmission/utils-ev.h"
 #include "libtransmission/watchdir-base.h"

--- a/libtransmission/watchdir-win32.cc
+++ b/libtransmission/watchdir-win32.cc
@@ -27,7 +27,6 @@
 #define LIBTRANSMISSION_WATCHDIR_MODULE
 #include "libtransmission/net.h"
 #include "libtransmission/types.h"
-#include "libtransmission/utils.h"
 #include "libtransmission/watchdir-base.h"

 namespace tr
--- a/libtransmission/watchdir.cc
+++ b/libtransmission/watchdir.cc
@@ -17,7 +17,6 @@
 #include "lib/base/tr-strbuf.h"

 #define LIBTRANSMISSION_WATCHDIR_MODULE
-#include "libtransmission/utils.h" // for _()
 #include "libtransmission/watchdir-base.h"

 using namespace std::literals;
--- a/libtransmission/web-utils.cc
+++ b/libtransmission/web-utils.cc
@@ -25,8 +25,7 @@
 #include "lib/base/tr-assert.h"
 #include "lib/base/tr-strbuf.h"

-#include "libtransmission/net.h"
-#include "libtransmission/utils.h"
+#include "libtransmission/net.h" // tr_address::from_string()
 #include "libtransmission/web-utils.h"

 using namespace std::literals;