From 874029809f10fb8fb031c909aa70353853234a91 Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Tue, 2 Feb 2021 08:01:32 +0100
Subject: [PATCH] Compile fix: use Utils::optional instead of std::optional

Amends d9cd74f06db92a03a2e3a3fa2bdd6981da33ddd2

Change-Id: Ic4a971fa2fb4659784afdc19f5b8db6a378f611e
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/clangformat/clangformatbaseindenter.h | 2 +-
 src/plugins/texteditor/indenter.h                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/plugins/clangformat/clangformatbaseindenter.h b/src/plugins/clangformat/clangformatbaseindenter.h
index 2e8e944c5bf..14c54db7609 100644
--- a/src/plugins/clangformat/clangformatbaseindenter.h
+++ b/src/plugins/clangformat/clangformatbaseindenter.h
@@ -66,7 +66,7 @@ public:
 
     bool isElectricCharacter(const QChar &ch) const override;
 
-    std::optional<int> margin() const override;
+    Utils::optional<int> margin() const override;
 
 protected:
     virtual clang::format::FormatStyle styleForFile() const;
diff --git a/src/plugins/texteditor/indenter.h b/src/plugins/texteditor/indenter.h
index 407778b7172..1d64dce5e11 100644
--- a/src/plugins/texteditor/indenter.h
+++ b/src/plugins/texteditor/indenter.h
@@ -120,7 +120,7 @@ public:
                           int cursorPositionInEditor = -1)
         = 0;
 
-    virtual std::optional<int> margin() const { return std::nullopt; }
+    virtual Utils::optional<int> margin() const { return std::nullopt; }
 
 protected:
     QTextDocument *m_doc;