diff options
| author | David Schulz <david.schulz@qt.io> | 2022-03-14 09:34:12 +0100 |
|---|---|---|
| committer | David Schulz <david.schulz@qt.io> | 2022-03-21 08:48:29 +0000 |
| commit | d824c276dfc2f8f3fd820a0fd7ed5af59f394110 (patch) | |
| tree | e1b0914154716255811a99e4f2c5ba95b0b8b768 | |
| parent | 1a88f26d8baf7e1a7e0689a78c5142b3b8c798a5 (diff) | |
| download | qt-creator-d824c276dfc2f8f3fd820a0fd7ed5af59f394110.tar.gz | |
LanguageClient: constify createClient
Change-Id: I4b9aba1388a31b6d1531cb4a6346a394c5aab150
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
4 files changed, 8 insertions, 7 deletions
diff --git a/src/plugins/languageclient/languageclientmanager.cpp b/src/plugins/languageclient/languageclientmanager.cpp index cecfdf5eb5..08d8a8583d 100644 --- a/src/plugins/languageclient/languageclientmanager.cpp +++ b/src/plugins/languageclient/languageclientmanager.cpp @@ -176,7 +176,8 @@ void LanguageClientManager::clientFinished(Client *client) emit managerInstance->shutdownFinished(); } -Client *LanguageClientManager::startClient(BaseSettings *setting, ProjectExplorer::Project *project) +Client *LanguageClientManager::startClient(const BaseSettings *setting, + ProjectExplorer::Project *project) { QTC_ASSERT(managerInstance, return nullptr); QTC_ASSERT(setting, return nullptr); diff --git a/src/plugins/languageclient/languageclientmanager.h b/src/plugins/languageclient/languageclientmanager.h index 5aa675c6c3..c0bcd258b3 100644 --- a/src/plugins/languageclient/languageclientmanager.h +++ b/src/plugins/languageclient/languageclientmanager.h @@ -61,7 +61,7 @@ public: static void clientStarted(Client *client); static void clientFinished(Client *client); - static Client *startClient(BaseSettings *setting, ProjectExplorer::Project *project = nullptr); + static Client *startClient(const BaseSettings *setting, ProjectExplorer::Project *project = nullptr); static QList<Client *> clients(); static void addClient(Client *client); diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp index a709335abf..ecdd8023a3 100644 --- a/src/plugins/languageclient/languageclientsettings.cpp +++ b/src/plugins/languageclient/languageclientsettings.cpp @@ -571,12 +571,12 @@ bool BaseSettings::isValid() const return !m_name.isEmpty(); } -Client *BaseSettings::createClient() +Client *BaseSettings::createClient() const { - return createClient(nullptr); + return createClient(static_cast<ProjectExplorer::Project *>(nullptr)); } -Client *BaseSettings::createClient(ProjectExplorer::Project *project) +Client *BaseSettings::createClient(ProjectExplorer::Project *project) const { if (!isValid() || !m_enabled) return nullptr; diff --git a/src/plugins/languageclient/languageclientsettings.h b/src/plugins/languageclient/languageclientsettings.h index ad2676454b..81de64da51 100644 --- a/src/plugins/languageclient/languageclientsettings.h +++ b/src/plugins/languageclient/languageclientsettings.h @@ -98,8 +98,8 @@ public: virtual QWidget *createSettingsWidget(QWidget *parent = nullptr) const; virtual BaseSettings *copy() const { return new BaseSettings(*this); } virtual bool isValid() const; - Client *createClient(); - Client *createClient(ProjectExplorer::Project *project); + Client *createClient() const; + Client *createClient(ProjectExplorer::Project *project) const; virtual QVariantMap toMap() const; virtual void fromMap(const QVariantMap &map); |