From b62e694c97a57d50fc0d0425490d1f9f3d0b876a Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Tue, 1 Dec 2020 11:56:50 +0100 Subject: [PATCH] Code style --- src/roomlistmodel.cpp | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/roomlistmodel.cpp b/src/roomlistmodel.cpp index edb7fcc12..48da33416 100644 --- a/src/roomlistmodel.cpp +++ b/src/roomlistmodel.cpp @@ -142,13 +142,14 @@ void RoomListModel::connectRoomSignals(NeoChatRoom *room) return; } - if (!lastEvent->isStateEvent()) { - User *sender = room->user(lastEvent->senderId()); - if (sender == room->localUser()) { - return; - } - Q_EMIT newMessage(room->id(), lastEvent->id(), room->displayName(), sender->displayname(), room->eventToString(*lastEvent), room->avatar(128)); + if (lastEvent->isStateEvent()) { + return; } + User *sender = room->user(lastEvent->senderId()); + if (sender == room->localUser()) { + return; + } + Q_EMIT newMessage(room->id(), lastEvent->id(), room->displayName(), sender->displayname(), room->eventToString(*lastEvent), room->avatar(128)); }); connect(room, &Room::highlightCountChanged, this, [=] { if (room->highlightCount() == 0) { @@ -164,12 +165,13 @@ void RoomListModel::connectRoomSignals(NeoChatRoom *room) } if (!lastEvent->isStateEvent()) { - User *sender = room->user(lastEvent->senderId()); - if (sender == room->localUser()) { - return; - } - Q_EMIT newHighlight(room->id(), lastEvent->id(), room->displayName(), sender->displayname(), room->eventToString(*lastEvent), room->avatar(128)); + return; } + User *sender = room->user(lastEvent->senderId()); + if (sender == room->localUser()) { + return; + } + Q_EMIT newHighlight(room->id(), lastEvent->id(), room->displayName(), sender->displayname(), room->eventToString(*lastEvent), room->avatar(128)); }); connect(room, &Room::notificationCountChanged, this, &RoomListModel::refreshNotificationCount); }