3 files changed, 13 insertions, 12 deletions
diff --git a/src/plugins/texteditor/snippets/snippet.cpp b/src/plugins/texteditor/snippets/snippet.cpp
index 885b008026..6dec2efe5e 100644
--- a/src/plugins/texteditor/snippets/snippet.cpp
+++ b/src/plugins/texteditor/snippets/snippet.cpp
@@ -182,10 +182,10 @@ QString Snippet::generateTip() const
 {
     SnippetParseResult result = Snippet::parse(m_content);
 
-    if (Utils::holds_alternative<SnippetParseError>(result))
-        return Utils::get<SnippetParseError>(result).htmlMessage();
-    QTC_ASSERT(Utils::holds_alternative<ParsedSnippet>(result), return {});
-    const ParsedSnippet parsedSnippet = Utils::get<ParsedSnippet>(result);
+    if (std::holds_alternative<SnippetParseError>(result))
+        return std::get<SnippetParseError>(result).htmlMessage();
+    QTC_ASSERT(std::holds_alternative<ParsedSnippet>(result), return {});
+    const ParsedSnippet parsedSnippet = std::get<ParsedSnippet>(result);
 
     QString tip("<nobr>");
     for (const ParsedSnippet::Part &part : parsedSnippet.parts)
@@ -407,11 +407,11 @@ void Internal::TextEditorPlugin::testSnippetParsing()
     QFETCH(Parts, parts);
 
     SnippetParseResult result = Snippet::parse(input);
-    QCOMPARE(Utils::holds_alternative<ParsedSnippet>(result), success);
+    QCOMPARE(std::holds_alternative<ParsedSnippet>(result), success);
     if (!success)
         return;
 
-    ParsedSnippet snippet = Utils::get<ParsedSnippet>(result);
+    ParsedSnippet snippet = std::get<ParsedSnippet>(result);
 
     auto rangesCompare = [&](const ParsedSnippet::Part &actual, const SnippetPart &expected) {
         QCOMPARE(actual.text, expected.text);
diff --git a/src/plugins/texteditor/snippets/snippetparser.h b/src/plugins/texteditor/snippets/snippetparser.h
index 67d0560d02..887cdf6936 100644
--- a/src/plugins/texteditor/snippets/snippetparser.h
+++ b/src/plugins/texteditor/snippets/snippetparser.h
@@ -28,7 +28,8 @@
 #include <texteditor/texteditor_global.h>
 
 #include <utils/id.h>
-#include <utils/variant.h>
+
+#include <variant>
 
 namespace TextEditor {
 
@@ -67,7 +68,7 @@ public:
     QString htmlMessage() const;
 };
 
-using SnippetParseResult = Utils::variant<ParsedSnippet, SnippetParseError>;
+using SnippetParseResult = std::variant<ParsedSnippet, SnippetParseError>;
 using SnippetParser = std::function<SnippetParseResult (const QString &)>;
 
 } // namespace TextEditor
diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 969be964bf..4ed97382b7 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -2761,13 +2761,13 @@ void TextEditorWidget::insertCodeSnippet(const QTextCursor &cursor_arg,
                                          const SnippetParser &parse)
 {
     SnippetParseResult result = parse(snippet);
-    if (Utils::holds_alternative<SnippetParseError>(result)) {
-        const auto &error = Utils::get<SnippetParseError>(result);
+    if (std::holds_alternative<SnippetParseError>(result)) {
+        const auto &error = std::get<SnippetParseError>(result);
         QMessageBox::warning(this, tr("Snippet Parse Error"), error.htmlMessage());
         return;
     }
-    QTC_ASSERT(Utils::holds_alternative<ParsedSnippet>(result), return);
-    ParsedSnippet data = Utils::get<ParsedSnippet>(result);
+    QTC_ASSERT(std::holds_alternative<ParsedSnippet>(result), return);
+    ParsedSnippet data = std::get<ParsedSnippet>(result);
 
     QTextCursor cursor = cursor_arg;
     cursor.beginEditBlock();