From ee72d8b7b75ae50bffef439ae9d072f3c0713224 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Mon, 10 Apr 2017 18:17:41 +0300 Subject: [PATCH] Use QString::simplified instead of regex --- src/HistoryViewItem.cc | 2 +- src/RoomList.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/HistoryViewItem.cc b/src/HistoryViewItem.cc index 84890185..99154ea1 100644 --- a/src/HistoryViewItem.cc +++ b/src/HistoryViewItem.cc @@ -28,7 +28,7 @@ HistoryViewItem::HistoryViewItem(const Event &event, bool with_sender, const QSt if (with_sender) sender = event.sender().split(":")[0].split("@")[1]; - auto body = event.content().value("body").toString(); + auto body = event.content().value("body").toString().simplified(); auto timestamp = QDateTime::fromMSecsSinceEpoch(event.timestamp()); auto local_time = timestamp.toString("HH:mm"); diff --git a/src/RoomList.cc b/src/RoomList.cc index c56ea9b9..7800b34d 100644 --- a/src/RoomList.cc +++ b/src/RoomList.cc @@ -67,8 +67,8 @@ RoomInfo RoomList::extractRoomInfo(const State &room_state) } // Sanitize info for print. - info.setTopic(info.topic().replace(QRegularExpression("[\\s\\n\\r]+"), " ")); - info.setName(info.name().replace(QRegularExpression("[\\s\\n\\r]+"), " ")); + info.setTopic(info.topic().simplified()); + info.setName(info.name().simplified()); return info; }