From 7c7889a04dbe798c28332a2d54ebd03f532fd00f Mon Sep 17 00:00:00 2001
From: Joseph Donofry <joedonofry@gmail.com>
Date: Fri, 9 Aug 2019 23:36:45 -0400
Subject: [PATCH] Fix linting issues w/ the last commit
---
src/Cache.cpp | 4 ++--
src/Cache.h | 2 +-
src/ChatPage.cpp | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/Cache.cpp b/src/Cache.cpp
index 5ccf92914..799dd319f 100644
--- a/src/Cache.cpp
+++ b/src/Cache.cpp
@@ -1253,7 +1253,6 @@ Cache::getTimelineMentions()
return notifs;
}
-
mtx::responses::Timeline
Cache::getTimelineMessages(lmdb::txn &txn, const std::string &room_id)
{
@@ -2022,7 +2021,8 @@ Cache::saveTimelineMentions(lmdb::txn &txn,
int i = 0;
for (const auto ¬if : 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);
// double check that we have the correct room_id...
diff --git a/src/Cache.h b/src/Cache.h
index 07ccf7907..97b264fcb 100644
--- a/src/Cache.h
+++ b/src/Cache.h
@@ -482,7 +482,7 @@ private:
//! Get timeline items that a user was mentions in for a given room
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 getInviteRoomTopic(lmdb::txn &txn, lmdb::dbi &statesdb);
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index 2a02e7400..54562c82d 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -89,9 +89,9 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
connect(sidebarActions_, &SideBarActions::joinRoom, this, &ChatPage::joinRoom);
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();
- room_list_ = new RoomList(sideBar_);
+ room_list_ = new RoomList(sideBar_);
connect(room_list_, &RoomList::joinRoom, this, &ChatPage::joinRoom);
sideBarLayout_->addWidget(user_info_widget_);
--
GitLab