From bf7a57fc55493247a624ecfd65e4d73964e7d8d2 Mon Sep 17 00:00:00 2001 From: SulfurNitride Date: Sun, 12 Apr 2026 02:40:16 -0500 Subject: Remove vendored usvfs and Windows-only usvfs code paths The Linux port uses its own in-process FUSE VFS (FuseConnector), so usvfs was dead weight: libs/usvfs/ was never built, usvfsconnector.cpp was explicitly REMOVE_ITEM'd from the source list, and every call site was already guarded by #ifdef _WIN32 with a working Linux branch (the Windows build is also broken on this branch, since FUSE3 is a hard find_package dependency). - Drop libs/usvfs/ and src/src/usvfsconnector.{cpp,h} - Collapse #ifdef _WIN32 / usvfs include branches in organizercore, mainwindow, settings, util, spawn - Remove getUsvfsVersionString() and the "usvfs: ..." log field - Remove vfs32/64DLLName APPPARAMs (nothing reads them) - Relabel About dialog "usvfs:" row to "VFS: FUSE 3" --- libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mfolder1/mfile.txt | 1 - .../usvfs/test/fixtures/usvfs_test/basic/source/mod1/mfolder1/mfilew.txt | 1 - .../test/fixtures/usvfs_test/basic/source/mod1/mfolder3/mdeep3/mfile.txt | 1 - libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mod1.txt | 1 - libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mod1w.txt | 1 - libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder2/mfile.txt | 1 - libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfile.txt | 1 - .../fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletemove.txt | 1 - .../fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletemove2p.txt | 1 - .../fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletewrite.txt | 1 - .../usvfs_test/basic/source/mod2/mfolder4/mfiledeletewrite2p.txt | 1 - .../fixtures/usvfs_test/basic/source/mod2/mfolder4/mfilemoveover.txt | 1 - .../fixtures/usvfs_test/basic/source/mod2/mfolder4/mfileoverwrite.txt | 1 - .../test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfilerewrite.txt | 1 - libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mod2.txt | 1 - .../test/fixtures/usvfs_test/basic/source/mod3/mfolder3/mdeep3/mfile.txt | 1 - libs/usvfs/test/fixtures/usvfs_test/basic/source/mod3/mfolder4/mfile.txt | 1 - libs/usvfs/test/fixtures/usvfs_test/basic/source/mod3/mod3.txt | 1 - libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfile.txt | 1 - .../fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletemove.txt | 1 - .../fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletemove2p.txt | 1 - .../fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletewrite.txt | 1 - .../usvfs_test/basic/source/mod4/mfolder4/mfiledeletewrite2p.txt | 1 - .../fixtures/usvfs_test/basic/source/mod4/mfolder4/mfilemoveover.txt | 1 - .../fixtures/usvfs_test/basic/source/mod4/mfolder4/mfileoverwrite.txt | 1 - .../test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfilerewrite.txt | 1 - libs/usvfs/test/fixtures/usvfs_test/basic/source/overwrite/.empty | 0 libs/usvfs/test/fixtures/usvfs_test/basic/source/root1.txt | 1 - libs/usvfs/test/fixtures/usvfs_test/basic/source/root1w.txt | 1 - libs/usvfs/test/fixtures/usvfs_test/basic/source/root2.txt | 1 - libs/usvfs/test/fixtures/usvfs_test/basic/source/root2w.txt | 1 - 31 files changed, 30 deletions(-) delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mfolder1/mfile.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mfolder1/mfilew.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mfolder3/mdeep3/mfile.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mod1.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mod1w.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder2/mfile.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfile.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletemove.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletemove2p.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletewrite.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletewrite2p.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfilemoveover.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfileoverwrite.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfilerewrite.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mod2.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod3/mfolder3/mdeep3/mfile.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod3/mfolder4/mfile.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod3/mod3.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfile.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletemove.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletemove2p.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletewrite.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletewrite2p.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfilemoveover.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfileoverwrite.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfilerewrite.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/overwrite/.empty delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/root1.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/root1w.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/root2.txt delete mode 100644 libs/usvfs/test/fixtures/usvfs_test/basic/source/root2w.txt (limited to 'libs/usvfs/test/fixtures/usvfs_test/basic/source') diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mfolder1/mfile.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mfolder1/mfile.txt deleted file mode 100644 index 227256a..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mfolder1/mfile.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder1\mfile.txt by mod1 diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mfolder1/mfilew.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mfolder1/mfilew.txt deleted file mode 100644 index 420589d..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mfolder1/mfilew.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder1\mfilew.txt by mod1 diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mfolder3/mdeep3/mfile.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mfolder3/mdeep3/mfile.txt deleted file mode 100644 index 6a7a0c2..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mfolder3/mdeep3/mfile.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder3\mdeep3\mfile.txt by mod1 (to be hidden by mod3) diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mod1.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mod1.txt deleted file mode 100644 index 7d5dc0e..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mod1.txt +++ /dev/null @@ -1 +0,0 @@ -hello mod1 diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mod1w.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mod1w.txt deleted file mode 100644 index 1838cdf..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod1/mod1w.txt +++ /dev/null @@ -1 +0,0 @@ -hello mod1w diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder2/mfile.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder2/mfile.txt deleted file mode 100644 index 8ff096e..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder2/mfile.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder2\mfile.txt by mod2 diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfile.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfile.txt deleted file mode 100644 index c0f0f2c..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfile.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder4\mfile.txt by mod2 (to be hidden by mod4) diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletemove.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletemove.txt deleted file mode 100644 index e35f1f3..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletemove.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder4/mfiledeletemove.txt by mod2 (to be hidden by mod4) diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletemove2p.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletemove2p.txt deleted file mode 100644 index cc572dc..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletemove2p.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder4/mfiledeletemove2p.txt by mod2 (to be hidden by mod4) diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletewrite.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletewrite.txt deleted file mode 100644 index f699360..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletewrite.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder4/mfiledeletewrite.txt by mod2 (to be hidden by mod4) diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletewrite2p.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletewrite2p.txt deleted file mode 100644 index 9eae9c5..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfiledeletewrite2p.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder4/mfiledeletewrite2p.txt by mod2 (to be hidden by mod4) diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfilemoveover.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfilemoveover.txt deleted file mode 100644 index 88a6d08..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfilemoveover.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder4/mfilemoveover.txt by mod2 (to be hidden by mod4) diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfileoverwrite.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfileoverwrite.txt deleted file mode 100644 index 61b92a6..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfileoverwrite.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder4\mfileoverwrite.txt by mod2 (to be hidden by mod4) diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfilerewrite.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfilerewrite.txt deleted file mode 100644 index 727a48f..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mfolder4/mfilerewrite.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder4\mfilerewrite.txt by mod2 (to be hidden by mod4) diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mod2.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mod2.txt deleted file mode 100644 index 49bbbf1..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod2/mod2.txt +++ /dev/null @@ -1 +0,0 @@ -hello mod2 diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod3/mfolder3/mdeep3/mfile.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod3/mfolder3/mdeep3/mfile.txt deleted file mode 100644 index fac8213..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod3/mfolder3/mdeep3/mfile.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder3\mdeep3\mfile.txt by mod3 diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod3/mfolder4/mfile.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod3/mfolder4/mfile.txt deleted file mode 100644 index 5e6ca00..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod3/mfolder4/mfile.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder4\mfile.txt by mod3 (to be hidden by mod4) diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod3/mod3.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod3/mod3.txt deleted file mode 100644 index 47fbacd..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod3/mod3.txt +++ /dev/null @@ -1 +0,0 @@ -hello mod3 diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfile.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfile.txt deleted file mode 100644 index c67ecfe..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfile.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder4\mfile.txt by mod4 diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletemove.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletemove.txt deleted file mode 100644 index 657f07d..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletemove.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder4/mfiledeletemove.txt by mod4 diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletemove2p.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletemove2p.txt deleted file mode 100644 index cfd08dd..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletemove2p.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder4/mfiledeletemove2p.txt by mod4 diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletewrite.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletewrite.txt deleted file mode 100644 index a17d129..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletewrite.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder4/mfiledeletewrite.txt by mod4 diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletewrite2p.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletewrite2p.txt deleted file mode 100644 index b198d1c..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfiledeletewrite2p.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder4/mfiledeletewrite2p.txt by mod4 diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfilemoveover.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfilemoveover.txt deleted file mode 100644 index b395908..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfilemoveover.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder4/mfilemoveover.txt by mod4 diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfileoverwrite.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfileoverwrite.txt deleted file mode 100644 index 405c0c1..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfileoverwrite.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder4\mfileoverwrite.txt by mod4 diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfilerewrite.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfilerewrite.txt deleted file mode 100644 index def973c..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/mod4/mfolder4/mfilerewrite.txt +++ /dev/null @@ -1 +0,0 @@ -mfolder4\mfilerewrite.txt by mod4 diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/overwrite/.empty b/libs/usvfs/test/fixtures/usvfs_test/basic/source/overwrite/.empty deleted file mode 100644 index e69de29..0000000 diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/root1.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/root1.txt deleted file mode 100644 index 5aa129b..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/root1.txt +++ /dev/null @@ -1 +0,0 @@ -root1 source file diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/root1w.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/root1w.txt deleted file mode 100644 index 0c04aa5..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/root1w.txt +++ /dev/null @@ -1 +0,0 @@ -root1w source file diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/root2.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/root2.txt deleted file mode 100644 index 4ac40bb..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/root2.txt +++ /dev/null @@ -1 +0,0 @@ -root2 source file diff --git a/libs/usvfs/test/fixtures/usvfs_test/basic/source/root2w.txt b/libs/usvfs/test/fixtures/usvfs_test/basic/source/root2w.txt deleted file mode 100644 index 83ddb42..0000000 --- a/libs/usvfs/test/fixtures/usvfs_test/basic/source/root2w.txt +++ /dev/null @@ -1 +0,0 @@ -root2w source file -- cgit v1.3.1