refactor: move libtransmission/ to lib/app/

CMakeLists.txt

@@ -916,7 +916,7 @@ endfunction()
 
 add_subdirectory(lib/base)
 add_subdirectory(lib/transmission)
-add_subdirectory(libtransmission-app)
+add_subdirectory(lib/app)
 
 set(MAC_PROJECT_DIR macosx)
 

gtk/.clang-format

@@ -3,7 +3,7 @@ BasedOnStyle: InheritParentConfig
 
 IncludeBlocks: Regroup
 IncludeCategories:
-  - Regex: '^[<"]libtransmission-app/'
+  - Regex: '^[<"]lib/app/'
     Priority: 3
   - Regex: '^[<"]lib/transmission/transmission.h[">]'
     Priority: 4

gtk/FaviconCache.cc

@@ -3,7 +3,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <libtransmission-app/favicon-cache.h>
+#include <lib/app/favicon-cache.h>
 
 #include <gdkmm/pixbuf.h>
 #include <giomm/memoryinputstream.h>

gtk/FilterBar.cc

@@ -13,7 +13,7 @@
 #include "TorrentFilter.h"
 #include "Utils.h"
 
-#include "libtransmission-app/display-modes.h"
+#include "lib/app/display-modes.h"
 
 #include "lib/base/tr-macros.h"
 

gtk/MainWindow.cc

@@ -18,9 +18,9 @@
 #include "TorrentCellRenderer.h"
 #endif
 
-#include <lib/transmission/transmission.h>
+#include <lib/app/display-modes.h>
 
-#include <libtransmission-app/display-modes.h>
+#include <lib/transmission/transmission.h>
 
 #include <lib/base/values.h>
 

gtk/Prefs.cc

@@ -7,9 +7,9 @@
 #include "GtkCompat.h"
 #include "PrefsDialog.h"
 
-#include <lib/transmission/transmission.h>
+#include <lib/app/display-modes.h>
 
-#include <libtransmission-app/display-modes.h>
+#include <lib/transmission/transmission.h>
 
 #include <lib/base/serializer.h>
 #include <lib/base/variant.h>

gtk/Session.h

@@ -8,9 +8,9 @@
 #include "Prefs.h"
 #include "Torrent.h"
 
-#include <lib/transmission/transmission.h>
+#include <lib/app/favicon-cache.h>
 
-#include <libtransmission-app/favicon-cache.h>
+#include <lib/transmission/transmission.h>
 
 #include <lib/base/serializer.h>
 #include <lib/base/variant.h>

gtk/TorrentFilter.h

@@ -8,7 +8,7 @@
 #include "FilterBase.h"
 #include "Torrent.h"
 
-#include <libtransmission-app/display-modes.h>
+#include <lib/app/display-modes.h>
 
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>

gtk/TorrentSorter.cc

@@ -9,10 +9,9 @@
 #include "SorterBase.hh"
 #include "Utils.h"
 
+#include <lib/app/display-modes.h>
+
 #include <lib/transmission/transmission.h>
-
-#include <libtransmission-app/display-modes.h>
-
 #include <lib/transmission/utils.h>
 
 #include "lib/base/tr-macros.h"

gtk/TorrentSorter.h

@@ -8,7 +8,7 @@
 #include "SorterBase.h"
 #include "Torrent.h"
 
-#include <libtransmission-app/display-modes.h>
+#include <lib/app/display-modes.h>
 
 #include <glibmm/refptr.h>
 

gtk/main.cc

@@ -8,10 +8,9 @@
 #include "Prefs.h"
 #include "Utils.h"
 
+#include "lib/app/app.h"
+
 #include "lib/transmission/transmission.h"
-
-#include "libtransmission-app/app.h"
-
 #include "lib/transmission/version.h"
 
 #include "lib/base/serializer.h"

lib/app/CMakeLists.txt

@@ -17,8 +17,8 @@ target_sources(${LIBNAME}
 
 target_include_directories(${LIBNAME}
     PUBLIC
-        ${CMAKE_CURRENT_SOURCE_DIR}/..
+        ${CMAKE_CURRENT_SOURCE_DIR}/../..
-        ${CMAKE_CURRENT_BINARY_DIR}/..)
+        ${CMAKE_CURRENT_BINARY_DIR}/../..)
 
 target_link_libraries(${LIBNAME}
     PUBLIC

lib/app/app.cc

@@ -5,8 +5,8 @@
 
 #include <lib/transmission/utils.h> // tr_lib_init()
 
-#include "libtransmission-app/app.h"
+#include "lib/app/app.h"
-#include "libtransmission-app/converters.h"
+#include "lib/app/converters.h"
 
 namespace tr::app
 {

lib/app/converters.cc

@@ -19,8 +19,8 @@
 #include "lib/base/string-utils.h"
 #include "lib/base/variant.h"
 
-#include "libtransmission-app/display-modes.h"
+#include "lib/app/display-modes.h"
-#include "libtransmission-app/converters.h"
+#include "lib/app/converters.h"
 
 using namespace std::literals;
 

qt/Application.h

@@ -17,7 +17,7 @@
 #include <QTranslator>
 #include <QWeakPointer>
 
-#include <libtransmission-app/favicon-cache.h>
+#include <lib/app/favicon-cache.h>
 
 #include "AddData.h"
 #include "Typedefs.h"

qt/FaviconCache.cc

@@ -4,7 +4,7 @@
 // or any future license endorsed by Mnemosyne LLC.
 // License text can be found in the licenses/ folder.
 
-#include <libtransmission-app/favicon-cache.h>
+#include <lib/app/favicon-cache.h>
 
 #include <QApplication>
 #include <QPixmap>

qt/Prefs.h

@@ -15,7 +15,7 @@
 #include <lib/base/quark.h>
 #include <lib/base/variant.h>
 
-#include <libtransmission-app/display-modes.h>
+#include <lib/app/display-modes.h>
 
 #include "UserMetaType.h"
 

qt/TrQtInit.cc

@@ -5,7 +5,7 @@
 
 #include "TrQtInit.h"
 
-#include <libtransmission-app/app.h>
+#include <lib/app/app.h>
 
 #include "VariantHelpers.h"
 

qt/TrackerDelegate.cc

@@ -11,7 +11,7 @@
 
 #include <lib/transmission/web-utils.h>
 
-#include <libtransmission-app/favicon-cache.h>
+#include <lib/app/favicon-cache.h>
 
 #include "Formatter.h"
 #include "Torrent.h"

qt/UserMetaType.h

@@ -7,7 +7,7 @@
 
 #include <lib/transmission/transmission.h>
 
-#include <libtransmission-app/display-modes.h>
+#include <lib/app/display-modes.h>
 
 #include <QMetaType>
 

qt/main.cc

@@ -18,7 +18,7 @@
 #include "lib/transmission/utils.h"
 #include "lib/transmission/version.h"
 
-#include "libtransmission-app/app.h"
+#include "lib/app/app.h"
 
 #include "Application.h"
 #include "InteropHelper.h"

tests/libtransmission-app/converter-tests.cc

@@ -15,7 +15,7 @@
 
 #include "lib/base/serializer.h"
 
-#include "libtransmission-app/display-modes.h"
+#include "lib/app/display-modes.h"
 
 #include "test-fixtures.h"
 

tests/libtransmission-app/test-fixtures.h

@@ -7,7 +7,7 @@
 
 #include <gtest/gtest.h>
 
-#include "libtransmission-app/app.h"
+#include "lib/app/app.h"
 
 class TransmissionTest : public ::testing::Test
 {