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/cppeditor/cppquickfixsettings.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/cppeditor/cppquickfixsettings.h')
| -rw-r--r-- | src/plugins/cppeditor/cppquickfixsettings.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/cppeditor/cppquickfixsettings.h b/src/plugins/cppeditor/cppquickfixsettings.h index 78032ab51d..0ac2ed91f8 100644 --- a/src/plugins/cppeditor/cppquickfixsettings.h +++ b/src/plugins/cppeditor/cppquickfixsettings.h @@ -3,11 +3,10 @@ #pragma once -#include <utils/optional.h> - #include <QString> #include <QStringList> +#include <optional> #include <vector> QT_BEGIN_NAMESPACE @@ -48,7 +47,7 @@ public: QString assignment = "<cur> = <new>"; const static inline QString TYPE_PATTERN = "<type>"; const static inline QString TEMPLATE_PARAMETER_PATTERN = "<T>"; - Utils::optional<QString> returnTypeTemplate; + std::optional<QString> returnTypeTemplate; void replacePlaceholders(QString currentValueVariableName, QString newValueVariableName); }; |