refactor!: bump to C++17 and C17

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

9 files changed, 31 insertions, 32 deletions

diff --git a/launcher/CMakeLists.txt b/launcher/CMakeLists.txt
index 3c9aee6a..b540dcab 100644
--- a/launcher/CMakeLists.txt
+++ b/launcher/CMakeLists.txt
@@ -987,7 +987,6 @@ target_link_libraries(Launcher_logic
     Launcher_murmur2
     nbt++
     ${ZLIB_LIBRARIES}
-    optional-bare
     tomlc99
     BuildConfig
     Katabasis
diff --git a/launcher/InstanceImportTask.h b/launcher/InstanceImportTask.h
index b67d48f3..48ba2161 100644
--- a/launcher/InstanceImportTask.h
+++ b/launcher/InstanceImportTask.h
@@ -44,7 +44,7 @@
 #include "QObjectPtr.h"
 #include "modplatform/flame/PackManifest.h"
 
-#include <nonstd/optional>
+#include <optional>
 
 class QuaZip;
 namespace Flame
@@ -90,8 +90,8 @@ private: /* data */
     QString m_archivePath;
     bool m_downloadRequired = 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;
     QVector<Flame::File> m_blockedMods;
     enum class ModpackType{
         Unknown,
diff --git a/launcher/MMCZip.cpp b/launcher/MMCZip.cpp
index 1627ee07..71cca03b 100644
--- a/launcher/MMCZip.cpp
+++ b/launcher/MMCZip.cpp
@@ -267,7 +267,7 @@ bool MMCZip::findFilesInZip(QuaZip * zip, const QString & what, QStringList & re
 
 
 // ours
-nonstd::optional<QStringList> MMCZip::extractSubDir(QuaZip *zip, const QString & subdir, const QString &target)
+std::optional<QStringList> MMCZip::extractSubDir(QuaZip *zip, const QString & subdir, const QString &target)
 {
     QDir directory(target);
     QStringList extracted;
@@ -276,7 +276,7 @@ nonstd::optional<QStringList> MMCZip::extractSubDir(QuaZip *zip, const QString &
     auto numEntries = zip->getEntriesCount();
     if(numEntries < 0) {
         qWarning() << "Failed to enumerate files in archive";
-        return nonstd::nullopt;
+        return std::nullopt;
     }
     else if(numEntries == 0) {
         qDebug() << "Extracting empty archives seems odd...";
@@ -285,7 +285,7 @@ nonstd::optional<QStringList> MMCZip::extractSubDir(QuaZip *zip, const QString &
     else if (!zip->goToFirstFile())
     {
         qWarning() << "Failed to seek to first file in zip";
-        return nonstd::nullopt;
+        return std::nullopt;
     }
 
     do
@@ -322,7 +322,7 @@ nonstd::optional<QStringList> MMCZip::extractSubDir(QuaZip *zip, const QString &
         {
             qWarning() << "Failed to extract file" << original_name << "to" << absFilePath;
             JlCompress::removeFile(extracted);
-            return nonstd::nullopt;
+            return std::nullopt;
         }
 
         extracted.append(absFilePath);
@@ -340,7 +340,7 @@ bool MMCZip::extractRelFile(QuaZip *zip, const QString &file, const QString &tar
 }
 
 // ours
-nonstd::optional<QStringList> MMCZip::extractDir(QString fileCompressed, QString dir)
+std::optional<QStringList> MMCZip::extractDir(QString fileCompressed, QString dir)
 {
     QuaZip zip(fileCompressed);
     if (!zip.open(QuaZip::mdUnzip))
@@ -351,13 +351,13 @@ nonstd::optional<QStringList> MMCZip::extractDir(QString fileCompressed, QString
             return QStringList();
         }
         qWarning() << "Could not open archive for unzipping:" << fileCompressed << "Error:" << zip.getZipError();;
-        return nonstd::nullopt;
+        return std::nullopt;
     }
     return MMCZip::extractSubDir(&zip, "", dir);
 }
 
 // ours
-nonstd::optional<QStringList> MMCZip::extractDir(QString fileCompressed, QString subdir, QString dir)
+std::optional<QStringList> MMCZip::extractDir(QString fileCompressed, QString subdir, QString dir)
 {
     QuaZip zip(fileCompressed);
     if (!zip.open(QuaZip::mdUnzip))
@@ -368,7 +368,7 @@ nonstd::optional<QStringList> MMCZip::extractDir(QString fileCompressed, QString
             return QStringList();
         }
         qWarning() << "Could not open archive for unzipping:" << fileCompressed << "Error:" << zip.getZipError();;
-        return nonstd::nullopt;
+        return std::nullopt;
     }
     return MMCZip::extractSubDir(&zip, subdir, dir);
 }
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
diff --git a/launcher/minecraft/World.cpp b/launcher/minecraft/World.cpp
index dfcb43d8..90fcf337 100644
--- a/launcher/minecraft/World.cpp
+++ b/launcher/minecraft/World.cpp
@@ -53,12 +53,12 @@
 
 #include <QCoreApplication>
 
-#include <nonstd/optional>
+#include <optional>
 
-using nonstd::optional;
-using nonstd::nullopt;
+using std::optional;
+using std::nullopt;
 
-GameType::GameType(nonstd::optional<int> original):
+GameType::GameType(std::optional<int> original):
     original(original)
 {
     if(!original) {
diff --git a/launcher/minecraft/World.h b/launcher/minecraft/World.h
index 0f587620..8327253a 100644
--- a/launcher/minecraft/World.h
+++ b/launcher/minecraft/World.h
@@ -16,11 +16,11 @@
 #pragma once
 #include <QFileInfo>
 #include <QDateTime>
-#include <nonstd/optional>
+#include <optional>
 
 struct GameType {
     GameType() = default;
-    GameType (nonstd::optional<int> original);
+    GameType (std::optional<int> original);
 
     QString toTranslatedString() const;
     QString toLogString() const;
@@ -33,7 +33,7 @@ struct GameType {
         Adventure,
         Spectator
     } type = Unknown;
-    nonstd::optional<int> original;
+    std::optional<int> original;
 };
 
 class World
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