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/legacy_ftb/PackInstallTask.h | |
| 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/legacy_ftb/PackInstallTask.h')
| -rw-r--r-- | launcher/modplatform/legacy_ftb/PackInstallTask.h | 6 |
1 files changed, 3 insertions, 3 deletions
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; |