From 04e50438eb85c1b2be6d4dcdfd5319cdb55ae576 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Fri, 26 Aug 2022 10:30:00 +0200
Subject: 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>
---
 src/plugins/cppeditor/cppquickfixsettings.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/plugins/cppeditor/cppquickfixsettings.h')

diff --git a/src/plugins/cppeditor/cppquickfixsettings.h b/src/plugins/cppeditor/cppquickfixsettings.h
index 78032ab51d9..0ac2ed91f86 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);
     };
 
-- 
cgit v1.2.3