feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

LanguageClient: constify createClient

Browse Source 
Change-Id: I4b9aba1388a31b6d1531cb4a6346a394c5aab150
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2022-03-14 09:34:12 +01:00
parent 1a88f26d8b
commit d824c276df
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/languageclient/languageclientmanager.cpp
View File

@@ -176,7 +176,8 @@ void LanguageClientManager::clientFinished(Client *client)
emit managerInstance->shutdownFinished(); 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(managerInstance, return nullptr);
QTC_ASSERT(setting, return nullptr); QTC_ASSERT(setting, return nullptr);

2
src/plugins/languageclient/languageclientmanager.h
View File

@@ -61,7 +61,7 @@ public:
static void clientStarted(Client *client); static void clientStarted(Client *client);
static void clientFinished(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 QList<Client *> clients();
static void addClient(Client *client); static void addClient(Client *client);

6
src/plugins/languageclient/languageclientsettings.cpp
View File

@@ -571,12 +571,12 @@ bool BaseSettings::isValid() const
return !m_name.isEmpty(); 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) if (!isValid() || !m_enabled)
return nullptr; return nullptr;

4
src/plugins/languageclient/languageclientsettings.h
View File

@@ -98,8 +98,8 @@ public:
virtual QWidget *createSettingsWidget(QWidget *parent = nullptr) const; virtual QWidget *createSettingsWidget(QWidget *parent = nullptr) const;
virtual BaseSettings *copy() const { return new BaseSettings(*this); } virtual BaseSettings *copy() const { return new BaseSettings(*this); }
virtual bool isValid() const; virtual bool isValid() const;
Client *createClient(); Client *createClient() const;
Client *createClient(ProjectExplorer::Project *project); Client *createClient(ProjectExplorer::Project *project) const;
virtual QVariantMap toMap() const; virtual QVariantMap toMap() const;
virtual void fromMap(const QVariantMap &map); virtual void fromMap(const QVariantMap &map);