1 files changed, 6 insertions, 5 deletions
diff --git a/src/plugins/languageclient/languageclientutils.cpp b/src/plugins/languageclient/languageclientutils.cpp
index 72bb015757..a97bd7ff50 100644
--- a/src/plugins/languageclient/languageclientutils.cpp
+++ b/src/plugins/languageclient/languageclientutils.cpp
@@ -41,6 +41,7 @@
 #include <utils/treeviewcombobox.h>
 #include <utils/utilsicons.h>
 
+#include <QActionGroup>
 #include <QFile>
 #include <QMenu>
 #include <QTextDocument>
@@ -81,9 +82,9 @@ bool applyTextDocumentEdit(const TextDocumentEdit &edit)
     const QList<TextEdit> &edits = edit.edits();
     if (edits.isEmpty())
         return true;
-    const DocumentUri &uri = edit.id().uri();
+    const DocumentUri &uri = edit.textDocument().uri();
     if (TextDocument* doc = TextDocument::textDocumentForFilePath(uri.toFilePath())) {
-        LanguageClientValue<int> version = edit.id().version();
+        LanguageClientValue<int> version = edit.textDocument().version();
         if (!version.isNull() && version.value(0) < doc->document()->revision())
             return false;
     }
@@ -163,7 +164,7 @@ void updateCodeActionRefactoringMarker(Client *client,
             if (optional<QList<TextDocumentEdit>> documentChanges = edit.documentChanges()) {
                 QList<TextDocumentEdit> changesForUri = Utils::filtered(
                     documentChanges.value(), [uri](const TextDocumentEdit &edit) {
-                    return edit.id().uri() == uri;
+                    return edit.textDocument().uri() == uri;
                 });
                 for (const TextDocumentEdit &edit : changesForUri)
                     edits << edit.edits();
@@ -224,14 +225,14 @@ void updateEditorToolBar(Core::IEditor *editor)
         actions[widget] = widget->toolBar()->addAction(
             icon, client->name(), [document]() {
                 auto menu = new QMenu;
-                auto *clientsGroup = new QActionGroup(menu);
+                auto clientsGroup = new QActionGroup(menu);
                 clientsGroup->setExclusive(true);
                 for (auto client : LanguageClientManager::clientsSupportingDocument(document)) {
                     auto action = clientsGroup->addAction(client->name());
                     auto reopen = [action, client = QPointer<Client>(client), document]() {
                         if (!client)
                             return;
-                        LanguageClientManager::reOpenDocumentWithClient(document, client);
+                        LanguageClientManager::openDocumentWithClient(document, client);
                         action->setChecked(true);
                     };
                     action->setCheckable(true);