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/languageclient/languageclientformatter.cpp | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/plugins/languageclient/languageclientformatter.cpp')

diff --git a/src/plugins/languageclient/languageclientformatter.cpp b/src/plugins/languageclient/languageclientformatter.cpp
index f8800e72fe..774b0899de 100644
--- a/src/plugins/languageclient/languageclientformatter.cpp
+++ b/src/plugins/languageclient/languageclientformatter.cpp
@@ -55,7 +55,7 @@ QFutureWatcher<ChangeSet> *LanguageClientFormatter::format(
     const FilePath &filePath = m_document->filePath();
     const DynamicCapabilities dynamicCapabilities = m_client->dynamicCapabilities();
     const QString method(DocumentRangeFormattingRequest::methodName);
-    if (optional<bool> registered = dynamicCapabilities.isRegistered(method)) {
+    if (std::optional<bool> registered = dynamicCapabilities.isRegistered(method)) {
         if (!*registered)
             return nullptr;
         const TextDocumentRegistrationOptions option(dynamicCapabilities.option(method).toObject());
@@ -64,7 +64,7 @@ QFutureWatcher<ChangeSet> *LanguageClientFormatter::format(
             return nullptr;
         }
     } else {
-        const Utils::optional<std::variant<bool, WorkDoneProgressOptions>> &provider
+        const std::optional<std::variant<bool, WorkDoneProgressOptions>> &provider
             = m_client->capabilities().documentRangeFormattingProvider();
         if (!provider.has_value())
             return nullptr;
@@ -106,17 +106,18 @@ void LanguageClientFormatter::cancelCurrentRequest()
         m_progress.reportFinished();
         m_client->cancelRequest(*m_currentRequest);
         m_ignoreCancel = false;
-        m_currentRequest = nullopt;
+        m_currentRequest = std::nullopt;
     }
 }
 
 void LanguageClientFormatter::handleResponse(const DocumentRangeFormattingRequest::Response &response)
 {
-    m_currentRequest = nullopt;
-    if (const optional<DocumentRangeFormattingRequest::Response::Error> &error = response.error())
+    m_currentRequest = std::nullopt;
+    if (const std::optional<DocumentRangeFormattingRequest::Response::Error> &error = response
+                                                                                          .error())
         m_client->log(*error);
     ChangeSet changeSet;
-    if (optional<LanguageClientArray<TextEdit>> result = response.result()) {
+    if (std::optional<LanguageClientArray<TextEdit>> result = response.result()) {
         if (!result->isNull())
             changeSet = editsToChangeSet(result->toList(), m_document->document());
     }
-- 
cgit v1.2.1