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/clangtools/clangtoolslogfilereader.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/clangtools/clangtoolslogfilereader.h')
-rw-r--r-- | src/plugins/clangtools/clangtoolslogfilereader.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/clangtools/clangtoolslogfilereader.h b/src/plugins/clangtools/clangtoolslogfilereader.h index 4a069381c2..fb062f3b8e 100644 --- a/src/plugins/clangtools/clangtoolslogfilereader.h +++ b/src/plugins/clangtools/clangtoolslogfilereader.h @@ -3,10 +3,11 @@ #pragma once -#include <utils/optional.h> #include "clangtoolsdiagnostic.h" +#include <optional> + namespace Utils { class FilePath; } namespace ClangTools { @@ -27,7 +28,7 @@ struct LineColumnInfo { int column = 1; // 1-based int lineStartOffset = 0; // for optimiation/caching purposes }; -using OptionalLineColumnInfo = Utils::optional<LineColumnInfo>; +using OptionalLineColumnInfo = std::optional<LineColumnInfo>; OptionalLineColumnInfo byteOffsetInUtf8TextToLineColumn(const char *text, int offset, int startLine = 1); |