refactor: move to libtrbase: tr_error

cli/cli.cc

@@ -13,18 +13,18 @@
 
 #include <fmt/format.h>
 
-#include <libtransmission/transmission.h>
+#include "lib/base/error.h"
 
-#include <libtransmission/env.h>
-#include <libtransmission/error.h>
-#include <libtransmission/file.h>
-#include <libtransmission/tr-getopt.h>
-#include <libtransmission/utils.h> // _()
-#include <libtransmission/values.h>
-#include <libtransmission/variant.h>
-#include <libtransmission/version.h>
-#include <libtransmission/web-utils.h>
-#include <libtransmission/web.h> // tr_sessionFetch()
+#include "libtransmission/transmission.h"
+#include "libtransmission/env.h"
+#include "libtransmission/file.h"
+#include "libtransmission/tr-getopt.h"
+#include "libtransmission/utils.h" // _()
+#include "libtransmission/values.h"
+#include "libtransmission/variant.h"
+#include "libtransmission/version.h"
+#include "libtransmission/web-utils.h"
+#include "libtransmission/web.h" // tr_sessionFetch()
 
 using namespace std::literals;
 using namespace tr::Values;

daemon/daemon-posix.cc

@@ -19,10 +19,9 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
 #include "lib/base/string-utils.h"
 
-#include "libtransmission/error.h"
-
 #include "daemon.h"
 
 static void set_system_error(tr_error& error, int code, std::string_view message)

daemon/daemon-win32.cc

@@ -10,9 +10,9 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
 #include "lib/base/string-utils.h"
 
-#include "libtransmission/error.h"
 #include "libtransmission/log.h"
 
 #include "daemon.h"

daemon/daemon.cc

@@ -29,10 +29,10 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
 #include "lib/base/string-utils.h"
 
 #include "libtransmission/transmission.h"
-#include "libtransmission/error.h"
 #include "libtransmission/file-utils.h"
 #include "libtransmission/file.h"
 #include "libtransmission/log.h"

gtk/MakeDialog.cc

@@ -6,13 +6,13 @@
 #include "MakeDialog.h"
 
 #include "GtkCompat.h"
+#include "lib/base/error.h"
 #include "PathButton.h"
 #include "PrefsDialog.h"
 #include "Session.h"
 #include "Utils.h"
 
 #include <libtransmission/transmission.h>
-#include <libtransmission/error.h>
 #include <libtransmission/makemeta.h>
 #include <libtransmission/values.h>
 

gtk/Utils.cc

@@ -5,13 +5,13 @@
 
 #include "Utils.h"
 
+#include "lib/base/error.h"
 #include "lib/base/string-utils.h"
 #include "Prefs.h"
 #include "PrefsDialog.h"
 #include "Session.h"
 
 #include <libtransmission/transmission.h> /* TR_RATIO_NA, TR_RATIO_INF */
-#include <libtransmission/error.h>
 #include <libtransmission/torrent-metainfo.h>
 #include <libtransmission/tr-strbuf.h>
 #include <libtransmission/utils.h> /* tr_strratio() */

lib/base/CMakeLists.txt

@@ -2,6 +2,8 @@ add_library(trbase STATIC)
 
 target_sources(trbase
     PRIVATE
+        error.cc
+        error.h
         string-utils.cc
         string-utils.h
         $<$<BOOL:${IS_APPLE_CLANG}>:string-utils.mm>
@@ -22,3 +24,17 @@ target_link_libraries(trbase
 set_property(
     TARGET trbase
     PROPERTY FOLDER "lib")
+
+if(INSTALL_LIB)
+    install(
+        TARGETS trbase
+        DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    install(
+        FILES
+            error.h
+            string-utils.h
+            tr-assert.h
+            tr-macros.h
+        DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/lib/base")
+endif()
+

lib/base/error.cc

@@ -3,10 +3,9 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include "lib/base/error.h"
 #include "lib/base/string-utils.h"
 
-#include "libtransmission/error.h"
-
 void tr_error::set_from_errno(int errnum)
 {
     code_ = errnum;

libtransmission/CMakeLists.txt

@@ -54,8 +54,6 @@ target_sources(${TR_NAME}
         crypto-utils.cc
         crypto-utils.h
         error-types.h
-        error.cc
-        error.h
         env.cc
         env.h
         file-piece-map.cc
@@ -296,7 +294,6 @@ if(INSTALL_LIB)
     install(
         FILES
             error-types.h
-            error.h
             file.h
             log.h
             makemeta.h
@@ -305,10 +302,8 @@ if(INSTALL_LIB)
             session-id.h
             timer-ev.h
             timer.h
-            ${CMAKE_SOURCE_DIR}/lib/base/tr-assert.h
             tr-buffer.h
             tr-getopt.h
-            ${CMAKE_SOURCE_DIR}/lib/base/tr-macros.h
             tr-strbuf.h
             transmission.h
             utils.h

libtransmission/announce-list.cc

@@ -11,11 +11,11 @@
 
 #include <small/map.hpp>
 
+#include "lib/base/error.h"
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-assert.h"
 
 #include "libtransmission/announce-list.h"
-#include "libtransmission/error.h"
 #include "libtransmission/file-utils.h"
 #include "libtransmission/quark.h"
 #include "libtransmission/string-utils.h"

libtransmission/announcer-http.cc

@@ -23,13 +23,13 @@
 
 #include <fmt/format.h>
 
-#define LIBTRANSMISSION_ANNOUNCER_MODULE
+#include "lib/base/error.h"
 
+#define LIBTRANSMISSION_ANNOUNCER_MODULE
 #include "libtransmission/announcer-common.h"
 #include "libtransmission/benc.h"
 #include "libtransmission/crypto-utils.h"
 #include "libtransmission/env.h"
-#include "libtransmission/error.h"
 #include "libtransmission/log.h"
 #include "libtransmission/net.h"
 #include "libtransmission/peer-mgr.h" /* pex */

libtransmission/benc.h

@@ -14,7 +14,7 @@
 #include <string_view>
 #include <utility> // make_pair
 
-#include "libtransmission/error.h"
+#include "lib/base/error.h"
 
 namespace tr::benc
 {

libtransmission/blocklist.cc

@@ -27,10 +27,11 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
+
 #include "libtransmission/blocklist.h"
 #include "libtransmission/constants.h"
 #include "libtransmission/crypto-utils.h"
-#include "libtransmission/error.h"
 #include "libtransmission/file.h"
 #include "libtransmission/log.h"
 #include "libtransmission/net.h"

libtransmission/file-posix.cc

@@ -50,10 +50,10 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
 #include "lib/base/tr-assert.h"
 #include "lib/base/tr-macros.h" // TR_UCLIBC_CHECK_VERSION
 
-#include "libtransmission/error.h"
 #include "libtransmission/file.h"
 #include "libtransmission/tr-strbuf.h"
 

libtransmission/file-utils.cc

@@ -14,8 +14,9 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
+
 #include "libtransmission/error-types.h"
-#include "libtransmission/error.h"
 #include "libtransmission/file.h"
 #include "libtransmission/log.h"
 #include "libtransmission/tr-strbuf.h"

libtransmission/file-win32.cc

@@ -17,11 +17,11 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-assert.h"
 
 #include "libtransmission/crypto-utils.h" /* tr_rand_int() */
-#include "libtransmission/error.h"
 #include "libtransmission/file.h"
 #include "libtransmission/types.h"
 

libtransmission/file.cc

@@ -10,7 +10,8 @@
 #include <string_view>
 #include <vector>
 
-#include "libtransmission/error.h"
+#include "lib/base/error.h"
+
 #include "libtransmission/file.h"
 
 namespace

libtransmission/handshake.cc

@@ -14,12 +14,12 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
 #include "lib/base/tr-assert.h"
 
 #include "libtransmission/bitfield.h"
 #include "libtransmission/clients.h"
 #include "libtransmission/crypto-utils.h"
-#include "libtransmission/error.h"
 #include "libtransmission/handshake.h"
 #include "libtransmission/log.h"
 #include "libtransmission/peer-io.h"

libtransmission/inout.cc

@@ -12,12 +12,12 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-assert.h"
 
 #include "libtransmission/block-info.h" // tr_block_info
 #include "libtransmission/crypto-utils.h"
-#include "libtransmission/error.h"
 #include "libtransmission/file.h"
 #include "libtransmission/inout.h"
 #include "libtransmission/session.h"

libtransmission/magnet-metainfo.cc

@@ -15,9 +15,10 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
+
 #include "libtransmission/crypto-utils.h"
 #include "libtransmission/error-types.h"
-#include "libtransmission/error.h"
 #include "libtransmission/magnet-metainfo.h"
 #include "lib/base/string-utils.h"
 #include "libtransmission/tr-strbuf.h" // for tr_urlbuf

libtransmission/makemeta.cc

@@ -17,9 +17,10 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
+
 #include "libtransmission/block-info.h" // tr_block_info
 #include "libtransmission/crypto-utils.h"
-#include "libtransmission/error.h"
 #include "libtransmission/file.h"
 #include "libtransmission/file-utils.h"
 #include "libtransmission/log.h"

libtransmission/makemeta.h

@@ -13,11 +13,11 @@
 #include <utility> // std::pair
 #include <vector>
 
+#include "lib/base/error.h"
 #include "lib/base/tr-macros.h" // TR_CONSTEXPR_VEC
 
 #include "libtransmission/announce-list.h"
 #include "libtransmission/block-info.h"
-#include "libtransmission/error.h"
 #include "libtransmission/file.h"
 #include "libtransmission/torrent-files.h"
 #include "libtransmission/types.h"

libtransmission/open-files.cc

@@ -11,8 +11,9 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
+
 #include "libtransmission/error-types.h"
-#include "libtransmission/error.h"
 #include "libtransmission/file.h"
 #include "libtransmission/log.h"
 #include "libtransmission/open-files.h"

libtransmission/peer-io.cc

@@ -22,9 +22,10 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
+
 #include "libtransmission/bandwidth.h"
 #include "libtransmission/block-info.h" // tr_block_info
-#include "libtransmission/error.h"
 #include "libtransmission/log.h"
 #include "libtransmission/net.h"
 #include "libtransmission/peer-io.h"

libtransmission/peer-socket.cc

@@ -13,7 +13,8 @@
 #include <libutp/utp.h>
 #endif
 
-#include "libtransmission/error.h"
+#include "lib/base/error.h"
+
 #include "libtransmission/log.h"
 #include "libtransmission/net.h"
 #include "libtransmission/peer-socket.h"

libtransmission/resume.cc

@@ -14,9 +14,10 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
+
 #include "libtransmission/api-compat.h"
 #include "libtransmission/bitfield.h"
-#include "libtransmission/error.h"
 #include "libtransmission/file-utils.h"
 #include "libtransmission/file.h"
 #include "libtransmission/log.h"

libtransmission/rpc-server.cc

@@ -34,8 +34,9 @@
 
 #include <libdeflate.h>
 
+#include "lib/base/error.h"
+
 #include "libtransmission/crypto-utils.h" /* tr_ssha1_matches() */
-#include "libtransmission/error.h"
 #include "libtransmission/file-utils.h"
 #include "libtransmission/log.h"
 #include "libtransmission/net.h"

libtransmission/rpcimpl.cc

@@ -26,11 +26,11 @@
 
 #include <libdeflate.h>
 
-#include "libtransmission/transmission.h"
+#include "lib/base/error.h"
 
+#include "libtransmission/transmission.h"
 #include "libtransmission/announcer.h"
 #include "libtransmission/crypto-utils.h"
-#include "libtransmission/error.h"
 #include "libtransmission/file-utils.h"
 #include "libtransmission/file.h"
 #include "libtransmission/log.h"

libtransmission/session-id.cc

@@ -13,9 +13,10 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
+
 #include "libtransmission/crypto-utils.h" // for tr_rand_obj()
 #include "libtransmission/error-types.h"
-#include "libtransmission/error.h"
 #include "libtransmission/file.h"
 #include "libtransmission/log.h"
 #include "libtransmission/platform.h"

libtransmission/subprocess-posix.cc

@@ -17,10 +17,10 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-assert.h"
 
-#include "libtransmission/error.h"
 #include "libtransmission/subprocess.h"
 #include "libtransmission/tr-strbuf.h"
 

libtransmission/subprocess-win32.cc

@@ -17,10 +17,11 @@
 
 #include <windows.h>
 
-#include "libtransmission/error.h"
+#include "lib/base/error.h"
 #include "lib/base/string-utils.h"
-#include "libtransmission/subprocess.h"
 #include "lib/base/tr-assert.h"
+
+#include "libtransmission/subprocess.h"
 #include "libtransmission/types.h"
 #include "libtransmission/utils.h"
 

libtransmission/torrent-ctor.cc

@@ -3,10 +3,11 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
+#include "lib/base/error.h"
+
 #include "libtransmission/transmission.h"
 
 #include "libtransmission/torrent-ctor.h"
-#include "libtransmission/error.h"
 #include "libtransmission/file-utils.h"
 #include "libtransmission/types.h"
 

libtransmission/torrent-files.cc

@@ -20,11 +20,12 @@
 
 #include <small/map.hpp>
 
-#include "libtransmission/error.h"
+#include "lib/base/error.h"
+#include "lib/base/string-utils.h"
+
 #include "libtransmission/file-utils.h"
 #include "libtransmission/file.h"
 #include "libtransmission/log.h"
-#include "lib/base/string-utils.h"
 #include "libtransmission/torrent-files.h"
 #include "libtransmission/tr-strbuf.h"
 #include "libtransmission/types.h"

libtransmission/torrent-magnet.cc

@@ -19,10 +19,11 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
+
 #include "libtransmission/transmission.h"
 
 #include "libtransmission/crypto-utils.h" // for tr_sha1()
-#include "libtransmission/error.h"
 #include "libtransmission/file-utils.h"
 #include "libtransmission/file.h"
 #include "libtransmission/quark.h"

libtransmission/torrent-metainfo.cc

@@ -13,12 +13,12 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-assert.h"
 
 #include "libtransmission/benc.h"
 #include "libtransmission/crypto-utils.h"
-#include "libtransmission/error.h"
 #include "libtransmission/file-utils.h"
 #include "libtransmission/file.h"
 #include "libtransmission/log.h"

libtransmission/torrent.cc

@@ -20,13 +20,14 @@
 #include <fmt/chrono.h>
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
+
 #include "libtransmission/transmission.h"
 
 #include "libtransmission/announcer.h"
 #include "libtransmission/bandwidth.h"
 #include "libtransmission/completion.h"
 #include "libtransmission/crypto-utils.h" // for tr_sha1()
-#include "libtransmission/error.h"
 #include "libtransmission/file-utils.h"
 #include "libtransmission/file.h"
 #include "libtransmission/inout.h" // tr_ioTestPiece()

libtransmission/tr-buffer.h

@@ -14,9 +14,9 @@
 
 #include <small/vector.hpp>
 
+#include "lib/base/error.h"
 #include "lib/base/tr-assert.h"
 
-#include "libtransmission/error.h"
 #include "libtransmission/net.h" // tr_socket_t
 #include "libtransmission/utils.h" // for tr_htonll(), tr_ntohll()
 

libtransmission/variant-json.cc

@@ -30,11 +30,11 @@
 #include <rapidjson/stringbuffer.h>
 #include <rapidjson/writer.h>
 
-#define LIBTRANSMISSION_VARIANT_MODULE
-
-#include "libtransmission/error.h"
-#include "libtransmission/quark.h"
+#include "lib/base/error.h"
 #include "lib/base/tr-assert.h"
+
+#define LIBTRANSMISSION_VARIANT_MODULE
+#include "libtransmission/quark.h"
 #include "libtransmission/utils.h"
 #include "libtransmission/variant.h"
 

libtransmission/variant.cc

@@ -20,11 +20,11 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
 #include "lib/base/tr-assert.h"
 
 #define LIBTRANSMISSION_VARIANT_MODULE
 #include "libtransmission/api-compat.h"
-#include "libtransmission/error.h"
 #include "libtransmission/file-utils.h"
 #include "libtransmission/log.h"
 #include "libtransmission/quark.h"

libtransmission/variant.h

@@ -17,7 +17,8 @@
 #include <variant>
 #include <vector>
 
-#include "libtransmission/error.h"
+#include "lib/base/error.h"
+
 #include "libtransmission/quark.h"
 
 /**

libtransmission/watchdir.cc

@@ -9,10 +9,10 @@
 
 #include <fmt/format.h>
 
-#define LIBTRANSMISSION_WATCHDIR_MODULE
+#include "lib/base/error.h"
 
+#define LIBTRANSMISSION_WATCHDIR_MODULE
 #include "libtransmission/error-types.h"
-#include "libtransmission/error.h"
 #include "libtransmission/file.h"
 #include "libtransmission/log.h"
 #include "libtransmission/tr-strbuf.h"

macosx/CreatorWindowController.mm

@@ -8,12 +8,11 @@
 #include <optional>
 #include <utility>
 
+#include "lib/base/error.h"
 #include "lib/base/string-utils.h"
 
 #include "libtransmission/transmission.h"
-#include "libtransmission/error.h"
 #include "libtransmission/makemeta.h"
-#include "lib/base/string-utils.h"
 #include "libtransmission/web-utils.h" // tr_urlIsValidTracker()
 
 #import "CreatorWindowController.h"

macosx/Torrent.mm

@@ -7,10 +7,10 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
 #include "lib/base/string-utils.h"
 
 #include "libtransmission/transmission.h"
-#include "libtransmission/error.h"
 #include "libtransmission/log.h"
 
 #import "Torrent.h"

qt/AddData.cc

@@ -7,11 +7,11 @@
 #include <QFile>
 #include <QFileInfo>
 
-#include <libtransmission/transmission.h>
+#include "lib/base/error.h"
 
-#include <libtransmission/error.h>
-#include <libtransmission/torrent-metainfo.h>
-#include <libtransmission/web-utils.h>
+#include "libtransmission/transmission.h"
+#include "libtransmission/torrent-metainfo.h"
+#include "libtransmission/web-utils.h"
 
 #include "AddData.h"
 #include "Utils.h"

qt/MakeDialog.cc

@@ -19,9 +19,10 @@
 #include <QString>
 #include <QTimer>
 
-#include <libtransmission/error.h>
-#include <libtransmission/makemeta.h>
-#include <libtransmission/transmission.h>
+#include "lib/base/error.h"
+
+#include "libtransmission/makemeta.h"
+#include "libtransmission/transmission.h"
 
 #include "ColumnResizer.h"
 #include "Formatter.h"

tests/libtransmission/announce-list-test.cc

@@ -15,13 +15,13 @@
 
 #include <gtest/gtest.h>
 
-#include <libtransmission/transmission.h>
+#include "lib/base/error.h"
 
-#include <libtransmission/announce-list.h>
-#include <libtransmission/error.h>
-#include <libtransmission/file-utils.h>
-#include <libtransmission/torrent-metainfo.h>
-#include <libtransmission/tr-strbuf.h>
+#include "libtransmission/transmission.h"
+#include "libtransmission/announce-list.h"
+#include "libtransmission/file-utils.h"
+#include "libtransmission/torrent-metainfo.h"
+#include "libtransmission/tr-strbuf.h"
 
 #include "test-fixtures.h"
 

tests/libtransmission/benc-test.cc

@@ -8,8 +8,9 @@
 
 #include <fmt/format.h>
 
-#include <libtransmission/benc.h>
-#include <libtransmission/error.h>
+#include "lib/base/error.h"
+
+#include "libtransmission/benc.h"
 
 #include "test-fixtures.h"
 

tests/libtransmission/copy-test.cc

@@ -11,11 +11,12 @@
 
 #include <gtest/gtest.h>
 
-#include <libtransmission/crypto-utils.h>
-#include <libtransmission/error.h>
-#include <libtransmission/file-utils.h>
-#include <libtransmission/file.h>
-#include <libtransmission/tr-strbuf.h>
+#include "lib/base/error.h"
+
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/file-utils.h"
+#include "libtransmission/file.h"
+#include "libtransmission/tr-strbuf.h"
 
 #include "test-fixtures.h"
 

tests/libtransmission/error-test.cc

@@ -7,7 +7,7 @@
 
 #include <gtest/gtest.h>
 
-#include <libtransmission/error.h>
+#include "lib/base/error.h"
 
 #include "test-fixtures.h"
 

tests/libtransmission/file-test.cc

@@ -27,10 +27,10 @@
 
 #include <gtest/gtest.h>
 
+#include "lib/base/error.h"
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-macros.h"
 
-#include "libtransmission/error.h"
 #include "libtransmission/file.h"
 #include "libtransmission/tr-strbuf.h"
 

tests/libtransmission/file-utils-test.cc

@@ -8,10 +8,11 @@
 
 #include <gtest/gtest.h>
 
-#include <libtransmission/error.h>
-#include <libtransmission/file-utils.h>
-#include <libtransmission/file.h>
-#include <libtransmission/tr-strbuf.h>
+#include "lib/base/error.h"
+
+#include "libtransmission/file-utils.h"
+#include "libtransmission/file.h"
+#include "libtransmission/tr-strbuf.h"
 
 #include "test-fixtures.h"
 

tests/libtransmission/open-files-test.cc

@@ -14,12 +14,12 @@
 
 #include <gtest/gtest.h>
 
-#include <libtransmission/transmission.h>
+#include "lib/base/error.h"
 
-#include <libtransmission/error.h>
-#include <libtransmission/file.h>
-#include <libtransmission/open-files.h>
-#include <libtransmission/tr-strbuf.h>
+#include "libtransmission/transmission.h"
+#include "libtransmission/file.h"
+#include "libtransmission/open-files.h"
+#include "libtransmission/tr-strbuf.h"
 
 #include "test-fixtures.h"
 

tests/libtransmission/rename-test.cc

@@ -13,15 +13,15 @@
 
 #include <gtest/gtest.h>
 
-#include <libtransmission/transmission.h>
+#include "lib/base/error.h"
 
-#include <libtransmission/crypto-utils.h>
-#include <libtransmission/error.h>
-#include <libtransmission/file-utils.h>
-#include <libtransmission/file.h>
-#include <libtransmission/resume.h>
-#include <libtransmission/torrent.h> // tr_isTorrent()
-#include <libtransmission/tr-strbuf.h>
+#include "libtransmission/transmission.h"
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/file-utils.h"
+#include "libtransmission/file.h"
+#include "libtransmission/resume.h"
+#include "libtransmission/torrent.h" // tr_isTorrent()
+#include "libtransmission/tr-strbuf.h"
 
 #include "test-fixtures.h"
 

tests/libtransmission/subprocess-test.cc

@@ -14,10 +14,10 @@
 
 #include <gtest/gtest.h>
 
+#include "lib/base/error.h"
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-macros.h"
 
-#include "libtransmission/error.h"
 #include "libtransmission/file.h"
 #include "libtransmission/subprocess.h"
 

tests/libtransmission/test-fixtures.h

@@ -21,16 +21,16 @@
 
 #include <gtest/gtest.h>
 
-#include <libtransmission/transmission.h>
+#include "lib/base/error.h"
 
-#include <libtransmission/crypto-utils.h> // tr_base64_decode()
-#include <libtransmission/error.h>
-#include <libtransmission/file.h> // tr_sys_file_*()
-#include <libtransmission/quark.h>
-#include <libtransmission/torrent-ctor.h>
-#include <libtransmission/torrent.h>
-#include <libtransmission/utils.h>
-#include <libtransmission/variant.h>
+#include "libtransmission/transmission.h"
+#include "libtransmission/crypto-utils.h" // tr_base64_decode()
+#include "libtransmission/file.h" // tr_sys_file_*()
+#include "libtransmission/quark.h"
+#include "libtransmission/torrent-ctor.h"
+#include "libtransmission/torrent.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/variant.h"
 
 using namespace std::literals;
 

tests/libtransmission/torrent-magnet-test.cc

@@ -9,9 +9,10 @@
 
 #include <gtest/gtest.h>
 
-#include <libtransmission/error.h>
-#include <libtransmission/torrent-magnet.h>
-#include <libtransmission/torrent-metainfo.h>
+#include "lib/base/error.h"
+
+#include "libtransmission/torrent-magnet.h"
+#include "libtransmission/torrent-metainfo.h"
 
 #include "test-fixtures.h"
 

tests/libtransmission/torrent-metainfo-test.cc

@@ -11,16 +11,16 @@
 
 #include <gtest/gtest.h>
 
-#include <libtransmission/transmission.h>
+#include "lib/base/error.h"
 
-#include <libtransmission/crypto-utils.h>
-#include <libtransmission/error.h>
-#include <libtransmission/file-utils.h>
-#include <libtransmission/file.h>
-#include <libtransmission/log.h>
-#include <libtransmission/torrent-metainfo.h>
-#include <libtransmission/torrent.h>
-#include <libtransmission/tr-strbuf.h>
+#include "libtransmission/transmission.h"
+#include "libtransmission/crypto-utils.h"
+#include "libtransmission/file-utils.h"
+#include "libtransmission/file.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/variant-test.cc

@@ -16,13 +16,13 @@
 
 #include <gtest/gtest.h>
 
-#define LIBTRANSMISSION_VARIANT_MODULE
+#include "lib/base/error.h"
 
-#include <libtransmission/benc.h>
-#include <libtransmission/crypto-utils.h> // tr_rand_buffer(), tr_rand_int()
-#include <libtransmission/error.h>
-#include <libtransmission/quark.h>
-#include <libtransmission/variant.h>
+#define LIBTRANSMISSION_VARIANT_MODULE
+#include "libtransmission/benc.h"
+#include "libtransmission/crypto-utils.h" // tr_rand_buffer(), tr_rand_int()
+#include "libtransmission/quark.h"
+#include "libtransmission/variant.h"
 
 #include "test-fixtures.h"
 

utils/create.cc

@@ -17,18 +17,18 @@
 
 #include <fmt/format.h>
 
-#include <libtransmission/transmission.h>
+#include "lib/base/error.h"
 
-#include <libtransmission/announce-list.h>
-#include <libtransmission/error.h>
-#include <libtransmission/file.h>
-#include <libtransmission/log.h>
-#include <libtransmission/makemeta.h>
-#include <libtransmission/torrent-files.h>
-#include <libtransmission/tr-getopt.h>
-#include <libtransmission/utils.h>
-#include <libtransmission/values.h>
-#include <libtransmission/version.h>
+#include "libtransmission/transmission.h"
+#include "libtransmission/announce-list.h"
+#include "libtransmission/file.h"
+#include "libtransmission/log.h"
+#include "libtransmission/makemeta.h"
+#include "libtransmission/torrent-files.h"
+#include "libtransmission/tr-getopt.h"
+#include "libtransmission/utils.h"
+#include "libtransmission/values.h"
+#include "libtransmission/version.h"
 
 using namespace std::literals;
 

utils/edit.cc

@@ -12,9 +12,9 @@
 
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
 #include "lib/base/string-utils.h"
 
-#include "libtransmission/error.h"
 #include "libtransmission/log.h"
 #include "libtransmission/quark.h"
 #include "libtransmission/tr-getopt.h"

utils/show.cc

@@ -21,10 +21,10 @@
 #include <fmt/chrono.h>
 #include <fmt/format.h>
 
+#include "lib/base/error.h"
 #include "lib/base/string-utils.h"
 
 #include "libtransmission/transmission.h"
-#include "libtransmission/error.h"
 #include "libtransmission/log.h"
 #include "libtransmission/quark.h"
 #include "libtransmission/torrent-metainfo.h"