[Libreoffice-commits] online.git: common/Message.hpp wsd/ClientSession.hpp

[Ashod Nakashian]

 common/Message.hpp    |   12 +++++++-----
 wsd/ClientSession.hpp |    2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

New commits:
commit bb4733b6d679a7170b530bd51a4a9536e8e22231
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Sat Jan 21 20:12:17 2017 -0500

    wsd: Message::abbrevation -> abbr
    
    Change-Id: If8cab421808689ba4f5ba6a75a960d6b64755b4b
    Reviewed-on: https://gerrit.libreoffice.org/33429
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/common/Message.hpp b/common/Message.hpp
index 0ca667a..cc7063e 100644
--- a/common/Message.hpp
+++ b/common/Message.hpp
@@ -33,7 +33,7 @@ public:
         _tokens(LOOLProtocol::tokenize(_data.data(), _data.size())),
         _id(makeId(dir)),
         _firstLine(LOOLProtocol::getFirstLine(_data.data(), _data.size())),
-        _abbreviation(_id + ' ' + LOOLProtocol::getAbbreviatedMessage(_data.data(), _data.size())),
+        _abbr(_id + ' ' + LOOLProtocol::getAbbreviatedMessage(_data.data(), _data.size())),
         _type(type)
     {
     }
@@ -49,7 +49,7 @@ public:
         _tokens(LOOLProtocol::tokenize(message)),
         _id(makeId(dir)),
         _firstLine(LOOLProtocol::getFirstLine(message)),
-        _abbreviation(_id + ' ' + LOOLProtocol::getAbbreviatedMessage(message)),
+        _abbr(_id + ' ' + LOOLProtocol::getAbbreviatedMessage(message)),
         _type(type)
     {
         _data.resize(message.size());
@@ -66,7 +66,7 @@ public:
         _tokens(LOOLProtocol::tokenize(_data.data(), _data.size())),
         _id(makeId(dir)),
         _firstLine(LOOLProtocol::getFirstLine(_data.data(), _data.size())),
-        _abbreviation(_id + ' ' + LOOLProtocol::getAbbreviatedMessage(_data.data(), _data.size())),
+        _abbr(_id + ' ' + LOOLProtocol::getAbbreviatedMessage(_data.data(), _data.size())),
         _type(type)
     {
     }
@@ -77,7 +77,9 @@ public:
     const std::vector<std::string>& tokens() const { return _tokens; }
     const std::string& firstToken() const { return _tokens[0]; }
     const std::string& firstLine() const { return _firstLine; }
-    const std::string& abbreviation() const { return _abbreviation; }
+
+    /// Return the abbreviated message for logging purposes.
+    const std::string& abbr() const { return _abbr; }
     const std::string& id() const { return _id; }
 
     /// Returns the json part of the message, if any.
@@ -117,7 +119,7 @@ private:
     const std::vector<std::string> _tokens;
     const std::string _id;
     const std::string _firstLine;
-    const std::string _abbreviation;
+    const std::string _abbr;
     const Type _type;
 };
 
diff --git a/wsd/ClientSession.hpp b/wsd/ClientSession.hpp
index cd5c4dc..5d97d70 100644
--- a/wsd/ClientSession.hpp
+++ b/wsd/ClientSession.hpp
@@ -69,7 +69,7 @@ public:
 
     void enqueueSendMessage(const std::shared_ptr<Message>& data)
     {
-        LOG_TRC(getName() << " enqueueing client message: " << data->abbreviation());
+        LOG_TRC(getName() << " enqueueing client message: " << data->abbr());
         _senderQueue.enqueue(data);
     }