refactor: move to libtrbase: tr-getopt

cli/cli.cc

@@ -17,11 +17,11 @@
 #include "lib/base/error.h"
 #include "lib/base/file.h"
 #include "lib/base/i18n.h"
+#include "lib/base/tr-getopt.h"
 #include "lib/base/values.h"
 #include "lib/base/variant.h"
 
 #include "libtransmission/transmission.h"
-#include "libtransmission/tr-getopt.h"
 #include "libtransmission/utils.h" // _()
 #include "libtransmission/version.h"
 #include "libtransmission/web-utils.h"

daemon/daemon.cc

@@ -36,12 +36,12 @@
 #include "lib/base/log.h"
 #include "lib/base/quark.h"
 #include "lib/base/string-utils.h"
+#include "lib/base/tr-getopt.h"
 #include "lib/base/tr-strbuf.h"
 #include "lib/base/variant.h"
 
 #include "libtransmission/transmission.h"
 #include "libtransmission/timer-ev.h"
-#include "libtransmission/tr-getopt.h"
 #include "libtransmission/utils.h"
 #include "libtransmission/version.h"
 #include "libtransmission/watchdir.h"

lib/base/CMakeLists.txt

@@ -28,6 +28,8 @@ target_sources(trbase
         $<$<BOOL:${IS_APPLE_CLANG}>:string-utils.mm>
         tr-assert.cc
         tr-assert.h
+        tr-getopt.cc
+        tr-getopt.h
         tr-strbuf.h
         values.h
         variant-benc.cc

lib/base/tr-getopt.cc

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

libtransmission/CMakeLists.txt

@@ -129,8 +129,6 @@ target_sources(${TR_NAME}
         tr-buffer.h
         tr-dht.cc
         tr-dht.h
-        tr-getopt.cc
-        tr-getopt.h
         tr-lpd.cc
         tr-lpd.h
         tr-udp.cc
@@ -257,7 +255,7 @@ if(INSTALL_LIB)
             timer-ev.h
             timer.h
             tr-buffer.h
-            tr-getopt.h
+            ../lib/base/tr-getopt.h
             transmission.h
             utils.h
             watchdir.h

qt/main.cc

@@ -14,7 +14,7 @@
 
 #include <libtransmission/transmission.h>
 
-#include <libtransmission/tr-getopt.h>
+#include <lib/base/tr-getopt.h>
 #include <libtransmission/utils.h>
 #include <libtransmission/version.h>
 

tests/libtransmission/getopt-test.cc

@@ -5,7 +5,7 @@
 
 #include <array>
 
-#include <libtransmission/tr-getopt.h>
+#include <lib/base/tr-getopt.h>
 
 #include "test-fixtures.h"
 

utils/create.cc

@@ -21,13 +21,13 @@
 #include "lib/base/file.h"
 #include "lib/base/i18n.h"
 #include "lib/base/log.h"
+#include "lib/base/tr-getopt.h"
 #include "lib/base/values.h"
 
 #include "libtransmission/transmission.h"
 #include "libtransmission/announce-list.h"
 #include "libtransmission/makemeta.h"
 #include "libtransmission/torrent-files.h"
-#include "libtransmission/tr-getopt.h"
 #include "libtransmission/utils.h"
 #include "libtransmission/version.h"
 

utils/edit.cc

@@ -16,9 +16,9 @@
 #include "lib/base/log.h"
 #include "lib/base/quark.h"
 #include "lib/base/string-utils.h"
+#include "lib/base/tr-getopt.h"
 #include "lib/base/variant.h"
 
-#include "libtransmission/tr-getopt.h"
 #include "libtransmission/utils.h"
 #include "libtransmission/version.h"
 

utils/remote.cc

@@ -32,6 +32,7 @@
 #include "lib/base/quark.h"
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-assert.h"
+#include "lib/base/tr-getopt.h"
 #include "lib/base/values.h"
 #include "lib/base/variant.h"
 
@@ -39,7 +40,6 @@
 #include "libtransmission/api-compat.h"
 #include "libtransmission/crypto-utils.h"
 #include "libtransmission/rpcimpl.h"
-#include "libtransmission/tr-getopt.h"
 #include "libtransmission/utils.h"
 #include "libtransmission/version.h"
 

utils/show.cc

@@ -25,13 +25,13 @@
 #include "lib/base/log.h"
 #include "lib/base/quark.h"
 #include "lib/base/string-utils.h"
+#include "lib/base/tr-getopt.h"
 #include "lib/base/tr-strbuf.h"
 #include "lib/base/values.h"
 #include "lib/base/variant.h"
 
 #include "libtransmission/transmission.h"
 #include "libtransmission/torrent-metainfo.h"
-#include "libtransmission/tr-getopt.h"
 #include "libtransmission/utils.h"
 #include "libtransmission/version.h"
 #include "libtransmission/web.h"