From c2e38f28987b4fa273765b4234c6a57bdf75e446 Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Mon, 22 Aug 2016 14:00:00 +0900 Subject: Minor cleanup The two additional braces are due to the fact that array<> is a wrapper around a C-style array, which means I'm initializing a sub-object with a list initialization. Google -Wmissing-braces. --- room.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/room.cpp b/room.cpp index dab30749..1513cbeb 100644 --- a/room.cpp +++ b/room.cpp @@ -53,8 +53,9 @@ class Room::Private //static LogMessage* parseMessage(const QJsonObject& message); - // This updates the room displayname field (which is the way a room should be shown in the room list) - // It should be called whenever the list of members or the room name (m.room.name) or canonical alias change. + // This updates the room displayname field (which is the way a room + // should be shown in the room list) It should be called whenever the + // list of members or the room name (m.room.name) or canonical alias change. void updateDisplayname(); Connection* connection; @@ -75,9 +76,9 @@ class Room::Private QString prevBatch; RoomMessagesJob* roomMessagesJob; - // Convenience methods to work with the membersMap and usersLeft. addMember() - // and removeMember() emit respective Room:: signals after a succesful - // operation. + // Convenience methods to work with the membersMap and usersLeft. + // addMember() and removeMember() emit respective Room:: signals + // after a succesful operation. //void inviteUser(User* u); // We might get it at some point in time. void addMember(User* u); bool hasMember(User* u) const; @@ -110,7 +111,7 @@ Room::Room(Connection* connection, QString id) Room::~Room() { - qDebug() << "deconstructing room" << this; + qDebug() << "deconstructing room" << id(); delete d; } @@ -502,7 +503,7 @@ QString Room::Private::roomNameFromMemberNames(const QList &userlist) co // the current one to render the name of the room. // std::array is the leanest C++ container - std::array first_two { nullptr, nullptr }; + std::array first_two = { {nullptr, nullptr} }; std::partial_sort_copy( userlist.begin(), userlist.end(), first_two.begin(), first_two.end(), -- cgit v1.2.3