From 0db31207dc0d703cc785bbf21504a83f488bf987 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Tue, 25 Apr 2023 16:15:04 +0200 Subject: [PATCH] remove remaining boost::filesystem cruft --- apps/mwiniimporter/CMakeLists.txt | 2 -- apps/opencs/CMakeLists.txt | 1 - apps/openmw/CMakeLists.txt | 1 - components/CMakeLists.txt | 2 -- components/config/gamesettings.cpp | 4 ---- components/files/configurationmanager.cpp | 2 +- 6 files changed, 1 insertion(+), 11 deletions(-) diff --git a/apps/mwiniimporter/CMakeLists.txt b/apps/mwiniimporter/CMakeLists.txt index d5cd2e6362..c2329941c0 100644 --- a/apps/mwiniimporter/CMakeLists.txt +++ b/apps/mwiniimporter/CMakeLists.txt @@ -35,8 +35,6 @@ endif() if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC) target_precompile_headers(openmw-iniimporter PRIVATE - - ) diff --git a/apps/opencs/CMakeLists.txt b/apps/opencs/CMakeLists.txt index d6fb6691ce..0d0741c15a 100644 --- a/apps/opencs/CMakeLists.txt +++ b/apps/opencs/CMakeLists.txt @@ -288,7 +288,6 @@ endif() if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC) target_precompile_headers(openmw-cs-lib PRIVATE - diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index 1a49f2f53c..0c3a93e656 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -158,7 +158,6 @@ target_link_libraries(openmw if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC) target_precompile_headers(openmw PRIVATE - diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 3f81bdc714..1140ddcf2e 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -623,8 +623,6 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC) - - diff --git a/components/config/gamesettings.cpp b/components/config/gamesettings.cpp index 46dd1fca9b..8f633f1e1e 100644 --- a/components/config/gamesettings.cpp +++ b/components/config/gamesettings.cpp @@ -179,15 +179,11 @@ bool Config::GameSettings::writeFile(QTextStream& stream) { i--; - // path lines (e.g. 'data=...') need quotes and ampersands escaping to match how boost::filesystem::path uses - // boost::io::quoted if (i.key() == QLatin1String("data") || i.key() == QLatin1String("data-local") || i.key() == QLatin1String("resources") || i.key() == QLatin1String("load-savegame")) { stream << i.key() << "="; - // The following is based on boost::io::detail::quoted_manip.hpp, but calling those functions did not work - // as there are too may QStrings involved QChar delim = '\"'; QChar escape = '&'; QString string = i.value(); diff --git a/components/files/configurationmanager.cpp b/components/files/configurationmanager.cpp index 40dbeb3526..7206126599 100644 --- a/components/files/configurationmanager.cpp +++ b/components/files/configurationmanager.cpp @@ -440,7 +440,7 @@ namespace Files std::istream& operator>>(std::istream& istream, MaybeQuotedPath& MaybeQuotedPath) { - // If the stream starts with a double quote, read from stream using boost::filesystem::path rules, then discard + // If the stream starts with a double quote, read from stream using std::filesystem::path rules, then discard // anything remaining. This prevents boost::program_options getting upset that we've not consumed the whole // stream. If it doesn't start with a double quote, read the whole thing verbatim if (istream.peek() == '"')