mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-27 03:35:27 +00:00
remove remaining boost::filesystem cruft
This commit is contained in:
parent
94e467caa3
commit
0db31207dc
@ -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>
|
||||
)
|
||||
|
@ -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>
|
||||
|
@ -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>
|
||||
|
@ -623,8 +623,6 @@ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.16 AND MSVC)
|
||||
|
||||
<MyGUI_Widget.h>
|
||||
|
||||
<boost/filesystem.hpp>
|
||||
|
||||
<algorithm>
|
||||
<filesystem>
|
||||
<fstream>
|
||||
|
@ -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();
|
||||
|
@ -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() == '"')
|
||||
|
Loading…
x
Reference in New Issue
Block a user