From c1ee22a53eaca688ce0975e8a0732ce193930945 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Tue, 3 Sep 2019 02:14:49 +0200
Subject: [PATCH] Fix shadow warning
---
src/timeline2/TimelineModel.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/timeline2/TimelineModel.cpp b/src/timeline2/TimelineModel.cpp
index 112b27527..c1918d201 100644
--- a/src/timeline2/TimelineModel.cpp
+++ b/src/timeline2/TimelineModel.cpp
@@ -234,15 +234,15 @@ TimelineModel::data(const QModelIndex &index, int role) const
}
void
-TimelineModel::addEvents(const mtx::responses::Timeline &events)
+TimelineModel::addEvents(const mtx::responses::Timeline &timeline)
{
if (isInitialSync) {
- prev_batch_token_ = QString::fromStdString(events.prev_batch);
+ prev_batch_token_ = QString::fromStdString(timeline.prev_batch);
isInitialSync = false;
}
std::vector<QString> ids;
- for (const auto &e : events.events) {
+ for (const auto &e : timeline.events) {
QString id =
boost::apply_visitor([](const auto &e) -> QString { return eventId(e); }, e);
--
GitLab