summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBret Curtis <psi29a@gmail.com>2023-04-25 16:15:04 +0200
committerBret Curtis <psi29a@gmail.com>2023-04-25 16:15:04 +0200
commit0db31207dc0d703cc785bbf21504a83f488bf987 (patch)
tree4d6af65bbdbe293690c0279d7bb6ea56e32a649f
parent94e467caa36ce8d9cd6b4ebc36b11406f385313f (diff)
remove remaining boost::filesystem cruftremove_boost_filesystem_cruft
-rw-r--r--apps/mwiniimporter/CMakeLists.txt2
-rw-r--r--apps/opencs/CMakeLists.txt1
-rw-r--r--apps/openmw/CMakeLists.txt1
-rw-r--r--components/CMakeLists.txt2
-rw-r--r--components/config/gamesettings.cpp4
-rw-r--r--components/files/configurationmanager.cpp2
6 files changed, 1 insertions, 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
- <boost/filesystem.hpp>
-
<string>
<vector>
)
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
- <boost/filesystem.hpp>
<boost/program_options/options_description.hpp>
<algorithm>
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
- <boost/filesystem.hpp>
<boost/program_options/options_description.hpp>
<sol/sol.hpp>
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)
<MyGUI_Widget.h>
- <boost/filesystem.hpp>
-
<algorithm>
<filesystem>
<fstream>
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() == '"')