Fix linting issues w/ the last commit

remotes/origin/0.7.0-dev
Joseph Donofry 5 years ago
parent 3f563e1e6e
commit 7c7889a04d
No known key found for this signature in database
GPG Key ID: E8A1D78EF044B0CB
  1. 4
      src/Cache.cpp
  2. 2
      src/Cache.h
  3. 4
      src/ChatPage.cpp

@ -1253,7 +1253,6 @@ Cache::getTimelineMentions()
return notifs; return notifs;
} }
mtx::responses::Timeline mtx::responses::Timeline
Cache::getTimelineMessages(lmdb::txn &txn, const std::string &room_id) Cache::getTimelineMessages(lmdb::txn &txn, const std::string &room_id)
{ {
@ -2022,7 +2021,8 @@ Cache::saveTimelineMentions(lmdb::txn &txn,
int i = 0; int i = 0;
for (const auto &notif : res) { for (const auto &notif : res) {
nhlog::db()->debug("Storing notification " + std::to_string(i++) + " for room " + room_id); nhlog::db()->debug("Storing notification " + std::to_string(i++) + " for room " +
room_id);
const auto event_id = utils::event_id(notif.event); const auto event_id = utils::event_id(notif.event);
// double check that we have the correct room_id... // double check that we have the correct room_id...

@ -482,7 +482,7 @@ private:
//! Get timeline items that a user was mentions in for a given room //! Get timeline items that a user was mentions in for a given room
mtx::responses::Notifications getTimelineMentionsForRoom(lmdb::txn &txn, mtx::responses::Notifications getTimelineMentionsForRoom(lmdb::txn &txn,
const std::string &room_id); const std::string &room_id);
QString getInviteRoomName(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb); QString getInviteRoomName(lmdb::txn &txn, lmdb::dbi &statesdb, lmdb::dbi &membersdb);
QString getInviteRoomTopic(lmdb::txn &txn, lmdb::dbi &statesdb); QString getInviteRoomTopic(lmdb::txn &txn, lmdb::dbi &statesdb);

@ -89,9 +89,9 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
connect(sidebarActions_, &SideBarActions::joinRoom, this, &ChatPage::joinRoom); connect(sidebarActions_, &SideBarActions::joinRoom, this, &ChatPage::joinRoom);
connect(sidebarActions_, &SideBarActions::createRoom, this, &ChatPage::createRoom); connect(sidebarActions_, &SideBarActions::createRoom, this, &ChatPage::createRoom);
user_info_widget_ = new UserInfoWidget(sideBar_); user_info_widget_ = new UserInfoWidget(sideBar_);
user_mentions_popup_ = new popups::UserMentions(); user_mentions_popup_ = new popups::UserMentions();
room_list_ = new RoomList(sideBar_); room_list_ = new RoomList(sideBar_);
connect(room_list_, &RoomList::joinRoom, this, &ChatPage::joinRoom); connect(room_list_, &RoomList::joinRoom, this, &ChatPage::joinRoom);
sideBarLayout_->addWidget(user_info_widget_); sideBarLayout_->addWidget(user_info_widget_);

Loading…
Cancel
Save