diff --git a/src/plugins/languageclient/languageclientmanager.cpp b/src/plugins/languageclient/languageclientmanager.cpp index cecfdf5eb5c..08d8a8583d0 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 5aa675c6c36..c0bcd258b3d 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 clients(); static void addClient(Client *client); diff --git a/src/plugins/languageclient/languageclientsettings.cpp b/src/plugins/languageclient/languageclientsettings.cpp index a709335abf6..ecdd8023a3b 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(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 ad2676454bd..81de64da510 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);