Merge pull request #941 from Scrumplex/bump-cxx-standard

Bump to C++17
This commit is contained in:
LennyMcLennington
2022-07-30 17:10:59 +01:00
committed by Sefa Eyeoglu
parent d6d7794cd0
commit dc32f0671b
16 changed files with 33 additions and 612 deletions

View File

@ -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;