diff options
| author | kumquat-ir <66188216+kumquat-ir@users.noreply.github.com> | 2022-07-31 14:54:50 -0400 |
|---|---|---|
| committer | kumquat-ir <66188216+kumquat-ir@users.noreply.github.com> | 2022-07-31 14:54:50 -0400 |
| commit | 579582740e9efd5a054b02a8b0e1d8999abfa6fa (patch) | |
| tree | 5b07ba3387dfebabd68e534d79f7bf7363aad67c /launcher/modplatform/legacy_ftb | |
| parent | 20b1723e78149c1f2ac4072cbd46997e9c5160fa (diff) | |
| parent | b15544c163ccbca08ea498b3b3a51c82d7fb3e12 (diff) | |
| download | PrismLauncher-579582740e9efd5a054b02a8b0e1d8999abfa6fa.tar.gz PrismLauncher-579582740e9efd5a054b02a8b0e1d8999abfa6fa.tar.bz2 PrismLauncher-579582740e9efd5a054b02a8b0e1d8999abfa6fa.zip | |
Merge remote-tracking branch 'origin/develop' into download-all-blocked
Signed-off-by: kumquat-ir <66188216+kumquat-ir@users.noreply.github.com>
Diffstat (limited to 'launcher/modplatform/legacy_ftb')
| -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; |