From 6024a8fd4e85faeb18e3ee6ec91c9276f2ee4293 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 28 Sep 2017 20:25:07 +0200 Subject: [PATCH] Yet another fix for ChatMessage --- src/chat/chat-message-p.h | 6 +++--- src/chat/chat-message.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/chat/chat-message-p.h b/src/chat/chat-message-p.h index 2e5b2500c..eb9a3d74c 100644 --- a/src/chat/chat-message-p.h +++ b/src/chat/chat-message-p.h @@ -57,9 +57,9 @@ public: SalCustomHeader *getSalCustomHeaders() const; void setSalCustomHeaders(SalCustomHeader *headers); - void addSalCustomHeader(std::string name, std::string value); - void removeSalCustomHeader(std::string name); - std::string getSalCustomHeaderValue(std::string name); + void addSalCustomHeader(const std::string& name, const std::string& value); + void removeSalCustomHeader(const std::string& name); + std::string getSalCustomHeaderValue(const std::string& name); // ----------------------------------------------------------------------------- // Methods only used for C wrapper diff --git a/src/chat/chat-message.cpp b/src/chat/chat-message.cpp index c0bec7680..9235b0e7b 100644 --- a/src/chat/chat-message.cpp +++ b/src/chat/chat-message.cpp @@ -119,16 +119,16 @@ void ChatMessagePrivate::setSalCustomHeaders(SalCustomHeader *headers) { salCustomHeaders = headers; } -void ChatMessagePrivate::addSalCustomHeader(string name, string value) { +void ChatMessagePrivate::addSalCustomHeader(const string& name, const string& value) { salCustomHeaders = sal_custom_header_append(salCustomHeaders, name.c_str(), value.c_str()); } -void ChatMessagePrivate::removeSalCustomHeader(string name) { +void ChatMessagePrivate::removeSalCustomHeader(const string& name) { salCustomHeaders = sal_custom_header_remove(salCustomHeaders, name.c_str()); } -string ChatMessagePrivate::getSalCustomHeaderValue(string name) { - return sal_custom_header_find(salCustomHeaders, name.c_str()); +string ChatMessagePrivate::getSalCustomHeaderValue(const string& name) { + return L_C_TO_STRING(sal_custom_header_find(salCustomHeaders, name.c_str())); } // -----------------------------------------------------------------------------