summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorLoren Burkholder <computersemiexpert@outlook.com>2021-08-31 17:58:00 -0400
committerLoren Burkholder <computersemiexpert@outlook.com>2021-09-11 19:35:31 -0400
commita23c586cde75ebaa7583017f96a73e5cf9e7d348 (patch)
tree2ee9bc18b6ead90b2f2f011d02cd47b1b5611159 /src
parentFinish fixing rounded avatars (diff)
downloadnheko-a23c586cde75ebaa7583017f96a73e5cf9e7d348.tar.xz
make lint
Diffstat (limited to 'src')
-rw-r--r--src/UserSettingsPage.cpp5
-rw-r--r--src/timeline/TimelineModel.cpp7
2 files changed, 5 insertions, 7 deletions
diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp

index 60ba18aa..d79cadbe 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp
@@ -812,9 +812,8 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge if (JdenticonProvider::isAvailable()) { useIdenticon_ = new Toggle{this}; useIdenticon_->setChecked(settings_->useIdenticon()); - } - else - useIdenticon_ = nullptr; + } else + useIdenticon_ = nullptr; if (!settings_->tray()) { startInTrayToggle_->setState(false); diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 0e1e8f5d..d5c39bbe 100644 --- a/src/timeline/TimelineModel.cpp +++ b/src/timeline/TimelineModel.cpp
@@ -818,10 +818,9 @@ TimelineModel::syncState(const mtx::responses::State &s) emit roomNameChanged(); emit roomMemberCountChanged(); - if (roomMemberCount() <= 2) - { - emit isDirectChanged(); - emit directChatAvatarMxidChanged(); + if (roomMemberCount() <= 2) { + emit isDirectChanged(); + emit directChatAvatarMxidChanged(); } } else if (std::holds_alternative<StateEvent<state::Encryption>>(e)) { this->isEncrypted_ = cache::isRoomEncrypted(room_id_.toStdString());