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/src/shared/stringutils.h | 57 ------------------------------------- 1 file changed, 57 deletions(-) delete mode 100644 libs/usvfs/src/shared/stringutils.h (limited to 'libs/usvfs/src/shared/stringutils.h') diff --git a/libs/usvfs/src/shared/stringutils.h b/libs/usvfs/src/shared/stringutils.h deleted file mode 100644 index 64d0af7..0000000 --- a/libs/usvfs/src/shared/stringutils.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -Userspace Virtual Filesystem - -Copyright (C) 2015 Sebastian Herbord. All rights reserved. - -This file is part of usvfs. - -usvfs is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -usvfs is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with usvfs. If not, see . -*/ -#pragma once - -namespace usvfs::shared -{ - -void strncpy_sz(char* dest, const char* src, size_t destSize); -void wcsncpy_sz(wchar_t* dest, const wchar_t* src, size_t destSize); - -bool startswith(const wchar_t* string, const wchar_t* subString); - -// Return path when appended to a_From will resolve to same as a_To -fs::path make_relative(const fs::path& from, const fs::path& to); - -std::string to_hex(void* bufferIn, size_t bufferSize); - -// convert unicode string to upper-case (locale invariant) -std::wstring to_upper(const std::wstring& input); - -// formats a number with thousand separators and B at the end -// -std::string byte_string(std::size_t n); - -class FormatGuard -{ - std::ostream& m_Stream; - std::ios::fmtflags m_Flags; - -public: - FormatGuard(std::ostream& stream) : m_Stream(stream), m_Flags(stream.flags()) {} - - ~FormatGuard() { m_Stream.flags(m_Flags); } - - FormatGuard(const FormatGuard&) = delete; - FormatGuard& operator=(FormatGuard&) = delete; -}; - -} // namespace usvfs::shared -- cgit v1.3.1