diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-08-26 10:30:00 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-09-01 06:58:04 +0000 |
| commit | 04e50438eb85c1b2be6d4dcdfd5319cdb55ae576 (patch) | |
| tree | 4a3e9f078730bb538e2ca2751d189ff14a89901e /src/plugins/clangformat | |
| parent | 34a9491a08639f8df0b55d74d51f4dadaa1cc2fd (diff) | |
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>
Diffstat (limited to 'src/plugins/clangformat')
5 files changed, 7 insertions, 6 deletions
diff --git a/src/plugins/clangformat/clangformatbaseindenter.cpp b/src/plugins/clangformat/clangformatbaseindenter.cpp index 7fa4ac9cb1..34039583ed 100644 --- a/src/plugins/clangformat/clangformatbaseindenter.cpp +++ b/src/plugins/clangformat/clangformatbaseindenter.cpp @@ -706,7 +706,7 @@ bool ClangFormatBaseIndenter::isElectricCharacter(const QChar &ch) const return false; } -Utils::optional<int> ClangFormat::ClangFormatBaseIndenter::margin() const +std::optional<int> ClangFormat::ClangFormatBaseIndenter::margin() const { return styleForFile().ColumnLimit; } diff --git a/src/plugins/clangformat/clangformatbaseindenter.h b/src/plugins/clangformat/clangformatbaseindenter.h index 7174a0b4af..aa5290f4ff 100644 --- a/src/plugins/clangformat/clangformatbaseindenter.h +++ b/src/plugins/clangformat/clangformatbaseindenter.h @@ -44,7 +44,7 @@ public: bool isElectricCharacter(const QChar &ch) const override; - Utils::optional<int> margin() const override; + std::optional<int> margin() const override; clang::format::FormatStyle styleForFile() const; diff --git a/src/plugins/clangformat/clangformatindenter.cpp b/src/plugins/clangformat/clangformatindenter.cpp index 75383a1bc7..8328d3fdfb 100644 --- a/src/plugins/clangformat/clangformatindenter.cpp +++ b/src/plugins/clangformat/clangformatindenter.cpp @@ -55,7 +55,7 @@ bool ClangFormatIndenter::formatCodeInsteadOfIndent() const return ClangFormatSettings::instance().mode() == ClangFormatSettings::Mode::Formatting; } -Utils::optional<TabSettings> ClangFormatIndenter::tabSettings() const +std::optional<TabSettings> ClangFormatIndenter::tabSettings() const { FormatStyle style = styleForFile(); TabSettings tabSettings; diff --git a/src/plugins/clangformat/clangformatindenter.h b/src/plugins/clangformat/clangformatindenter.h index 438ab2a0bd..0303b3c066 100644 --- a/src/plugins/clangformat/clangformatindenter.h +++ b/src/plugins/clangformat/clangformatindenter.h @@ -13,7 +13,7 @@ class ClangFormatIndenter final : public ClangFormatBaseIndenter { public: ClangFormatIndenter(QTextDocument *doc); - Utils::optional<TextEditor::TabSettings> tabSettings() const override; + std::optional<TextEditor::TabSettings> tabSettings() const override; bool formatOnSave() const override; private: diff --git a/src/plugins/clangformat/tests/clangformat-test.cpp b/src/plugins/clangformat/tests/clangformat-test.cpp index ede1768783..74107a40e7 100644 --- a/src/plugins/clangformat/tests/clangformat-test.cpp +++ b/src/plugins/clangformat/tests/clangformat-test.cpp @@ -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 |