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/fakevim/fakevimhandler.cpp | |
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/fakevim/fakevimhandler.cpp')
-rw-r--r-- | src/plugins/fakevim/fakevimhandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/fakevim/fakevimhandler.cpp b/src/plugins/fakevim/fakevimhandler.cpp index 7374c7203a..fa52d2aba2 100644 --- a/src/plugins/fakevim/fakevimhandler.cpp +++ b/src/plugins/fakevim/fakevimhandler.cpp @@ -36,7 +36,6 @@ #include "fakevimactions.h" #include "fakevimtr.h" -#include <utils/optional.h> #include <utils/qtcprocess.h> #include <QDebug> @@ -67,6 +66,7 @@ #include <climits> #include <ctype.h> #include <functional> +#include <optional> //#define DEBUG_KEY 1 #if DEBUG_KEY @@ -2400,7 +2400,7 @@ public: // If empty, cx{motion} will store the range defined by {motion} here. // If non-empty, cx{motion} replaces the {motion} with selectText(*exchangeData) - Utils::optional<Range> exchangeRange; + std::optional<Range> exchangeRange; bool surroundUpperCaseS; // True for yS and cS, false otherwise QString surroundFunction; // Used for storing the function name provided to ys{motion}f |