refactor: move to libtrbase: values

cli/cli.cc

@@ -16,11 +16,11 @@
 #include "lib/base/env.h"
 #include "lib/base/error.h"
 #include "lib/base/file.h"
+#include "lib/base/values.h"
 
 #include "libtransmission/transmission.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"

gtk/DetailsDialog.cc

@@ -10,7 +10,6 @@
 #include "GtkCompat.h"
 #include "HigWorkarea.h" // GUI_PAD, GUI_PAD_BIG, GUI_PAD_SMALL
 #include "libtransmission/utils.h"
-#include "libtransmission/values.h"
 #include "libtransmission/web-utils.h"
 #include "Prefs.h"
 #include "PrefsDialog.h"
@@ -20,6 +19,7 @@
 #include "lib/base/file-utils.h"
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-macros.h"
+#include "lib/base/values.h"
 
 #include <gdkmm/pixbuf.h>
 #include <glibmm/i18n.h>

gtk/MainWindow.cc

@@ -21,7 +21,8 @@
 #include <libtransmission-app/display-modes.h>
 
 #include <libtransmission/transmission.h>
-#include <libtransmission/values.h>
+
+#include <lib/base/values.h>
 
 #include <gdkmm/cursor.h>
 #include <gdkmm/rectangle.h>

gtk/MakeDialog.cc

@@ -13,9 +13,9 @@
 
 #include <libtransmission/transmission.h>
 #include <libtransmission/makemeta.h>
-#include <libtransmission/values.h>
 
 #include "lib/base/error.h"
+#include "lib/base/values.h"
 
 #include <giomm/file.h>
 #include <glibmm/convert.h>

gtk/Torrent.cc

@@ -12,9 +12,9 @@
 
 #include <libtransmission/transmission.h>
 #include <libtransmission/utils.h>
-#include <libtransmission/values.h>
 
 #include "lib/base/tr-macros.h"
+#include "lib/base/values.h"
 
 #include <glibmm/i18n.h>
 #include <glibmm/value.h>

gtk/Torrent.h

@@ -8,7 +8,8 @@
 #include "Flags.h"
 
 #include <libtransmission/transmission.h>
-#include <libtransmission/values.h>
+
+#include <lib/base/values.h>
 
 #include <giomm/icon.h>
 #include <glibmm/extraclassinit.h>

gtk/Utils.cc

@@ -12,13 +12,13 @@
 #include <libtransmission/transmission.h> /* TR_RATIO_NA, TR_RATIO_INF */
 #include <libtransmission/torrent-metainfo.h>
 #include <libtransmission/utils.h> /* tr_strratio() */
-#include <libtransmission/values.h>
 #include <libtransmission/version.h> /* SHORT_VERSION_STRING */
 #include <libtransmission/web-utils.h>
 
 #include "lib/base/error.h"
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-strbuf.h"
+#include "lib/base/values.h"
 
 #include <gdkmm/display.h>
 #include <giomm/appinfo.h>

gtk/Utils.h

@@ -8,7 +8,8 @@
 #include "GtkCompat.h"
 
 #include <libtransmission/transmission.h>
-#include <libtransmission/values.h>
+
+#include <lib/base/values.h>
 
 #include <glibmm/objectbase.h>
 #include <glibmm/refptr.h>

lib/base/CMakeLists.txt

@@ -18,6 +18,7 @@ target_sources(trbase
         tr-assert.cc
         tr-assert.h
         tr-strbuf.h
+        values.h
         tr-macros.h)
 
 tr_allow_compile_if(

libtransmission/CMakeLists.txt

@@ -280,7 +280,6 @@ if(INSTALL_LIB)
             tr-getopt.h
             transmission.h
             utils.h
-            values.h
             variant.h
             watchdir.h
             web-utils.h

libtransmission/bandwidth.cc

@@ -17,6 +17,7 @@
 #include <fmt/format.h>
 
 #include "lib/base/tr-assert.h"
+#include "lib/base/values.h"
 
 #include "libtransmission/bandwidth.h"
 #include "libtransmission/crypto-utils.h"
@@ -24,7 +25,6 @@
 #include "libtransmission/peer-io.h"
 #include "libtransmission/types.h"
 #include "libtransmission/utils.h" // tr_time_msec()
-#include "libtransmission/values.h"
 
 using namespace tr::Values;
 

libtransmission/bandwidth.h

@@ -17,8 +17,8 @@
 #include <vector>
 
 #include "lib/base/tr-assert.h"
+#include "lib/base/values.h"
 #include "libtransmission/types.h"
-#include "libtransmission/values.h"
 
 class tr_peerIo;
 

libtransmission/cache.h

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

libtransmission/peer-mgr.cc

@@ -45,6 +45,7 @@
 #include "libtransmission/quark.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"
@@ -52,7 +53,6 @@
 #include "lib/base/tr-assert.h"
 #include "libtransmission/types.h"
 #include "libtransmission/utils.h"
-#include "libtransmission/values.h"
 #include "libtransmission/webseed.h"
 
 using namespace std::literals;

libtransmission/rpcimpl.cc

@@ -32,6 +32,7 @@
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-assert.h"
 #include "lib/base/tr-strbuf.h"
+#include "lib/base/values.h"
 
 #include "libtransmission/transmission.h"
 #include "libtransmission/announcer.h"
@@ -47,7 +48,6 @@
 #include "libtransmission/torrent.h"
 #include "libtransmission/types.h"
 #include "libtransmission/utils.h"
-#include "libtransmission/values.h"
 #include "libtransmission/variant.h"
 #include "libtransmission/version.h"
 #include "libtransmission/web-utils.h"

libtransmission/session-alt-speeds.h

@@ -18,7 +18,7 @@
 #include "libtransmission/quark.h"
 #include "libtransmission/serializer.h"
 #include "libtransmission/types.h" // for TR_SCHED_ALL
-#include "libtransmission/values.h"
+#include "lib/base/values.h"
 
 struct tr_variant;
 

libtransmission/transmission.h

@@ -22,7 +22,7 @@
 
 #include "libtransmission/constants.h"
 #include "libtransmission/types.h"
-#include "libtransmission/values.h"
+#include "lib/base/values.h"
 
 // --- Startup & Shutdown
 

libtransmission/types.h

@@ -13,7 +13,7 @@
 #include <string_view>
 #include <string>
 
-#include "libtransmission/values.h"
+#include "lib/base/values.h"
 
 struct tr_ctor;
 struct tr_error;

libtransmission/utils.cc

@@ -44,12 +44,12 @@
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-assert.h"
 #include "lib/base/tr-strbuf.h"
+#include "lib/base/values.h"
 
 #include "libtransmission/mime-types.h"
 #include "libtransmission/serializer.h"
 #include "libtransmission/types.h"
 #include "libtransmission/utils.h"
-#include "libtransmission/values.h"
 
 using namespace std::literals;
 using namespace tr::Values;

macosx/Controller.mm

@@ -17,11 +17,11 @@
 #include <atomic> /* atomic, atomic_fetch_add_explicit, memory_order_relaxed */
 
 #include "lib/base/string-utils.h"
+#include "lib/base/values.h"
 
 #include "libtransmission/transmission.h"
 #include "libtransmission/log.h"
 #include "libtransmission/torrent-metainfo.h"
-#include "libtransmission/values.h"
 #include "libtransmission/variant.h"
 
 #import "VDKQueue.h"

qt/Application.cc

@@ -27,7 +27,7 @@
 
 #include <libtransmission/transmission.h>
 
-#include <libtransmission/values.h>
+#include <lib/base/values.h>
 
 #include "AccessibleSqueezeLabel.h"
 #include "AddData.h"

qt/Formatter.cc

@@ -3,7 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <libtransmission/values.h>
+#include <lib/base/values.h>
 
 #include "Formatter.h"
 

qt/Speed.h

@@ -8,7 +8,7 @@
 #include <QCoreApplication> // Q_DECLARE_TR_FUNCTIONS
 #include <QString>
 
-#include "libtransmission/values.h"
+#include "lib/base/values.h"
 
 class Speed : public tr::Values::Speed
 {

tests/libtransmission/values-test.cc

@@ -3,7 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <libtransmission/values.h>
+#include <lib/base/values.h>
 
 #include "test-fixtures.h"
 

utils/create.cc

@@ -19,6 +19,7 @@
 
 #include "lib/base/error.h"
 #include "lib/base/file.h"
+#include "lib/base/values.h"
 
 #include "libtransmission/transmission.h"
 #include "libtransmission/announce-list.h"
@@ -27,7 +28,6 @@
 #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/remote.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/values.h"
 
 #include "libtransmission/transmission.h"
 #include "libtransmission/api-compat.h"
@@ -39,7 +40,6 @@
 #include "libtransmission/rpcimpl.h"
 #include "libtransmission/tr-getopt.h"
 #include "libtransmission/utils.h"
-#include "libtransmission/values.h"
 #include "libtransmission/variant.h"
 #include "libtransmission/version.h"
 

utils/show.cc

@@ -24,6 +24,7 @@
 #include "lib/base/error.h"
 #include "lib/base/string-utils.h"
 #include "lib/base/tr-strbuf.h"
+#include "lib/base/values.h"
 
 #include "libtransmission/transmission.h"
 #include "libtransmission/log.h"
@@ -31,7 +32,6 @@
 #include "libtransmission/torrent-metainfo.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.h"