From 0d3c9390c67d4f0fefdfa192009291ff024ecce8 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Sun, 29 Sep 2019 11:28:55 +0200
Subject: [PATCH] Rename initialize to sync, since it does the same thing
---
src/ChatPage.cpp | 4 ++--
src/timeline2/TimelineViewManager.cpp | 3 ++-
src/timeline2/TimelineViewManager.h | 3 +--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index 594a41c25..e5d4c9be3 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -566,7 +566,7 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
connect(this,
&ChatPage::initializeViews,
view_manager_,
- [this](const mtx::responses::Rooms &rooms) { view_manager_->initialize(rooms); });
+ [this](const mtx::responses::Rooms &rooms) { view_manager_->sync(rooms); });
connect(this,
&ChatPage::initializeEmptyViews,
view_manager_,
@@ -582,7 +582,7 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
nhlog::db()->error("failed to retrieve invites: {}", e.what());
}
- view_manager_->initialize(rooms);
+ view_manager_->sync(rooms);
removeLeftRooms(rooms.leave);
bool hasNotifications = false;
diff --git a/src/timeline2/TimelineViewManager.cpp b/src/timeline2/TimelineViewManager.cpp
index eed0682d4..4ec089fad 100644
--- a/src/timeline2/TimelineViewManager.cpp
+++ b/src/timeline2/TimelineViewManager.cpp
@@ -27,9 +27,10 @@ TimelineViewManager::TimelineViewManager(QWidget *parent)
}
void
-TimelineViewManager::initialize(const mtx::responses::Rooms &rooms)
+TimelineViewManager::sync(const mtx::responses::Rooms &rooms)
{
for (auto it = rooms.join.cbegin(); it != rooms.join.cend(); ++it) {
+ // addRoom will only add the room, if it doesn't exist
addRoom(QString::fromStdString(it->first));
models.value(QString::fromStdString(it->first))->addEvents(it->second.timeline);
}
diff --git a/src/timeline2/TimelineViewManager.h b/src/timeline2/TimelineViewManager.h
index 687ae24e3..9fcbc2f89 100644
--- a/src/timeline2/TimelineViewManager.h
+++ b/src/timeline2/TimelineViewManager.h
@@ -28,10 +28,9 @@ public:
TimelineViewManager(QWidget *parent = 0);
QWidget *getWidget() const { return container; }
- void initialize(const mtx::responses::Rooms &rooms);
+ void sync(const mtx::responses::Rooms &rooms);
void addRoom(const QString &room_id);
- void sync(const mtx::responses::Rooms &rooms) {}
void clearAll() { models.clear(); }
Q_INVOKABLE TimelineModel *activeTimeline() const { return timeline_; }
--
GitLab