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

Utils: Remove Utils::optional

Browse Source 
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:
Eike Ziller
2022-08-26 10:30:00 +02:00
parent 34a9491a08
commit 04e50438eb
247 changed files with 1053 additions and 3751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}

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

@@ -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;

2
src/plugins/clangformat/clangformatindenter.cpp
View File

@@ -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;

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

@@ -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:

5
src/plugins/clangformat/tests/clangformat-test.cpp
View File

@@ -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