forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -7,12 +7,13 @@
|
||||
|
||||
#include <texteditor/tabsettings.h>
|
||||
#include <utils/fileutils.h>
|
||||
#include <utils/optional.h>
|
||||
|
||||
#include <QTextCursor>
|
||||
#include <QTextDocument>
|
||||
#include <QtTest>
|
||||
|
||||
#include <optional>
|
||||
|
||||
namespace ClangFormat::Internal {
|
||||
|
||||
class ClangFormatTestIndenter : public ClangFormatBaseIndenter
|
||||
@@ -21,7 +22,7 @@ public:
|
||||
ClangFormatTestIndenter(QTextDocument *doc) : ClangFormatBaseIndenter(doc) {}
|
||||
|
||||
private:
|
||||
Utils::optional<TextEditor::TabSettings> tabSettings() const override { return {}; }
|
||||
std::optional<TextEditor::TabSettings> tabSettings() const override { return {}; }
|
||||
};
|
||||
|
||||
class ClangFormatExtendedTestIndenter : public ClangFormatTestIndenter
|
||||
|
||||
Reference in New Issue
Block a user