feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Compile fix: use Utils::optional instead of std::optional

Browse Source 
Amends d9cd74f06d

Change-Id: Ic4a971fa2fb4659784afdc19f5b8db6a378f611e
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2021-02-02 08:01:32 +01:00
parent 25e7b2c5d6
commit 874029809f
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangformat/clangformatbaseindenter.h
View File

@@ -66,7 +66,7 @@ public:
bool isElectricCharacter(const QChar &ch) const override; bool isElectricCharacter(const QChar &ch) const override;
std::optional<int> margin() const override; Utils::optional<int> margin() const override;
protected: protected:
virtual clang::format::FormatStyle styleForFile() const; virtual clang::format::FormatStyle styleForFile() const;

2
src/plugins/texteditor/indenter.h
View File

@@ -120,7 +120,7 @@ public:
int cursorPositionInEditor = -1) int cursorPositionInEditor = -1)
= 0; = 0;
virtual std::optional<int> margin() const { return std::nullopt; } virtual Utils::optional<int> margin() const { return std::nullopt; }
protected: protected:
QTextDocument *m_doc; QTextDocument *m_doc;