From b236874d2e582a57dc128a19580cf08e1bcc6254 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Wed, 12 Sep 2018 08:14:25 +0200 Subject: [PATCH] LSP: const correct ShowMessageParams::toString() Change-Id: I663c57aff8b23acbdaca1149e59f8f5f35bcfb94 Reviewed-by: Eike Ziller --- src/libs/languageserverprotocol/messages.cpp | 2 +- src/libs/languageserverprotocol/messages.h | 2 +- src/plugins/languageclient/baseclient.cpp | 3 ++- src/plugins/languageclient/baseclient.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libs/languageserverprotocol/messages.cpp b/src/libs/languageserverprotocol/messages.cpp index 310dd88ebea..6e02e5180e3 100644 --- a/src/libs/languageserverprotocol/messages.cpp +++ b/src/libs/languageserverprotocol/messages.cpp @@ -67,7 +67,7 @@ static QString messageTypeName(int messageType) return QString(""); } -QString ShowMessageParams::toString() +QString ShowMessageParams::toString() const { return messageTypeName(type()) + ": " + message(); } diff --git a/src/libs/languageserverprotocol/messages.h b/src/libs/languageserverprotocol/messages.h index a5ddf5df90b..ff807a93726 100644 --- a/src/libs/languageserverprotocol/messages.h +++ b/src/libs/languageserverprotocol/messages.h @@ -47,7 +47,7 @@ public: QString message() const { return typedValue(messageKey); } void setMessage(QString message) { insert(messageKey, message); } - QString toString(); + QString toString() const; bool isValid(QStringList *error) const override { return check(error, typeKey) && check(error, messageKey); } diff --git a/src/plugins/languageclient/baseclient.cpp b/src/plugins/languageclient/baseclient.cpp index f46150e792e..dac8e88be6b 100644 --- a/src/plugins/languageclient/baseclient.cpp +++ b/src/plugins/languageclient/baseclient.cpp @@ -516,7 +516,8 @@ void BaseClient::log(const QString &message, Core::MessageManager::PrintToOutput Core::MessageManager::write(QString("LanguageClient %1: %2").arg(name(), message), flag); } -void BaseClient::log(LogMessageParams &message, Core::MessageManager::PrintToOutputPaneFlag flag) +void BaseClient::log(const LogMessageParams &message, + Core::MessageManager::PrintToOutputPaneFlag flag) { log(message.toString(), flag); } diff --git a/src/plugins/languageclient/baseclient.h b/src/plugins/languageclient/baseclient.h index 4bd733dfdd8..5c4ba6ed25c 100644 --- a/src/plugins/languageclient/baseclient.h +++ b/src/plugins/languageclient/baseclient.h @@ -118,7 +118,7 @@ public: void log(const QString &message, Core::MessageManager::PrintToOutputPaneFlag flag = Core::MessageManager::NoModeSwitch); - void log(LanguageServerProtocol::LogMessageParams &message, + void log(const LanguageServerProtocol::LogMessageParams &message, Core::MessageManager::PrintToOutputPaneFlag flag = Core::MessageManager::NoModeSwitch); signals: