diff options
| author | LennyMcLennington <lenny@sneed.church> | 2022-07-30 17:10:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-30 17:10:59 +0100 |
| commit | 94a63e3859e576658d832c62cffacbb6963ad1e6 (patch) | |
| tree | cb6efc767b734de22675cdba1fed4b9728de509e /launcher/modplatform | |
| parent | 74120fe1f3b072b78298dce68aedb397efb522a2 (diff) | |
| parent | 842b7e6c3974c16adddf3cccda4e0008d8c64597 (diff) | |
| download | PrismLauncher-94a63e3859e576658d832c62cffacbb6963ad1e6.tar.gz PrismLauncher-94a63e3859e576658d832c62cffacbb6963ad1e6.tar.bz2 PrismLauncher-94a63e3859e576658d832c62cffacbb6963ad1e6.zip | |
Merge pull request #941 from Scrumplex/bump-cxx-standard
Bump to C++17
Diffstat (limited to 'launcher/modplatform')
| -rw-r--r-- | launcher/modplatform/atlauncher/ATLPackInstallTask.h | 6 | ||||
| -rw-r--r-- | launcher/modplatform/legacy_ftb/PackInstallTask.h | 6 | ||||
| -rw-r--r-- | launcher/modplatform/technic/SingleZipPackInstallTask.h | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/launcher/modplatform/atlauncher/ATLPackInstallTask.h b/launcher/modplatform/atlauncher/ATLPackInstallTask.h index f55873e9..992ba9c5 100644 --- a/launcher/modplatform/atlauncher/ATLPackInstallTask.h +++ b/launcher/modplatform/atlauncher/ATLPackInstallTask.h @@ -46,7 +46,7 @@ #include "minecraft/PackProfile.h" #include "meta/Version.h" -#include <nonstd/optional> +#include <optional> namespace ATLauncher { @@ -131,8 +131,8 @@ private: Meta::VersionPtr minecraftVersion; QMap<QString, Meta::VersionPtr> componentsToInstall; - QFuture<nonstd::optional<QStringList>> m_extractFuture; - QFutureWatcher<nonstd::optional<QStringList>> m_extractFutureWatcher; + QFuture<std::optional<QStringList>> m_extractFuture; + QFutureWatcher<std::optional<QStringList>> m_extractFutureWatcher; QFuture<bool> m_modExtractFuture; QFutureWatcher<bool> m_modExtractFutureWatcher; diff --git a/launcher/modplatform/legacy_ftb/PackInstallTask.h b/launcher/modplatform/legacy_ftb/PackInstallTask.h index a7395220..da4c0da5 100644 --- a/launcher/modplatform/legacy_ftb/PackInstallTask.h +++ b/launcher/modplatform/legacy_ftb/PackInstallTask.h @@ -10,7 +10,7 @@ #include "net/NetJob.h" -#include <nonstd/optional> +#include <optional> namespace LegacyFTB { @@ -46,8 +46,8 @@ private: /* data */ shared_qobject_ptr<QNetworkAccessManager> m_network; bool abortable = false; std::unique_ptr<QuaZip> m_packZip; - QFuture<nonstd::optional<QStringList>> m_extractFuture; - QFutureWatcher<nonstd::optional<QStringList>> m_extractFutureWatcher; + QFuture<std::optional<QStringList>> m_extractFuture; + QFutureWatcher<std::optional<QStringList>> m_extractFutureWatcher; NetJob::Ptr netJobContainer; QString archivePath; diff --git a/launcher/modplatform/technic/SingleZipPackInstallTask.h b/launcher/modplatform/technic/SingleZipPackInstallTask.h index 4d1fcbff..981ccf8a 100644 --- a/launcher/modplatform/technic/SingleZipPackInstallTask.h +++ b/launcher/modplatform/technic/SingleZipPackInstallTask.h @@ -24,7 +24,7 @@ #include <QStringList> #include <QUrl> -#include <nonstd/optional> +#include <optional> namespace Technic { @@ -57,8 +57,8 @@ private: QString m_archivePath; NetJob::Ptr m_filesNetJob; std::unique_ptr<QuaZip> m_packZip; - QFuture<nonstd::optional<QStringList>> m_extractFuture; - QFutureWatcher<nonstd::optional<QStringList>> m_extractFutureWatcher; + QFuture<std::optional<QStringList>> m_extractFuture; + QFutureWatcher<std::optional<QStringList>> m_extractFutureWatcher; }; } // namespace Technic |