From c5af3543e64c03eb22912b6317f4bbad4dbe14f5 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Fri, 7 Feb 2020 02:52:18 +0100
Subject: [PATCH] fix c++11 range-loop might detach Qt container
---
src/popups/UserMentions.cpp | 2 +-
src/timeline/DelegateChooser.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/popups/UserMentions.cpp b/src/popups/UserMentions.cpp
index b0223f7fb..2e70dbd3e 100644
--- a/src/popups/UserMentions.cpp
+++ b/src/popups/UserMentions.cpp
@@ -74,7 +74,7 @@ UserMentions::initializeMentions(const QMap<QString, mtx::responses::Notificatio
nhlog::ui()->debug("Initializing " + std::to_string(notifs.size()) + " notifications.");
for (const auto &item : notifs) {
- for (const auto notif : item.notifications) {
+ for (const auto ¬if : item.notifications) {
const auto event_id = QString::fromStdString(utils::event_id(notif.event));
try {
diff --git a/src/timeline/DelegateChooser.cpp b/src/timeline/DelegateChooser.cpp
index 632a2a646..46ab6c0e6 100644
--- a/src/timeline/DelegateChooser.cpp
+++ b/src/timeline/DelegateChooser.cpp
@@ -91,7 +91,7 @@ DelegateChooser::clearChoices(QQmlListProperty<DelegateChoice> *p)
void
DelegateChooser::recalcChild()
{
- for (const auto choice : choices_) {
+ for (const auto choice : qAsConst(choices_)) {
auto choiceValue = choice->roleValue();
if (!roleValue_.isValid() || !choiceValue.isValid() || choiceValue == roleValue_) {
if (child) {
--
GitLab