refactor: move to libtrbase: strbuf

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"

gtk/Utils.cc

@@ -11,7 +11,6 @@
 
 #include <libtransmission/transmission.h> /* TR_RATIO_NA, TR_RATIO_INF */
 #include <libtransmission/torrent-metainfo.h>
-#include <libtransmission/tr-strbuf.h>
 #include <libtransmission/utils.h> /* tr_strratio() */
 #include <libtransmission/values.h>
 #include <libtransmission/version.h> /* 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 <gdkmm/display.h>
 #include <giomm/appinfo.h>

lib/base/CMakeLists.txt

@@ -17,6 +17,7 @@ target_sources(trbase
         $<$<BOOL:${IS_APPLE_CLANG}>:string-utils.mm>
         tr-assert.cc
         tr-assert.h
+        tr-strbuf.h
         tr-macros.h)
 
 tr_allow_compile_if(

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

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;

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

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"

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"

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"
 

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 _()
 

libtransmission/crypto-utils.h

@@ -15,7 +15,7 @@
 #include <string>
 #include <string_view>
 
-#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)

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"
 

libtransmission/magnet-metainfo.cc

@@ -16,12 +16,12 @@
 #include <fmt/format.h>
 
 #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"
 

libtransmission/makemeta.cc

@@ -18,6 +18,7 @@
 #include <fmt/format.h>
 
 #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"

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"
 

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" // _()
 

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;
 

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"

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"

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;

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"

libtransmission/stats.cc

@@ -8,12 +8,12 @@
 #include <utility>
 
 #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"
 

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;
 

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"
 

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;

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"
 

libtransmission/torrent-queue.cc

@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "libtransmission/torrent-queue.h"
-#include "libtransmission/tr-strbuf.h"
+#include "lib/base/tr-strbuf.h"
 #include "libtransmission/variant.h"
 
 namespace

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"

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(), _()
 

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"

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"

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"

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"
 

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"
 

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"

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"
 

tests/libtransmission/blocklist-test.cc

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

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"
 

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"
 

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"
 

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"
 

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"

tests/libtransmission/move-test.cc

@@ -12,6 +12,7 @@
 #include <gtest/gtest.h>
 
 #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"

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"
 

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"
 

tests/libtransmission/remove-test.cc

@@ -13,10 +13,10 @@
 #include <gtest/gtest.h>
 
 #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"
 

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"
 

tests/libtransmission/strbuf-test.cc

@@ -7,7 +7,7 @@
 #include <iterator>
 #include <string_view>
 
-#include <libtransmission/tr-strbuf.h>
+#include <lib/base/tr-strbuf.h>
 
 #include "test-fixtures.h"
 

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"
 

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"
 

tests/libtransmission/torrents-test.cc

@@ -18,7 +18,7 @@
 #include <libtransmission/torrent.h>
 #include <libtransmission/torrents.h>
 #include <libtransmission/torrent-metainfo.h>
-#include <libtransmission/tr-strbuf.h>
+#include <lib/base/tr-strbuf.h>
 
 #include "test-fixtures.h"
 

tests/libtransmission/watchdir-test.cc

@@ -23,11 +23,11 @@
 #include <gtest/gtest.h>
 
 #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"
 

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"