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>

1 files changed, 12 insertions, 6 deletions

diff --git a/src/libs/utils/outputformatter.h b/src/libs/utils/outputformatter.h
index e01371ed0b..3a31d97d26 100644
--- a/src/libs/utils/outputformatter.h
+++ b/src/libs/utils/outputformatter.h
@@ -6,12 +6,12 @@
 #include "utils_global.h"
 
 #include "filepath.h"
-#include "optional.h"
 #include "outputformat.h"
 
 #include <QObject>
 
 #include <functional>
+#include <optional>
 
 QT_BEGIN_NAMESPACE
 class QPlainTextEdit;
@@ -44,13 +44,19 @@ public:
     using LinkSpecs = QList<LinkSpec>;
     class Result {
     public:
-        Result(Status s, const LinkSpecs &l = {}, const optional<QString> &c = {},
-               const optional<OutputFormat> &f = {})
-            : status(s), linkSpecs(l), newContent(c), formatOverride(f) {}
+        Result(Status s,
+               const LinkSpecs &l = {},
+               const std::optional<QString> &c = {},
+               const std::optional<OutputFormat> &f = {})
+            : status(s)
+            , linkSpecs(l)
+            , newContent(c)
+            , formatOverride(f)
+        {}
         Status status;
         LinkSpecs linkSpecs;
-        optional<QString> newContent; // Hard content override. Only to be used in extreme cases.
-        optional<OutputFormat> formatOverride;
+        std::optional<QString> newContent; // Hard content override. Only to be used in extreme cases.
+        std::optional<OutputFormat> formatOverride;
     };
 
     static bool isLinkTarget(const QString &target);