From 492511a2af103dc9b0061fa27744db17111fbf2a Mon Sep 17 00:00:00 2001 From: Karthik Nishanth Date: Fri, 14 Jun 2024 14:10:59 -0700 Subject: [PATCH] fixup! linter fixes --- src/Cache.cpp | 4 ++-- src/UserSettingsPage.cpp | 20 ++++++++++---------- src/timeline/TimelineViewManager.cpp | 3 ++- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/Cache.cpp b/src/Cache.cpp index cafab20f..57e572aa 100644 --- a/src/Cache.cpp +++ b/src/Cache.cpp @@ -2961,7 +2961,7 @@ Cache::roomNamesAndAliases() }; auto getRoomName = [&](const std::string &roomId) { - auto spaceDb = getStatesDb(txn, roomId); + auto spaceDb = getStatesDb(txn, roomId); auto membersDb = getMembersDb(txn, roomId); return Cache::getRoomName(txn, spaceDb, membersDb).toStdString(); }; @@ -2983,7 +2983,7 @@ Cache::roomNamesAndAliases() alias = aliases->content.alias; } - auto parentId = getParentRoomIdsWithTxn(room_id_str); + auto parentId = getParentRoomIdsWithTxn(room_id_str); auto parentName = std::string{}; if (parentId) { diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index 0376606b..e2f1e100 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -65,16 +65,16 @@ UserSettings::load(std::optional profile) settings.value("user/timeline/message_hover_highlight", false).toBool(); enlargeEmojiOnlyMessages_ = settings.value("user/timeline/enlarge_emoji_only_msg", false).toBool(); - markdown_ = settings.value("user/markdown_enabled", true).toBool(); - invertEnterKey_ = settings.value("user/invert_enter_key", false).toBool(); - bubbles_ = settings.value("user/bubbles_enabled", false).toBool(); - smallAvatars_ = settings.value("user/small_avatars_enabled", false).toBool(); - animateImagesOnHover_ = settings.value("user/animate_images_on_hover", false).toBool(); - typingNotifications_ = settings.value("user/typing_notifications", true).toBool(); - sortByImportance_ = settings.value("user/sort_by_unread", true).toBool(); - sortByAlphabet_ = settings.value("user/sort_by_alphabet", false).toBool(); - readReceipts_ = settings.value("user/read_receipts", true).toBool(); - theme_ = settings.value("user/theme", defaultTheme_).toString(); + markdown_ = settings.value("user/markdown_enabled", true).toBool(); + invertEnterKey_ = settings.value("user/invert_enter_key", false).toBool(); + bubbles_ = settings.value("user/bubbles_enabled", false).toBool(); + smallAvatars_ = settings.value("user/small_avatars_enabled", false).toBool(); + animateImagesOnHover_ = settings.value("user/animate_images_on_hover", false).toBool(); + typingNotifications_ = settings.value("user/typing_notifications", true).toBool(); + sortByImportance_ = settings.value("user/sort_by_unread", true).toBool(); + sortByAlphabet_ = settings.value("user/sort_by_alphabet", false).toBool(); + readReceipts_ = settings.value("user/read_receipts", true).toBool(); + theme_ = settings.value("user/theme", defaultTheme_).toString(); displayParentInSwitcher_ = settings.value("user/display_parent_on_room_switch", true).toBool(); font_ = settings.value("user/font_family", "").toString(); diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp index fd1d6d4e..09af254c 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp @@ -636,7 +636,8 @@ TimelineViewManager::fixImageRendering([[maybe_unused]] QQuickTextDocument *t, #else void TimelineViewManager::fixImageRendering(QQuickTextDocument *, QQuickItem *) -{} +{ +} #endif using IgnoredUsers = mtx::events::EphemeralEvent;