diff --git a/daemon/daemon.cc b/daemon/daemon.cc index 301c3cc0d..0343bbab5 100644 --- a/daemon/daemon.cc +++ b/daemon/daemon.cc @@ -33,13 +33,13 @@ #include "lib/base/file-utils.h" #include "lib/base/file.h" #include "lib/base/string-utils.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/transmission.h" #include "libtransmission/log.h" #include "libtransmission/quark.h" #include "libtransmission/timer-ev.h" #include "libtransmission/tr-getopt.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/utils.h" #include "libtransmission/variant.h" #include "libtransmission/version.h" diff --git a/gtk/Utils.cc b/gtk/Utils.cc index eb0e87475..e574df67b 100644 --- a/gtk/Utils.cc +++ b/gtk/Utils.cc @@ -11,7 +11,6 @@ #include /* TR_RATIO_NA, TR_RATIO_INF */ #include -#include #include /* tr_strratio() */ #include #include /* SHORT_VERSION_STRING */ @@ -19,6 +18,7 @@ #include "lib/base/error.h" #include "lib/base/string-utils.h" +#include "lib/base/tr-strbuf.h" #include #include diff --git a/lib/base/CMakeLists.txt b/lib/base/CMakeLists.txt index 797676a45..dae1e99cc 100644 --- a/lib/base/CMakeLists.txt +++ b/lib/base/CMakeLists.txt @@ -17,6 +17,7 @@ target_sources(trbase $<$:string-utils.mm> tr-assert.cc tr-assert.h + tr-strbuf.h tr-macros.h) tr_allow_compile_if( diff --git a/lib/base/file-posix.cc b/lib/base/file-posix.cc index ee50dd377..a48bfba6a 100644 --- a/lib/base/file-posix.cc +++ b/lib/base/file-posix.cc @@ -54,8 +54,7 @@ #include "lib/base/file.h" #include "lib/base/tr-assert.h" #include "lib/base/tr-macros.h" // TR_UCLIBC_CHECK_VERSION - -#include "libtransmission/tr-strbuf.h" +#include "lib/base/tr-strbuf.h" #ifndef O_LARGEFILE #define O_LARGEFILE 0 diff --git a/lib/base/file-utils.cc b/lib/base/file-utils.cc index 91aafca4f..5d1715180 100644 --- a/lib/base/file-utils.cc +++ b/lib/base/file-utils.cc @@ -15,10 +15,10 @@ #include "lib/base/error.h" #include "lib/base/file.h" #include "lib/base/file-utils.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/error-types.h" #include "libtransmission/log.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/utils.h" using namespace std::literals; diff --git a/libtransmission/tr-strbuf.h b/lib/base/tr-strbuf.h similarity index 100% rename from libtransmission/tr-strbuf.h rename to lib/base/tr-strbuf.h diff --git a/libtransmission/CMakeLists.txt b/libtransmission/CMakeLists.txt index 8b556e6e6..b00609881 100644 --- a/libtransmission/CMakeLists.txt +++ b/libtransmission/CMakeLists.txt @@ -143,7 +143,6 @@ target_sources(${TR_NAME} tr-getopt.h tr-lpd.cc tr-lpd.h - tr-strbuf.h tr-udp.cc tr-utp.cc tr-utp.h @@ -279,7 +278,6 @@ if(INSTALL_LIB) timer.h tr-buffer.h tr-getopt.h - tr-strbuf.h transmission.h utils.h values.h diff --git a/libtransmission/announce-list.cc b/libtransmission/announce-list.cc index b9e13d6a1..bd75b53ec 100644 --- a/libtransmission/announce-list.cc +++ b/libtransmission/announce-list.cc @@ -15,12 +15,10 @@ #include "lib/base/file-utils.h" #include "lib/base/string-utils.h" #include "lib/base/tr-assert.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/announce-list.h" #include "libtransmission/quark.h" -#include "libtransmission/string-utils.h" -#include "libtransmission/tr-assert.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/types.h" #include "libtransmission/variant.h" #include "libtransmission/web-utils.h" diff --git a/libtransmission/announcer-http.cc b/libtransmission/announcer-http.cc index c5a7adb3c..58c4914e7 100644 --- a/libtransmission/announcer-http.cc +++ b/libtransmission/announcer-http.cc @@ -27,6 +27,7 @@ #include "lib/base/error.h" #include "lib/base/string-utils.h" #include "lib/base/tr-assert.h" +#include "lib/base/tr-strbuf.h" // tr_strbuf, tr_urlbuf #define LIBTRANSMISSION_ANNOUNCER_MODULE #include "libtransmission/announcer-common.h" @@ -36,7 +37,6 @@ #include "libtransmission/net.h" #include "libtransmission/peer-mgr.h" /* pex */ #include "libtransmission/session.h" -#include "libtransmission/tr-strbuf.h" // tr_strbuf, tr_urlbuf #include "libtransmission/types.h" #include "libtransmission/utils.h" #include "libtransmission/web-utils.h" diff --git a/libtransmission/announcer-udp.cc b/libtransmission/announcer-udp.cc index 7e861c799..2d4bc392a 100644 --- a/libtransmission/announcer-udp.cc +++ b/libtransmission/announcer-udp.cc @@ -42,8 +42,8 @@ #include "libtransmission/net.h" #include "libtransmission/peer-mgr.h" // for tr_pex::fromCompact4() #include "lib/base/tr-assert.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/tr-buffer.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/utils.h" #include "libtransmission/web-utils.h" diff --git a/libtransmission/blocklist.cc b/libtransmission/blocklist.cc index 10768c36c..764bd4b7b 100644 --- a/libtransmission/blocklist.cc +++ b/libtransmission/blocklist.cc @@ -31,13 +31,13 @@ #include "lib/base/file.h" #include "lib/base/string-utils.h" #include "lib/base/tr-assert.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/blocklist.h" #include "libtransmission/constants.h" #include "libtransmission/crypto-utils.h" #include "libtransmission/log.h" #include "libtransmission/net.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/types.h" #include "libtransmission/utils.h" // for _() diff --git a/libtransmission/crypto-utils.h b/libtransmission/crypto-utils.h index db7054296..4bd1a1b21 100644 --- a/libtransmission/crypto-utils.h +++ b/libtransmission/crypto-utils.h @@ -15,7 +15,7 @@ #include #include -#include "libtransmission/tr-strbuf.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/types.h" // tr_sha1_digest_t, tr_sha256_d... #if defined(WITH_CCRYPTO) diff --git a/libtransmission/inout.cc b/libtransmission/inout.cc index fefec0150..98defb09e 100644 --- a/libtransmission/inout.cc +++ b/libtransmission/inout.cc @@ -16,6 +16,7 @@ #include "lib/base/file.h" #include "lib/base/string-utils.h" #include "lib/base/tr-assert.h" +#include "lib/base/tr-strbuf.h" // tr_pathbuf #include "libtransmission/block-info.h" // tr_block_info #include "libtransmission/crypto-utils.h" @@ -23,7 +24,6 @@ #include "libtransmission/session.h" #include "libtransmission/torrent-files.h" #include "libtransmission/torrent.h" -#include "libtransmission/tr-strbuf.h" // tr_pathbuf #include "libtransmission/types.h" #include "libtransmission/utils.h" diff --git a/libtransmission/magnet-metainfo.cc b/libtransmission/magnet-metainfo.cc index db5532c93..41f105622 100644 --- a/libtransmission/magnet-metainfo.cc +++ b/libtransmission/magnet-metainfo.cc @@ -16,12 +16,12 @@ #include #include "lib/base/error.h" +#include "lib/base/tr-strbuf.h" // for tr_urlbuf #include "libtransmission/crypto-utils.h" #include "libtransmission/error-types.h" #include "libtransmission/magnet-metainfo.h" #include "lib/base/string-utils.h" -#include "libtransmission/tr-strbuf.h" // for tr_urlbuf #include "libtransmission/types.h" // for tr_sha1_digest_t #include "libtransmission/web-utils.h" diff --git a/libtransmission/makemeta.cc b/libtransmission/makemeta.cc index b4168f7b6..0798e7acf 100644 --- a/libtransmission/makemeta.cc +++ b/libtransmission/makemeta.cc @@ -18,6 +18,7 @@ #include #include "lib/base/error.h" +#include "lib/base/tr-strbuf.h" // tr_pathbuf #include "lib/base/file.h" #include "lib/base/file-utils.h" @@ -31,7 +32,6 @@ #include "libtransmission/quark.h" // TR_KEY_length, TR_KEY_a... #include "libtransmission/session.h" // TR_NAME #include "libtransmission/torrent-files.h" -#include "libtransmission/tr-strbuf.h" // tr_pathbuf #include "libtransmission/types.h" #include "libtransmission/utils.h" // for _() #include "libtransmission/variant.h" diff --git a/libtransmission/net.cc b/libtransmission/net.cc index aa4c8858c..d88f0771a 100644 --- a/libtransmission/net.cc +++ b/libtransmission/net.cc @@ -31,12 +31,12 @@ #include "lib/base/string-utils.h" #include "lib/base/tr-assert.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/log.h" #include "libtransmission/net.h" #include "libtransmission/peer-socket.h" #include "libtransmission/session.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/types.h" #include "libtransmission/utils.h" diff --git a/libtransmission/open-files.cc b/libtransmission/open-files.cc index abbfe9aa0..dd62ef80b 100644 --- a/libtransmission/open-files.cc +++ b/libtransmission/open-files.cc @@ -14,11 +14,11 @@ #include "lib/base/error.h" #include "lib/base/file.h" #include "lib/base/tr-assert.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/error-types.h" #include "libtransmission/log.h" #include "libtransmission/open-files.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/types.h" #include "libtransmission/utils.h" // _() diff --git a/libtransmission/platform.cc b/libtransmission/platform.cc index 403a4aef1..ee8cbf00b 100644 --- a/libtransmission/platform.cc +++ b/libtransmission/platform.cc @@ -42,12 +42,12 @@ #include "lib/base/file-utils.h" #include "lib/base/file.h" #include "lib/base/string-utils.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/transmission.h" #include "libtransmission/log.h" #include "libtransmission/platform.h" #include "libtransmission/session.h" -#include "libtransmission/tr-strbuf.h" using namespace std::literals; diff --git a/libtransmission/rpc-server.cc b/libtransmission/rpc-server.cc index 41816eca4..a132dce06 100644 --- a/libtransmission/rpc-server.cc +++ b/libtransmission/rpc-server.cc @@ -37,6 +37,7 @@ #include "lib/base/error.h" #include "lib/base/file-utils.h" #include "lib/base/string-utils.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/crypto-utils.h" /* tr_ssha1_matches() */ #include "libtransmission/log.h" @@ -47,7 +48,6 @@ #include "libtransmission/rpcimpl.h" #include "libtransmission/session.h" #include "libtransmission/timer.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/types.h" #include "libtransmission/variant.h" #include "libtransmission/web-utils.h" diff --git a/libtransmission/rpcimpl.cc b/libtransmission/rpcimpl.cc index 8dc9438e8..8396ad636 100644 --- a/libtransmission/rpcimpl.cc +++ b/libtransmission/rpcimpl.cc @@ -31,6 +31,7 @@ #include "lib/base/file.h" #include "lib/base/string-utils.h" #include "lib/base/tr-assert.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/transmission.h" #include "libtransmission/announcer.h" @@ -44,7 +45,6 @@ #include "libtransmission/session.h" #include "libtransmission/torrent-ctor.h" #include "libtransmission/torrent.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/types.h" #include "libtransmission/utils.h" #include "libtransmission/values.h" diff --git a/libtransmission/session-id.cc b/libtransmission/session-id.cc index a2a595070..98017a847 100644 --- a/libtransmission/session-id.cc +++ b/libtransmission/session-id.cc @@ -15,13 +15,13 @@ #include "lib/base/error.h" #include "lib/base/file.h" +#include "lib/base/tr-strbuf.h" // for tr_pathbuf #include "libtransmission/crypto-utils.h" // for tr_rand_obj() #include "libtransmission/error-types.h" #include "libtransmission/log.h" #include "libtransmission/platform.h" #include "libtransmission/session-id.h" -#include "libtransmission/tr-strbuf.h" // for tr_pathbuf #include "libtransmission/utils.h" // for _() using namespace std::literals; diff --git a/libtransmission/session.cc b/libtransmission/session.cc index 2679b4871..4e35cc6de 100644 --- a/libtransmission/session.cc +++ b/libtransmission/session.cc @@ -33,6 +33,7 @@ #include "lib/base/file.h" #include "lib/base/string-utils.h" #include "lib/base/tr-assert.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/transmission.h" #include "libtransmission/api-compat.h" @@ -56,7 +57,6 @@ #include "libtransmission/torrent-ctor.h" #include "libtransmission/tr-dht.h" #include "libtransmission/tr-lpd.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/tr-utp.h" #include "libtransmission/types.h" #include "libtransmission/variant.h" diff --git a/libtransmission/stats.cc b/libtransmission/stats.cc index f3c6cf1bb..a895beac7 100644 --- a/libtransmission/stats.cc +++ b/libtransmission/stats.cc @@ -8,12 +8,12 @@ #include #include "lib/base/file.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/api-compat.h" #include "libtransmission/quark.h" #include "libtransmission/serializer.h" #include "libtransmission/stats.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/utils.h" // for tr_getRatio(), tr_time() #include "libtransmission/variant.h" diff --git a/libtransmission/subprocess-posix.cc b/libtransmission/subprocess-posix.cc index cace9cb7c..0207c7e5c 100644 --- a/libtransmission/subprocess-posix.cc +++ b/libtransmission/subprocess-posix.cc @@ -20,9 +20,9 @@ #include "lib/base/error.h" #include "lib/base/string-utils.h" #include "lib/base/tr-assert.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/subprocess.h" -#include "libtransmission/tr-strbuf.h" using namespace std::literals; diff --git a/libtransmission/torrent-files.cc b/libtransmission/torrent-files.cc index 75e499f85..a69b5917a 100644 --- a/libtransmission/torrent-files.cc +++ b/libtransmission/torrent-files.cc @@ -24,10 +24,10 @@ #include "lib/base/file-utils.h" #include "lib/base/file.h" #include "lib/base/string-utils.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/log.h" #include "libtransmission/torrent-files.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/types.h" #include "libtransmission/utils.h" diff --git a/libtransmission/torrent-files.h b/libtransmission/torrent-files.h index 7c725435e..18310951d 100644 --- a/libtransmission/torrent-files.h +++ b/libtransmission/torrent-files.h @@ -18,8 +18,8 @@ #include "lib/base/file.h" #include "lib/base/tr-macros.h" +#include "lib/base/tr-strbuf.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/types.h" struct tr_error; diff --git a/libtransmission/torrent-metainfo.cc b/libtransmission/torrent-metainfo.cc index b7daa9f0d..9038e25d1 100644 --- a/libtransmission/torrent-metainfo.cc +++ b/libtransmission/torrent-metainfo.cc @@ -18,13 +18,13 @@ #include "lib/base/file.h" #include "lib/base/string-utils.h" #include "lib/base/tr-assert.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/benc.h" #include "libtransmission/crypto-utils.h" #include "libtransmission/log.h" #include "libtransmission/torrent-files.h" #include "libtransmission/torrent-metainfo.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/types.h" #include "libtransmission/utils.h" diff --git a/libtransmission/torrent-queue.cc b/libtransmission/torrent-queue.cc index 460f09309..7428869dd 100644 --- a/libtransmission/torrent-queue.cc +++ b/libtransmission/torrent-queue.cc @@ -10,7 +10,7 @@ #include #include "libtransmission/torrent-queue.h" -#include "libtransmission/tr-strbuf.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/variant.h" namespace diff --git a/libtransmission/torrent.cc b/libtransmission/torrent.cc index 373a6b88e..4fd629685 100644 --- a/libtransmission/torrent.cc +++ b/libtransmission/torrent.cc @@ -25,6 +25,7 @@ #include "lib/base/file.h" #include "lib/base/string-utils.h" #include "lib/base/tr-assert.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/transmission.h" #include "libtransmission/announcer.h" @@ -43,7 +44,6 @@ #include "libtransmission/torrent-magnet.h" #include "libtransmission/torrent-metainfo.h" #include "libtransmission/torrent.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/types.h" #include "libtransmission/utils.h" #include "libtransmission/version.h" diff --git a/libtransmission/tr-dht.cc b/libtransmission/tr-dht.cc index ff248e51b..58e3ba59a 100644 --- a/libtransmission/tr-dht.cc +++ b/libtransmission/tr-dht.cc @@ -35,6 +35,7 @@ #include "lib/base/file.h" #include "lib/base/tr-assert.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/crypto-utils.h" #include "libtransmission/log.h" @@ -43,7 +44,6 @@ #include "libtransmission/quark.h" #include "libtransmission/timer.h" #include "libtransmission/tr-dht.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/variant.h" #include "libtransmission/utils.h" // for tr_time(), _() diff --git a/libtransmission/utils.cc b/libtransmission/utils.cc index dcbd05352..ea88087d9 100644 --- a/libtransmission/utils.cc +++ b/libtransmission/utils.cc @@ -43,10 +43,10 @@ #include "lib/base/env.h" #include "lib/base/string-utils.h" #include "lib/base/tr-assert.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/mime-types.h" #include "libtransmission/serializer.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/types.h" #include "libtransmission/utils.h" #include "libtransmission/values.h" diff --git a/libtransmission/watchdir-inotify.cc b/libtransmission/watchdir-inotify.cc index 703e160a3..0cb373d2f 100644 --- a/libtransmission/watchdir-inotify.cc +++ b/libtransmission/watchdir-inotify.cc @@ -25,7 +25,7 @@ #include "libtransmission/log.h" #include "lib/base/string-utils.h" #include "lib/base/tr-assert.h" -#include "libtransmission/tr-strbuf.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/utils.h" #include "libtransmission/watchdir.h" #include "libtransmission/watchdir-base.h" diff --git a/libtransmission/watchdir-kqueue.cc b/libtransmission/watchdir-kqueue.cc index e9ed7355a..c90a150cc 100644 --- a/libtransmission/watchdir-kqueue.cc +++ b/libtransmission/watchdir-kqueue.cc @@ -24,7 +24,7 @@ #define LIBTRANSMISSION_WATCHDIR_MODULE #include "libtransmission/log.h" #include "lib/base/string-utils.h" -#include "libtransmission/tr-strbuf.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/utils.h" // for _() #include "libtransmission/utils-ev.h" #include "libtransmission/watchdir-base.h" diff --git a/libtransmission/watchdir.cc b/libtransmission/watchdir.cc index 611d4fc20..52abd12da 100644 --- a/libtransmission/watchdir.cc +++ b/libtransmission/watchdir.cc @@ -11,11 +11,11 @@ #include "lib/base/error.h" #include "lib/base/file.h" +#include "lib/base/tr-strbuf.h" #define LIBTRANSMISSION_WATCHDIR_MODULE #include "libtransmission/error-types.h" #include "libtransmission/log.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/utils.h" // for _() #include "libtransmission/watchdir-base.h" diff --git a/libtransmission/web-utils.cc b/libtransmission/web-utils.cc index 4e883f986..602e74321 100644 --- a/libtransmission/web-utils.cc +++ b/libtransmission/web-utils.cc @@ -22,10 +22,10 @@ #include "lib/base/string-utils.h" #include "lib/base/tr-assert.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/log.h" #include "libtransmission/net.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/utils.h" #include "libtransmission/web-utils.h" diff --git a/libtransmission/webseed.cc b/libtransmission/webseed.cc index c78e3cf84..9161e4628 100644 --- a/libtransmission/webseed.cc +++ b/libtransmission/webseed.cc @@ -25,11 +25,11 @@ #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/tr-strbuf.h" #include "libtransmission/types.h" #include "libtransmission/web-utils.h" #include "libtransmission/web.h" diff --git a/tests/libtransmission/announce-list-test.cc b/tests/libtransmission/announce-list-test.cc index 58d3b2828..cdcf58ca7 100644 --- a/tests/libtransmission/announce-list-test.cc +++ b/tests/libtransmission/announce-list-test.cc @@ -17,11 +17,11 @@ #include "lib/base/error.h" #include "lib/base/file-utils.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/transmission.h" #include "libtransmission/announce-list.h" #include "libtransmission/torrent-metainfo.h" -#include "libtransmission/tr-strbuf.h" #include "test-fixtures.h" diff --git a/tests/libtransmission/blocklist-test.cc b/tests/libtransmission/blocklist-test.cc index 8cfdc3b8f..56b905bcf 100644 --- a/tests/libtransmission/blocklist-test.cc +++ b/tests/libtransmission/blocklist-test.cc @@ -12,7 +12,7 @@ #include #include // tr_session.addressIsBlocked() -#include +#include #include "test-fixtures.h" diff --git a/tests/libtransmission/copy-test.cc b/tests/libtransmission/copy-test.cc index 023da39f6..a662ab2d2 100644 --- a/tests/libtransmission/copy-test.cc +++ b/tests/libtransmission/copy-test.cc @@ -14,9 +14,9 @@ #include "lib/base/error.h" #include "lib/base/file-utils.h" #include "lib/base/file.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/crypto-utils.h" -#include "libtransmission/tr-strbuf.h" #include "test-fixtures.h" diff --git a/tests/libtransmission/dht-test.cc b/tests/libtransmission/dht-test.cc index 1f7486d2f..789d7ddff 100644 --- a/tests/libtransmission/dht-test.cc +++ b/tests/libtransmission/dht-test.cc @@ -36,6 +36,7 @@ #include "lib/base/file.h" #include "lib/base/tr-macros.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/transmission.h" #include "libtransmission/crypto-utils.h" // tr_rand_obj @@ -46,7 +47,6 @@ #include "libtransmission/timer.h" #include "libtransmission/timer-ev.h" #include "libtransmission/tr-dht.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/utils.h" #include "libtransmission/variant.h" diff --git a/tests/libtransmission/file-test.cc b/tests/libtransmission/file-test.cc index f5bf85b60..8fdff484f 100644 --- a/tests/libtransmission/file-test.cc +++ b/tests/libtransmission/file-test.cc @@ -31,8 +31,7 @@ #include "lib/base/file.h" #include "lib/base/string-utils.h" #include "lib/base/tr-macros.h" - -#include "libtransmission/tr-strbuf.h" +#include "lib/base/tr-strbuf.h" #include "test-fixtures.h" diff --git a/tests/libtransmission/file-utils-test.cc b/tests/libtransmission/file-utils-test.cc index 025531fe9..006e06529 100644 --- a/tests/libtransmission/file-utils-test.cc +++ b/tests/libtransmission/file-utils-test.cc @@ -11,8 +11,7 @@ #include "lib/base/error.h" #include "lib/base/file-utils.h" #include "lib/base/file.h" - -#include "libtransmission/tr-strbuf.h" +#include "lib/base/tr-strbuf.h" #include "test-fixtures.h" diff --git a/tests/libtransmission/makemeta-test.cc b/tests/libtransmission/makemeta-test.cc index ceb1f968d..66d563ea3 100644 --- a/tests/libtransmission/makemeta-test.cc +++ b/tests/libtransmission/makemeta-test.cc @@ -16,6 +16,7 @@ #include "lib/base/file.h" #include "lib/base/string-utils.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/announce-list.h" #include "libtransmission/crypto-utils.h" @@ -23,7 +24,6 @@ #include "libtransmission/quark.h" #include "libtransmission/session.h" // TR_NAME #include "libtransmission/torrent-metainfo.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/variant.h" #include "test-fixtures.h" diff --git a/tests/libtransmission/move-test.cc b/tests/libtransmission/move-test.cc index 9f3231495..87e35a518 100644 --- a/tests/libtransmission/move-test.cc +++ b/tests/libtransmission/move-test.cc @@ -12,6 +12,7 @@ #include #include "lib/base/file.h" // tr_sys_path_*() +#include "lib/base/tr-strbuf.h" #include "libtransmission/transmission.h" #include "libtransmission/block-info.h" @@ -19,7 +20,6 @@ #include "libtransmission/quark.h" #include "libtransmission/torrent.h" #include "libtransmission/torrent-files.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/variant.h" #include "test-fixtures.h" diff --git a/tests/libtransmission/open-files-test.cc b/tests/libtransmission/open-files-test.cc index 65c00a35a..7912b18fa 100644 --- a/tests/libtransmission/open-files-test.cc +++ b/tests/libtransmission/open-files-test.cc @@ -16,10 +16,10 @@ #include "lib/base/error.h" #include "lib/base/file.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/transmission.h" #include "libtransmission/open-files.h" -#include "libtransmission/tr-strbuf.h" #include "test-fixtures.h" diff --git a/tests/libtransmission/platform-test.cc b/tests/libtransmission/platform-test.cc index 7e0934bde..f33d799db 100644 --- a/tests/libtransmission/platform-test.cc +++ b/tests/libtransmission/platform-test.cc @@ -12,10 +12,10 @@ #include "lib/base/file-utils.h" #include "lib/base/file.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/transmission.h" #include "libtransmission/platform.h" -#include "libtransmission/tr-strbuf.h" #include "test-fixtures.h" diff --git a/tests/libtransmission/remove-test.cc b/tests/libtransmission/remove-test.cc index 16aeec184..4dee285b4 100644 --- a/tests/libtransmission/remove-test.cc +++ b/tests/libtransmission/remove-test.cc @@ -13,10 +13,10 @@ #include #include "lib/base/file.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/transmission.h" #include "libtransmission/torrent-files.h" -#include "libtransmission/tr-strbuf.h" #include "test-fixtures.h" diff --git a/tests/libtransmission/rename-test.cc b/tests/libtransmission/rename-test.cc index 4e3c41b5a..270cf7f8b 100644 --- a/tests/libtransmission/rename-test.cc +++ b/tests/libtransmission/rename-test.cc @@ -16,12 +16,12 @@ #include "lib/base/error.h" #include "lib/base/file-utils.h" #include "lib/base/file.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/transmission.h" #include "libtransmission/crypto-utils.h" #include "libtransmission/resume.h" #include "libtransmission/torrent.h" // tr_isTorrent() -#include "libtransmission/tr-strbuf.h" #include "test-fixtures.h" diff --git a/tests/libtransmission/strbuf-test.cc b/tests/libtransmission/strbuf-test.cc index 91750837b..5e0d7f55e 100644 --- a/tests/libtransmission/strbuf-test.cc +++ b/tests/libtransmission/strbuf-test.cc @@ -7,7 +7,7 @@ #include #include -#include +#include #include "test-fixtures.h" diff --git a/tests/libtransmission/torrent-files-test.cc b/tests/libtransmission/torrent-files-test.cc index d7422ca3d..fbac8e0ec 100644 --- a/tests/libtransmission/torrent-files-test.cc +++ b/tests/libtransmission/torrent-files-test.cc @@ -15,11 +15,11 @@ #include "lib/base/file.h" #include "lib/base/tr-macros.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/transmission.h" #include "libtransmission/torrent-files.h" #include "libtransmission/torrent-metainfo.h" -#include "libtransmission/tr-strbuf.h" #include "test-fixtures.h" diff --git a/tests/libtransmission/torrent-metainfo-test.cc b/tests/libtransmission/torrent-metainfo-test.cc index 5a7bf929b..96aa89a31 100644 --- a/tests/libtransmission/torrent-metainfo-test.cc +++ b/tests/libtransmission/torrent-metainfo-test.cc @@ -14,13 +14,13 @@ #include "lib/base/error.h" #include "lib/base/file-utils.h" #include "lib/base/file.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/transmission.h" #include "libtransmission/crypto-utils.h" #include "libtransmission/log.h" #include "libtransmission/torrent-metainfo.h" #include "libtransmission/torrent.h" -#include "libtransmission/tr-strbuf.h" #include "test-fixtures.h" diff --git a/tests/libtransmission/torrents-test.cc b/tests/libtransmission/torrents-test.cc index 6a24b0334..405c94ded 100644 --- a/tests/libtransmission/torrents-test.cc +++ b/tests/libtransmission/torrents-test.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "test-fixtures.h" diff --git a/tests/libtransmission/watchdir-test.cc b/tests/libtransmission/watchdir-test.cc index c51c63474..b6d6ba912 100644 --- a/tests/libtransmission/watchdir-test.cc +++ b/tests/libtransmission/watchdir-test.cc @@ -23,11 +23,11 @@ #include #include "lib/base/file.h" +#include "lib/base/tr-strbuf.h" #define LIBTRANSMISSION_WATCHDIR_MODULE #include "libtransmission/timer.h" #include "libtransmission/timer-ev.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/watchdir.h" #include "libtransmission/watchdir-base.h" diff --git a/utils/show.cc b/utils/show.cc index 455d323f7..069b05e71 100644 --- a/utils/show.cc +++ b/utils/show.cc @@ -23,13 +23,13 @@ #include "lib/base/error.h" #include "lib/base/string-utils.h" +#include "lib/base/tr-strbuf.h" #include "libtransmission/transmission.h" #include "libtransmission/log.h" #include "libtransmission/quark.h" #include "libtransmission/torrent-metainfo.h" #include "libtransmission/tr-getopt.h" -#include "libtransmission/tr-strbuf.h" #include "libtransmission/utils.h" #include "libtransmission/values.h" #include "libtransmission/variant.h"