From 175737c28ba6dc320f6a1c0f1690ad36ba691ac0 Mon Sep 17 00:00:00 2001 From: Joseph Donofry Date: Thu, 4 Jul 2019 13:18:32 -0400 Subject: [PATCH] Fix some linting issues --- src/Cache.cpp | 13 +++++++------ src/dialogs/RoomSettings.cpp | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/Cache.cpp b/src/Cache.cpp index 5aad89ed..56c79678 100644 --- a/src/Cache.cpp +++ b/src/Cache.cpp @@ -1575,7 +1575,7 @@ Cache::getRoomVersion(lmdb::txn &txn, lmdb::dbi &statesdb) } } - nhlog::db()->warn("m.room.create event is missing room version, assuming version \"1\""); + nhlog::db()->warn("m.room.create event is missing room version, assuming version \"1\""); return QString("1"); } @@ -2183,7 +2183,7 @@ to_json(json &j, const RoomInfo &info) j["name"] = info.name; j["topic"] = info.topic; j["avatar_url"] = info.avatar_url; - j["version"] = info.version; + j["version"] = info.version; j["is_invite"] = info.is_invite; j["join_rule"] = info.join_rule; j["guest_access"] = info.guest_access; @@ -2198,10 +2198,11 @@ to_json(json &j, const RoomInfo &info) void from_json(const json &j, RoomInfo &info) { - info.name = j.at("name"); - info.topic = j.at("topic"); - info.avatar_url = j.at("avatar_url"); - info.version = j.value("version", QCoreApplication::translate("RoomInfo", "no version stored").toStdString()); + info.name = j.at("name"); + info.topic = j.at("topic"); + info.avatar_url = j.at("avatar_url"); + info.version = j.value( + "version", QCoreApplication::translate("RoomInfo", "no version stored").toStdString()); info.is_invite = j.at("is_invite"); info.join_rule = j.at("join_rule"); info.guest_access = j.at("guest_access"); diff --git a/src/dialogs/RoomSettings.cpp b/src/dialogs/RoomSettings.cpp index a34b44f0..b2344f23 100644 --- a/src/dialogs/RoomSettings.cpp +++ b/src/dialogs/RoomSettings.cpp @@ -206,7 +206,7 @@ RoomSettings::RoomSettings(const QString &room_id, QWidget *parent) auto roomVersionLayout = new QHBoxLayout; roomVersionLayout->setMargin(0); roomVersionLayout->addWidget(new QLabel(tr("Room Version"), this), - Qt::AlignBottom | Qt::AlignLeft); + Qt::AlignBottom | Qt::AlignLeft); roomVersionLayout->addWidget(roomVersionLabel, 0, Qt::AlignBottom | Qt::AlignRight); auto notifLabel = new QLabel(tr("Notifications"), this);