diff options
| author | Marco Bubke <marco.bubke@qt.io> | 2022-08-19 14:47:59 +0200 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@qt.io> | 2022-08-23 09:51:43 +0000 |
| commit | 84c1d6572bce6fc6c1edb5c6246e81bdb841f00a (patch) | |
| tree | bddfc71e61fa44ed8e77a24935ad1e640f376a70 /src/plugins/languageclient/languageclientformatter.cpp | |
| parent | 17693bc41518ee1c15d673dfee3c3818057b1895 (diff) | |
| download | qt-creator-84c1d6572bce6fc6c1edb5c6246e81bdb841f00a.tar.gz | |
Utils: Remove variant.h
Since we are now requiring macOS 10.14 we can remove our local copy of
std::variant and use for macOS std::variant too.
Change-Id: I589d03b35fc56878b7392ffa7047a439e588fe43
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/languageclient/languageclientformatter.cpp')
| -rw-r--r-- | src/plugins/languageclient/languageclientformatter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/languageclient/languageclientformatter.cpp b/src/plugins/languageclient/languageclientformatter.cpp index f1cea20b93..f6b811f917 100644 --- a/src/plugins/languageclient/languageclientformatter.cpp +++ b/src/plugins/languageclient/languageclientformatter.cpp @@ -86,11 +86,11 @@ QFutureWatcher<ChangeSet> *LanguageClientFormatter::format( return nullptr; } } else { - const Utils::optional<Utils::variant<bool, WorkDoneProgressOptions>> &provider + const Utils::optional<std::variant<bool, WorkDoneProgressOptions>> &provider = m_client->capabilities().documentRangeFormattingProvider(); if (!provider.has_value()) return nullptr; - if (Utils::holds_alternative<bool>(*provider) && !Utils::get<bool>(*provider)) + if (std::holds_alternative<bool>(*provider) && !std::get<bool>(*provider)) return nullptr; } DocumentRangeFormattingParams params; |