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/texteditor/textmark.h | |
| 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/texteditor/textmark.h')
| -rw-r--r-- | src/plugins/texteditor/textmark.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/texteditor/textmark.h b/src/plugins/texteditor/textmark.h index c6bfbc45a8..ed0816224b 100644 --- a/src/plugins/texteditor/textmark.h +++ b/src/plugins/texteditor/textmark.h @@ -7,13 +7,14 @@ #include <utils/fileutils.h> #include <utils/id.h> -#include <utils/optional.h> #include <utils/theme/theme.h> #include <QCoreApplication> #include <QIcon> #include <QVector> +#include <optional> + QT_BEGIN_NAMESPACE class QAction; class QGridLayout; @@ -90,7 +91,7 @@ public: void setVisible(bool isVisible); Utils::Id category() const { return m_category; } - Utils::optional<Utils::Theme::Color> color() const; + std::optional<Utils::Theme::Color> color() const; void setColor(const Utils::Theme::Color &color); QString defaultToolTip() const { return m_defaultToolTip; } @@ -122,7 +123,7 @@ private: Priority m_priority = LowPriority; QIcon m_icon; std::function<QIcon()> m_iconProvider; - Utils::optional<Utils::Theme::Color> m_color; + std::optional<Utils::Theme::Color> m_color; bool m_visible = false; Utils::Id m_category; QString m_lineAnnotation; |