Utils: Remove Utils::optional

Since we are now requiring macOS 10.14 we can remove our local
implementation of optional and use std::optional for macOS too.

Change-Id: I2bd018261b68da64f7f031a812045dd7784697e1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marco Bubke <marco.bubke@qt.io>

7 files changed, 12 insertions, 13 deletions

diff --git a/src/plugins/cppeditor/compileroptionsbuilder_test.cpp b/src/plugins/cppeditor/compileroptionsbuilder_test.cpp
index 523a3c9a2d..a2de9d9c81 100644
--- a/src/plugins/cppeditor/compileroptionsbuilder_test.cpp
+++ b/src/plugins/cppeditor/compileroptionsbuilder_test.cpp
@@ -81,7 +81,7 @@ public:
     QStringList extraFlags;
     bool isMsvc2015 = false;
 
-    Utils::optional<CompilerOptionsBuilder> compilerOptionsBuilder;
+    std::optional<CompilerOptionsBuilder> compilerOptionsBuilder;
 
 private:
     ProjectPart::ConstPtr projectPart;
diff --git a/src/plugins/cppeditor/cppcodemodelsettings.cpp b/src/plugins/cppeditor/cppcodemodelsettings.cpp
index cea4de6a7c..15280ef2a6 100644
--- a/src/plugins/cppeditor/cppcodemodelsettings.cpp
+++ b/src/plugins/cppeditor/cppcodemodelsettings.cpp
@@ -194,7 +194,7 @@ bool ClangdSettings::hardwareFulfillsRequirements()
     instance().m_data.haveCheckedHardwareReqirements = true;
     instance().saveSettings();
     const quint64 minRam = quint64(12) * 1024 * 1024 * 1024;
-    const Utils::optional<quint64> totalRam = Utils::HostOsInfo::totalMemoryInstalledInBytes();
+    const std::optional<quint64> totalRam = Utils::HostOsInfo::totalMemoryInstalledInBytes();
     return !totalRam || *totalRam >= minRam;
 }
 
diff --git a/src/plugins/cppeditor/cppcodestylesettings.cpp b/src/plugins/cppeditor/cppcodestylesettings.cpp
index 2fc9df0c11..31344ad52a 100644
--- a/src/plugins/cppeditor/cppcodestylesettings.cpp
+++ b/src/plugins/cppeditor/cppcodestylesettings.cpp
@@ -210,7 +210,7 @@ static void configureOverviewWithCodeStyleSettings(CPlusPlus::Overview &overview
 CPlusPlus::Overview CppCodeStyleSettings::currentProjectCodeStyleOverview()
 {
     CPlusPlus::Overview overview;
-    const Utils::optional<CppCodeStyleSettings> codeStyleSettings = currentProjectCodeStyle();
+    const std::optional<CppCodeStyleSettings> codeStyleSettings = currentProjectCodeStyle();
     configureOverviewWithCodeStyleSettings(overview,
                                            codeStyleSettings.value_or(currentGlobalCodeStyle()));
     return overview;
diff --git a/src/plugins/cppeditor/cppcodestylesettings.h b/src/plugins/cppeditor/cppcodestylesettings.h
index 9b36aeddb1..cf763ddde0 100644
--- a/src/plugins/cppeditor/cppcodestylesettings.h
+++ b/src/plugins/cppeditor/cppcodestylesettings.h
@@ -5,10 +5,10 @@
 
 #include "cppeditor_global.h"
 
-#include <utils/optional.h>
-
 #include <QVariantMap>
 
+#include <optional>
+
 namespace CPlusPlus { class Overview; }
 namespace TextEditor { class TabSettings; }
 namespace ProjectExplorer { class Project; }
diff --git a/src/plugins/cppeditor/cppquickfixes.cpp b/src/plugins/cppeditor/cppquickfixes.cpp
index 1bd8bda761..c2c91acec7 100644
--- a/src/plugins/cppeditor/cppquickfixes.cpp
+++ b/src/plugins/cppeditor/cppquickfixes.cpp
@@ -3346,7 +3346,7 @@ void InsertDefsFromDecls::match(const CppQuickFixInterface &interface, QuickFixO
 
 namespace {
 
-Utils::optional<FullySpecifiedType> getFirstTemplateParameter(const Name *name)
+std::optional<FullySpecifiedType> getFirstTemplateParameter(const Name *name)
 {
     if (const QualifiedNameId *qualifiedName = name->asQualifiedNameId())
         return getFirstTemplateParameter(qualifiedName->name());
@@ -3358,7 +3358,7 @@ Utils::optional<FullySpecifiedType> getFirstTemplateParameter(const Name *name)
     return {};
 }
 
-Utils::optional<FullySpecifiedType> getFirstTemplateParameter(Type *type)
+std::optional<FullySpecifiedType> getFirstTemplateParameter(Type *type)
 {
     if (NamedType *namedType = type->asNamedType())
         return getFirstTemplateParameter(namedType->name());
@@ -3366,7 +3366,7 @@ Utils::optional<FullySpecifiedType> getFirstTemplateParameter(Type *type)
     return {};
 }
 
-Utils::optional<FullySpecifiedType> getFirstTemplateParameter(FullySpecifiedType type)
+std::optional<FullySpecifiedType> getFirstTemplateParameter(FullySpecifiedType type)
 {
     return getFirstTemplateParameter(type.type());
 }
@@ -3870,7 +3870,7 @@ void GetterSetterRefactoringHelper::performGeneration(ExistingGetterSetterData d
     getSetTemplate.replacePlaceholders(data.memberVariableName, parameterName);
 
     using Pattern = CppQuickFixSettings::GetterSetterTemplate;
-    Utils::optional<FullySpecifiedType> returnTypeTemplateParameter;
+    std::optional<FullySpecifiedType> returnTypeTemplateParameter;
     if (getSetTemplate.returnTypeTemplate.has_value()) {
         QString returnTypeTemplate = getSetTemplate.returnTypeTemplate.value();
         if (returnTypeTemplate.contains(Pattern::TEMPLATE_PARAMETER_PATTERN)) {
diff --git a/src/plugins/cppeditor/cppquickfixsettings.h b/src/plugins/cppeditor/cppquickfixsettings.h
index 78032ab51d..0ac2ed91f8 100644
--- a/src/plugins/cppeditor/cppquickfixsettings.h
+++ b/src/plugins/cppeditor/cppquickfixsettings.h
@@ -3,11 +3,10 @@
 
 #pragma once
 
-#include <utils/optional.h>
-
 #include <QString>
 #include <QStringList>
 
+#include <optional>
 #include <vector>
 
 QT_BEGIN_NAMESPACE
@@ -48,7 +47,7 @@ public:
         QString assignment = "<cur> = <new>";
         const static inline QString TYPE_PATTERN = "<type>";
         const static inline QString TEMPLATE_PARAMETER_PATTERN = "<T>";
-        Utils::optional<QString> returnTypeTemplate;
+        std::optional<QString> returnTypeTemplate;
         void replacePlaceholders(QString currentValueVariableName, QString newValueVariableName);
     };
 
diff --git a/src/plugins/cppeditor/projectinfo_test.cpp b/src/plugins/cppeditor/projectinfo_test.cpp
index b2ea784135..de1807c1fd 100644
--- a/src/plugins/cppeditor/projectinfo_test.cpp
+++ b/src/plugins/cppeditor/projectinfo_test.cpp
@@ -513,7 +513,7 @@ public:
         user("/projectb/user_path"),
         user("/project/user_path")};
 
-    Utils::optional<HeaderPathFilter> filter;
+    std::optional<HeaderPathFilter> filter;
 
 private:
     ProjectPart::ConstPtr projectPart;