chore: clean up #includes

libtransmission/bandwidth.h

@@ -18,6 +18,7 @@
 
 #include "lib/base/tr-assert.h"
 #include "lib/base/values.h"
+
 #include "libtransmission/types.h"
 
 class tr_peerIo;

libtransmission/bitfield.cc

@@ -9,9 +9,10 @@
 #include <cstdint>
 #include <vector> // std::vector
 
-#include "libtransmission/bitfield.h"
 #include "lib/base/tr-assert.h" // TR_ASSERT, TR_ENABLE_ASSERTS
 
+#include "libtransmission/bitfield.h"
+
 // ---
 
 namespace

libtransmission/cache.h

@@ -17,8 +17,9 @@
 
 #include <small/vector.hpp>
 
-#include "libtransmission/block-info.h"
 #include "lib/base/values.h"
+
+#include "libtransmission/block-info.h"
 #include "libtransmission/types.h"
 
 class tr_torrents;

libtransmission/file-piece-map.cc

@@ -11,11 +11,12 @@
 
 #include <small/set.hpp>
 
+#include "lib/base/tr-assert.h"
+
 #include "libtransmission/bitfield.h"
 #include "libtransmission/block-info.h"
 #include "libtransmission/file-piece-map.h"
 #include "libtransmission/torrent-metainfo.h"
-#include "lib/base/tr-assert.h"
 #include "libtransmission/types.h"
 
 tr_file_piece_map::tr_file_piece_map(tr_torrent_metainfo const& tm)

libtransmission/file-piece-map.h

@@ -14,8 +14,9 @@
 #include <cstddef> // for size_t
 #include <vector>
 
-#include "libtransmission/bitfield.h"
 #include "lib/base/tr-macros.h" // TR_CONSTEXPR_VEC
+
+#include "libtransmission/bitfield.h"
 #include "libtransmission/types.h"
 
 struct tr_block_info;

libtransmission/magnet-metainfo.cc

@@ -17,11 +17,11 @@
 
 #include "lib/base/error-types.h"
 #include "lib/base/error.h"
+#include "lib/base/string-utils.h"
 #include "lib/base/tr-strbuf.h" // for tr_urlbuf
 
 #include "libtransmission/crypto-utils.h"
 #include "libtransmission/magnet-metainfo.h"
-#include "lib/base/string-utils.h"
 #include "libtransmission/types.h" // for tr_sha1_digest_t
 #include "libtransmission/web-utils.h"
 

libtransmission/magnet-metainfo.h

@@ -10,9 +10,10 @@
 #include <string_view>
 #include <vector>
 
+#include "lib/base/tr-macros.h" // TR_CONSTEXPR_VEC, tr_sha1_digest_t
+
 #include "libtransmission/announce-list.h"
 #include "libtransmission/crypto-utils.h"
-#include "lib/base/tr-macros.h" // TR_CONSTEXPR_VEC, tr_sha1_digest_t
 
 struct tr_error;
 

libtransmission/peer-mgr.cc

@@ -30,6 +30,9 @@
 #include "lib/base/i18n.h"
 #include "lib/base/log.h"
 #include "lib/base/quark.h"
+#include "lib/base/string-utils.h"
+#include "lib/base/tr-assert.h"
+#include "lib/base/values.h"
 
 #define LIBTRANSMISSION_PEER_MODULE
 #include "libtransmission/announcer.h"
@@ -46,13 +49,10 @@
 #include "libtransmission/peer-msgs.h"
 #include "libtransmission/peer-socket.h"
 #include "libtransmission/session.h"
-#include "lib/base/string-utils.h"
-#include "lib/base/values.h"
 #include "libtransmission/timer.h"
 #include "libtransmission/torrent-magnet.h"
 #include "libtransmission/torrent.h"
 #include "libtransmission/torrents.h"
-#include "lib/base/tr-assert.h"
 #include "libtransmission/types.h"
 #include "libtransmission/utils.h"
 #include "libtransmission/webseed.h"

libtransmission/peer-mgr.h

@@ -17,11 +17,12 @@
 #include <string>
 #include <vector>
 
+#include "lib/base/tr-assert.h"
+#include "lib/base/variant.h"
+
 #include "libtransmission/blocklist.h"
 #include "libtransmission/handshake.h"
 #include "libtransmission/net.h" /* tr_address */
-#include "lib/base/tr-assert.h"
-#include "lib/base/variant.h"
 #include "libtransmission/types.h"
 #include "libtransmission/utils.h" /* tr_compare_3way */
 

libtransmission/peer-mse.cc

@@ -12,10 +12,11 @@
 
 #include <math/wide_integer/uintwide_t.h>
 
+#include "lib/base/tr-assert.h"
+
 #include "libtransmission/crypto-utils.h" // tr_sha1
 #include "libtransmission/peer-mse.h"
 #include "libtransmission/tr-arc4.h"
-#include "lib/base/tr-assert.h"
 #include "libtransmission/types.h" // tr_sha1_digest_t
 
 // workaround bug in GCC < 10.4

libtransmission/peer-socket.cc

@@ -15,11 +15,11 @@
 
 #include "lib/base/error.h"
 #include "lib/base/log.h"
+#include "lib/base/tr-assert.h"
 
 #include "libtransmission/net.h"
 #include "libtransmission/peer-socket.h"
 #include "libtransmission/session.h"
-#include "lib/base/tr-assert.h"
 
 #define tr_logAddErrorIo(io, msg) tr_logAddError(msg, (io)->display_name())
 #define tr_logAddWarnIo(io, msg) tr_logAddWarn(msg, (io)->display_name())

libtransmission/port-forwarding-natpmp.cc

@@ -21,11 +21,11 @@
 
 #include "lib/base/i18n.h"
 #include "lib/base/log.h"
+#include "lib/base/string-utils.h"
 
 #define LIBTRANSMISSION_PORT_FORWARDING_MODULE
 #include "libtransmission/net.h"
 #include "libtransmission/port-forwarding-natpmp.h"
-#include "lib/base/string-utils.h"
 #include "libtransmission/utils.h"
 
 namespace

libtransmission/port-forwarding.cc

@@ -8,15 +8,16 @@
 #include <memory>
 
 #include <fmt/format.h>
+
 #include "lib/base/i18n.h"
 #include "lib/base/log.h"
+#include "lib/base/tr-assert.h"
 
 #define LIBTRANSMISSION_PORT_FORWARDING_MODULE
 #include "libtransmission/port-forwarding-natpmp.h"
 #include "libtransmission/port-forwarding-upnp.h"
 #include "libtransmission/port-forwarding.h"
 #include "libtransmission/timer.h"
-#include "lib/base/tr-assert.h"
 #include "libtransmission/utils.h" // for _()
 
 struct tr_upnp;

libtransmission/session-alt-speeds.h

@@ -16,9 +16,10 @@
 #include <optional>
 
 #include "lib/base/quark.h"
+#include "lib/base/values.h"
+
 #include "libtransmission/serializer.h"
 #include "libtransmission/types.h" // for TR_SCHED_ALL
-#include "lib/base/values.h"
 
 struct tr_variant;
 

libtransmission/torrent-queue.cc

@@ -9,10 +9,11 @@
 #include <string_view>
 #include <vector>
 
-#include "libtransmission/torrent-queue.h"
 #include "lib/base/tr-strbuf.h"
 #include "lib/base/variant.h"
 
+#include "libtransmission/torrent-queue.h"
+
 namespace
 {
 using namespace std::literals;

libtransmission/torrent.h

@@ -22,6 +22,11 @@
 
 #include <sigslot/signal.hpp>
 
+#include "lib/base/i18n.h"
+#include "lib/base/log.h"
+#include "lib/base/tr-assert.h"
+#include "lib/base/tr-macros.h"
+
 #include "libtransmission/announce-list.h"
 #include "libtransmission/bandwidth.h"
 #include "libtransmission/bitfield.h"
@@ -30,14 +35,10 @@
 #include "libtransmission/crypto-utils.h"
 #include "libtransmission/file-piece-map.h"
 #include "libtransmission/interned-string.h"
-#include "lib/base/log.h"
 #include "libtransmission/session.h"
 #include "libtransmission/torrent-files.h"
 #include "libtransmission/torrent-magnet.h"
 #include "libtransmission/torrent-metainfo.h"
-#include "lib/base/tr-assert.h"
-#include "lib/base/tr-macros.h"
-#include "lib/base/i18n.h"
 #include "libtransmission/types.h"
 #include "libtransmission/verify.h"
 

libtransmission/tr-getopt.cc

@@ -13,6 +13,7 @@
 #include <fmt/format.h>
 
 #include "lib/base/string-utils.h"
+
 #include "libtransmission/tr-getopt.h"
 
 using namespace std::literals;

libtransmission/transmission.h

@@ -20,9 +20,10 @@
 #include <string_view>
 #include <vector>
 
+#include "lib/base/values.h"
+
 #include "libtransmission/constants.h"
 #include "libtransmission/types.h"
-#include "lib/base/values.h"
 
 // --- Startup & Shutdown
 

libtransmission/webseed.cc

@@ -17,6 +17,10 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/string-utils.h"
+#include "lib/base/tr-assert.h"
+#include "lib/base/tr-strbuf.h"
+
 #include "libtransmission/bandwidth.h"
 #include "libtransmission/bitfield.h"
 #include "libtransmission/block-info.h"
@@ -24,11 +28,8 @@
 #include "libtransmission/peer-common.h"
 #include "libtransmission/peer-mgr.h"
 #include "libtransmission/session.h"
-#include "lib/base/string-utils.h"
-#include "lib/base/tr-strbuf.h"
 #include "libtransmission/timer.h"
 #include "libtransmission/torrent.h"
-#include "lib/base/tr-assert.h"
 #include "libtransmission/tr-buffer.h"
 #include "libtransmission/types.h"
 #include "libtransmission/web-utils.h"

macosx/MessageWindowController.mm

@@ -2,9 +2,10 @@
 // It may be used under the MIT (SPDX: MIT) license.
 // License text can be found in the licenses/ folder.
 
-#include <libtransmission/transmission.h>
 #include <lib/base/log.h>
 
+#include <libtransmission/transmission.h>
+
 #import "MessageWindowController.h"
 #import "Controller.h"
 #import "NSImageAdditions.h"

qt/FreeSpaceLabel.cc

@@ -10,9 +10,10 @@
 #include <QString>
 #include <QWidget>
 
-#include <libtransmission/transmission.h>
-#include <lib/base/quark.h>
-#include <lib/base/variant.h>
+#include "lib/base/quark.h"
+#include "lib/base/variant.h"
+
+#include "libtransmission/transmission.h"
 
 #include "Formatter.h"
 #include "FreeSpaceLabel.h"

qt/RpcClient.h

@@ -19,11 +19,11 @@
 #include <QString>
 #include <QUrl>
 
-#include <libtransmission/transmission.h>
+#include "lib/base/quark.h"
+#include "lib/base/variant.h"
 
-#include <libtransmission/api-compat.h>
-#include <lib/base/quark.h>
-#include <lib/base/variant.h>
+#include "libtransmission/transmission.h"
+#include "libtransmission/api-compat.h"
 
 class QNetworkAccessManager;
 

qt/Session.cc

@@ -25,13 +25,13 @@
 
 #include <small/vector.hpp>
 
-#include <libtransmission/transmission.h>
+#include "lib/base/quark.h"
+#include "lib/base/variant.h"
 
-#include <lib/base/quark.h>
-#include <lib/base/variant.h>
-#include <libtransmission/serializer.h>
-#include <libtransmission/session-id.h>
-#include <libtransmission/utils.h>
+#include "libtransmission/transmission.h"
+#include "libtransmission/serializer.h"
+#include "libtransmission/session-id.h"
+#include "libtransmission/utils.h"
 
 #include "Session.h"
 

qt/Session.h

@@ -18,8 +18,9 @@
 #include <QNetworkReply>
 #include <QTimer>
 
-#include <libtransmission/transmission.h>
-#include <lib/base/quark.h>
+#include "lib/base/quark.h"
+
+#include "libtransmission/transmission.h"
 
 #include "RpcClient.h"
 #include "RpcQueue.h"

qt/Torrent.cc

@@ -11,10 +11,11 @@
 #include <QString>
 #include <QUrl>
 
-#include <libtransmission/transmission.h>
-#include <lib/base/quark.h>
-#include <lib/base/variant.h>
-#include <libtransmission/utils.h>
+#include "lib/base/quark.h"
+#include "lib/base/variant.h"
+
+#include "libtransmission/transmission.h"
+#include "libtransmission/utils.h"
 
 #include "Application.h"
 #include "IconCache.h"

tests/libtransmission-app/converter-tests.cc

@@ -11,8 +11,9 @@
 
 #include <gtest/gtest.h>
 
-#include <libtransmission/serializer.h>
-#include <lib/base/variant.h>
+#include "lib/base/variant.h"
+
+#include "libtransmission/serializer.h"
 
 #include "libtransmission-app/display-modes.h"
 

tests/libtransmission/api-compat-test.cc

@@ -7,9 +7,10 @@
 
 #include <gtest/gtest.h>
 
-#include <libtransmission/api-compat.h>
-#include <lib/base/quark.h>
-#include <lib/base/variant.h>
+#include "lib/base/quark.h"
+#include "lib/base/variant.h"
+
+#include "libtransmission/api-compat.h"
 
 #include "test-fixtures.h"
 

tests/libtransmission/blocklist-test.cc

@@ -8,11 +8,11 @@
 
 #include <gtest/gtest.h>
 
-#include <libtransmission/transmission.h>
+#include "lib/base/tr-strbuf.h"
 
-#include <libtransmission/net.h>
-#include <libtransmission/session.h> // tr_session.addressIsBlocked()
-#include <lib/base/tr-strbuf.h>
+#include "libtransmission/transmission.h"
+#include "libtransmission/net.h"
+#include "libtransmission/session.h" // tr_session.addressIsBlocked()
 
 #include "test-fixtures.h"
 

tests/libtransmission/json-test.cc

@@ -13,10 +13,11 @@
 
 #include <gtest/gtest.h>
 
-#include <libtransmission/crypto-utils.h>
-#include <lib/base/quark.h>
-#include <lib/base/variant.h>
-#include <libtransmission/utils.h>
+#include "lib/base/quark.h"
+#include "lib/base/variant.h"
+
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/utils.h"
 
 using namespace std::literals;
 

tests/libtransmission/rpc-test.cc

@@ -15,10 +15,11 @@
 
 #include <gtest/gtest.h>
 
-#include <lib/base/quark.h>
-#include <lib/base/variant.h>
-#include <libtransmission/transmission.h>
-#include <libtransmission/rpcimpl.h>
+#include "lib/base/quark.h"
+#include "lib/base/variant.h"
+
+#include "libtransmission/transmission.h"
+#include "libtransmission/rpcimpl.h"
 
 #include "test-fixtures.h"
 

tests/libtransmission/serializer-tests.cc

@@ -13,11 +13,12 @@
 #include <string_view>
 #include <vector>
 
-#include <libtransmission/net.h>
-#include <lib/base/log.h>
-#include <lib/base/quark.h>
-#include <lib/base/variant.h>
-#include <libtransmission/serializer.h>
+#include "lib/base/log.h"
+#include "lib/base/quark.h"
+#include "lib/base/variant.h"
+
+#include "libtransmission/net.h"
+#include "libtransmission/serializer.h"
 
 #include "test-fixtures.h"
 

tests/libtransmission/session-test.cc

@@ -14,14 +14,14 @@
 
 #include <gtest/gtest.h>
 
-#include <libtransmission/transmission.h>
+#include "lib/base/quark.h"
+#include "lib/base/variant.h"
 
-#include <libtransmission/crypto-utils.h>
-#include <lib/base/quark.h>
-#include <lib/base/variant.h>
-#include <libtransmission/session-id.h>
-#include <libtransmission/session.h>
-#include <libtransmission/version.h>
+#include "libtransmission/transmission.h"
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/session-id.h"
+#include "libtransmission/session.h"
+#include "libtransmission/version.h"
 
 #include "test-fixtures.h"
 

tests/libtransmission/torrents-test.cc

@@ -13,12 +13,12 @@
 
 #include <gtest/gtest.h>
 
-#include <libtransmission/transmission.h>
+#include "lib/base/tr-strbuf.h"
 
-#include <libtransmission/torrent.h>
-#include <libtransmission/torrents.h>
-#include <libtransmission/torrent-metainfo.h>
-#include <lib/base/tr-strbuf.h>
+#include "libtransmission/transmission.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/torrents.h"
+#include "libtransmission/torrent-metainfo.h"
 
 #include "test-fixtures.h"