diff --git a/src/QtUtils.cpp b/src/QtUtils.cpp index 6a25209259..4a696653af 100644 --- a/src/QtUtils.cpp +++ b/src/QtUtils.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include namespace Mumble { namespace QtUtils { @@ -25,11 +25,11 @@ namespace QtUtils { return QString(); } - boost::filesystem::path qstring_to_path(const QString &input) { + std::filesystem::path qstring_to_path(const QString &input) { #ifdef _WIN32 - return boost::filesystem::path(input.toStdWString()); + return std::filesystem::path(input.toStdWString()); #else - return boost::filesystem::path(input.toUtf8()); + return std::filesystem::path(input.toUtf8().data()); #endif } diff --git a/src/QtUtils.h b/src/QtUtils.h index 02aa0680e1..339716e017 100644 --- a/src/QtUtils.h +++ b/src/QtUtils.h @@ -10,7 +10,7 @@ #include #include -#include +#include #include @@ -39,7 +39,7 @@ namespace QtUtils { /** * Creates a platform agnostic path from a QString */ - boost::filesystem::path qstring_to_path(const QString &input); + std::filesystem::path qstring_to_path(const QString &input); } // namespace QtUtils } // namespace Mumble diff --git a/src/mumble/PluginInstaller.cpp b/src/mumble/PluginInstaller.cpp index 377909a649..2fa0e245fb 100644 --- a/src/mumble/PluginInstaller.cpp +++ b/src/mumble/PluginInstaller.cpp @@ -19,10 +19,9 @@ #include #include +#include #include -#include - #include #include #include @@ -129,8 +128,7 @@ void PluginInstaller::init() { zipInput.clear(); Poco::Zip::ZipInputStream zipin(zipInput, pluginIt->second); - boost::filesystem::ofstream out(Mumble::QtUtils::qstring_to_path(tmpPluginPath), - std::ios::out | std::ios::binary); + std::ofstream out(Mumble::QtUtils::qstring_to_path(tmpPluginPath), std::ios::out | std::ios::binary); Poco::StreamCopier::copyStream(zipin, out); m_pluginSource = QFileInfo(tmpPluginPath); diff --git a/src/mumble/Settings.cpp b/src/mumble/Settings.cpp index a6adfb8a1a..4a02bc0908 100644 --- a/src/mumble/Settings.cpp +++ b/src/mumble/Settings.cpp @@ -34,12 +34,12 @@ #include #include -#include #include #include #include #include +#include #include #include @@ -156,7 +156,7 @@ void Settings::save(const QString &path) const { QFile tmpFile(QString::fromLatin1("%1/mumble_settings.json.tmp") .arg(QStandardPaths::writableLocation(QStandardPaths::TempLocation))); - boost::filesystem::ofstream stream(Mumble::QtUtils::qstring_to_path(tmpFile.fileName())); + std::ofstream stream(Mumble::QtUtils::qstring_to_path(tmpFile.fileName())); stream << settingsJSON.dump(4) << std::endl; stream.close(); @@ -224,7 +224,7 @@ void Settings::load(const QString &path) { settingsLocation = path; } - boost::filesystem::ifstream stream(Mumble::QtUtils::qstring_to_path(path)); + std::ifstream stream(Mumble::QtUtils::qstring_to_path(path)); nlohmann::json settingsJSON; try { @@ -613,13 +613,13 @@ void OverlaySettings::savePresets(const QString &filename) { settingsJSON.erase(SettingsKeys::OVERLAY_LAUNCHERS_KEY); settingsJSON.erase(SettingsKeys::OVERLAY_LAUNCHERS_EXCLUDE_KEY); - boost::filesystem::ofstream stream(Mumble::QtUtils::qstring_to_path(filename)); + std::ofstream stream(Mumble::QtUtils::qstring_to_path(filename)); stream << settingsJSON.dump(4) << std::endl; } void OverlaySettings::load(const QString &filename) { - boost::filesystem::ifstream stream(Mumble::QtUtils::qstring_to_path(filename)); + std::ifstream stream(Mumble::QtUtils::qstring_to_path(filename)); nlohmann::json settingsJSON; try {