Skip to content

Commit

Permalink
fixup! linter fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
nishanthkarthik committed Jun 20, 2024
1 parent 10cd106 commit 492511a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 13 deletions.
4 changes: 2 additions & 2 deletions src/Cache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
};
Expand All @@ -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) {
Expand Down
20 changes: 10 additions & 10 deletions src/UserSettingsPage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,16 @@ UserSettings::load(std::optional<QString> 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();
Expand Down
3 changes: 2 additions & 1 deletion src/timeline/TimelineViewManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,8 @@ TimelineViewManager::fixImageRendering([[maybe_unused]] QQuickTextDocument *t,
#else
void
TimelineViewManager::fixImageRendering(QQuickTextDocument *, QQuickItem *)
{}
{
}
#endif

using IgnoredUsers = mtx::events::EphemeralEvent<mtx::events::account_data::IgnoredUsers>;
Expand Down

0 comments on commit 492511a

Please sign in to comment.