From c4ba832331e2daa17fd0efc724a2ccb0b68b18a9 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Tue, 3 Sep 2019 08:23:07 +0200
Subject: [PATCH] Fix misc CI issues
---
src/timeline2/TimelineModel.h | 3 +--
src/timeline2/TimelineViewManager.cpp | 2 +-
src/timeline2/TimelineViewManager.h | 5 +----
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/timeline2/TimelineModel.h b/src/timeline2/TimelineModel.h
index 3af94643b..51cb9be39 100644
--- a/src/timeline2/TimelineModel.h
+++ b/src/timeline2/TimelineModel.h
@@ -112,9 +112,8 @@ private:
QString room_id_;
QString prev_batch_token_;
- bool isInitialSync = true;
+ bool isInitialSync = true;
bool paginationInProgress = false;
QHash<QString, QColor> userColors;
};
-
diff --git a/src/timeline2/TimelineViewManager.cpp b/src/timeline2/TimelineViewManager.cpp
index df9a22702..0e0e74e47 100644
--- a/src/timeline2/TimelineViewManager.cpp
+++ b/src/timeline2/TimelineViewManager.cpp
@@ -44,7 +44,7 @@ TimelineViewManager::setHistoryView(const QString &room_id)
auto room = models.find(room_id);
if (room != models.end()) {
- timeline_ = room.value().get();
+ timeline_ = room.value().data();
timeline_->fetchHistory();
emit activeTimelineChanged(timeline_);
nhlog::ui()->info("Activated room {}", room_id.toStdString());
diff --git a/src/timeline2/TimelineViewManager.h b/src/timeline2/TimelineViewManager.h
index ff976aad8..1bec87460 100644
--- a/src/timeline2/TimelineViewManager.h
+++ b/src/timeline2/TimelineViewManager.h
@@ -32,10 +32,7 @@ public:
void sync(const mtx::responses::Rooms &rooms) {}
void clearAll() { models.clear(); }
- Q_INVOKABLE TimelineModel *activeTimeline() const
- {
- return timeline_;
- }
+ Q_INVOKABLE TimelineModel *activeTimeline() const { return timeline_; }
signals:
void clearRoomMessageCount(QString roomid);
--
GitLab