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

Fix compilation by not using optional from std

Browse Source 
Amends 874029809f

Change-Id: I7eee4700a67b429fa2012389c39a0c965443a065
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Eike Ziller
2021-02-02 11:15:01 +01:00
parent cb1dc81c86
commit 91db1b51ab
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.cpp
View File

@@ -679,7 +679,7 @@ bool ClangFormatBaseIndenter::isElectricCharacter(const QChar &ch) const
return false; return false;
} }
std::optional<int> ClangFormat::ClangFormatBaseIndenter::margin() const Utils::optional<int> ClangFormat::ClangFormatBaseIndenter::margin() const
{ {
return styleForFile().ColumnLimit; return styleForFile().ColumnLimit;
} }

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

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