aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/languageclient/languageclientmanager.h
diff options
context:
space:
mode:
authorDavid Schulz <david.schulz@qt.io>2019-05-09 09:13:54 +0200
committerDavid Schulz <david.schulz@qt.io>2019-05-09 11:07:34 +0000
commit0c5837a1114ef526727748a0db956f0758597350 (patch)
tree4298c285d237a7c85b65e5b1b8341cf01257996d /src/plugins/languageclient/languageclientmanager.h
parent970a09519db5557dbf6de443e3b1992c3ea74c9a (diff)
LanguageClient: Fix crash after disabling client setting
Change-Id: I0f9ec02edc645726764fc9ea9ea1832e40bbef80 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/languageclient/languageclientmanager.h')
-rw-r--r--src/plugins/languageclient/languageclientmanager.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/languageclient/languageclientmanager.h b/src/plugins/languageclient/languageclientmanager.h
index fe24b03af7..6e1bb87eb0 100644
--- a/src/plugins/languageclient/languageclientmanager.h
+++ b/src/plugins/languageclient/languageclientmanager.h
@@ -63,6 +63,7 @@ public:
static void addExclusiveRequest(const LanguageServerProtocol::MessageId &id, Client *client);
static void reportFinished(const LanguageServerProtocol::MessageId &id, Client *byClient);
+ static void shutdownClient(Client *client);
static void deleteClient(Client *client);
static void shutdown();
@@ -73,7 +74,7 @@ public:
static void applySettings();
static QList<BaseSettings *> currentSettings();
- static QVector<QPointer<Client> > clientForSetting(const BaseSettings *setting);
+ static QVector<Client *> clientForSetting(const BaseSettings *setting);
static const BaseSettings *settingForClient(Client *setting);
static Client *clientForEditor(Core::IEditor *editor);
@@ -103,7 +104,7 @@ private:
bool m_shuttingDown = false;
QVector<Client *> m_clients;
QList<BaseSettings *> m_currentSettings; // owned
- QMap<QString, QVector<QPointer<Client>>> m_clientsForSetting;
+ QMap<QString, QVector<Client *>> m_clientsForSetting;
QHash<LanguageServerProtocol::MessageId, QList<Client *>> m_exclusiveRequests;
DocumentLocatorFilter m_currentDocumentLocatorFilter;
};