From dd73a4b2786a0b934f338fbf9d07032a13ac6a94 Mon Sep 17 00:00:00 2001
From: Konstantinos Sideris <sideris.konstantin@gmail.com>
Date: Wed, 12 Sep 2018 14:20:12 +0300
Subject: Trim whitespace from text messages

---
 src/timeline/TimelineItem.cpp | 2 +-
 src/timeline/TimelineView.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/timeline')

diff --git a/src/timeline/TimelineItem.cpp b/src/timeline/TimelineItem.cpp
index 5a339541..8f44b7e8 100644
--- a/src/timeline/TimelineItem.cpp
+++ b/src/timeline/TimelineItem.cpp
@@ -272,7 +272,7 @@ TimelineItem::TimelineItem(mtx::events::MessageType ty,
                   "You: ", userid, body, utils::descriptiveTime(timestamp), timestamp};
         }
 
-        body = QString::fromStdString(utils::markdownToHtml(body));
+        body = utils::markdownToHtml(body);
         body = utils::linkifyMessage(body);
 
         generateTimestamp(timestamp);
diff --git a/src/timeline/TimelineView.cpp b/src/timeline/TimelineView.cpp
index 87fa18db..e50bfa21 100644
--- a/src/timeline/TimelineView.cpp
+++ b/src/timeline/TimelineView.cpp
@@ -1237,7 +1237,7 @@ toRoomMessage<mtx::events::msg::Emote>(const PendingMessage &m)
 
         mtx::events::msg::Emote emote;
         emote.body           = utils::stripHtml(html);
-        emote.formatted_body = html;
+        emote.formatted_body = html.toStdString();
 
         return emote;
 }
@@ -1262,7 +1262,7 @@ toRoomMessage<mtx::events::msg::Text>(const PendingMessage &m)
 
         mtx::events::msg::Text text;
         text.body           = utils::stripHtml(html);
-        text.formatted_body = html;
+        text.formatted_body = html.toStdString();
 
         return text;
 }
-- 
cgit 1.5.1