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/MMCZip.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/MMCZip.h')
| -rw-r--r-- | launcher/MMCZip.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/launcher/MMCZip.h b/launcher/MMCZip.h index 7f43d158..ce9775bd 100644 --- a/launcher/MMCZip.h +++ b/launcher/MMCZip.h @@ -42,7 +42,7 @@ #include <functional> #include <quazip/JlCompress.h> -#include <nonstd/optional> +#include <optional> namespace MMCZip { @@ -95,7 +95,7 @@ namespace MMCZip /** * Extract a subdirectory from an archive */ - nonstd::optional<QStringList> extractSubDir(QuaZip *zip, const QString & subdir, const QString &target); + std::optional<QStringList> extractSubDir(QuaZip *zip, const QString & subdir, const QString &target); bool extractRelFile(QuaZip *zip, const QString & file, const QString &target); @@ -106,7 +106,7 @@ namespace MMCZip * \param dir The directory to extract to, the current directory if left empty. * \return The list of the full paths of the files extracted, empty on failure. */ - nonstd::optional<QStringList> extractDir(QString fileCompressed, QString dir); + std::optional<QStringList> extractDir(QString fileCompressed, QString dir); /** * Extract a subdirectory from an archive @@ -116,7 +116,7 @@ namespace MMCZip * \param dir The directory to extract to, the current directory if left empty. * \return The list of the full paths of the files extracted, empty on failure. */ - nonstd::optional<QStringList> extractDir(QString fileCompressed, QString subdir, QString dir); + std::optional<QStringList> extractDir(QString fileCompressed, QString subdir, QString dir); /** * Extract a single file from an archive into a directory |