From 5f98f7cdc60d9525ed9ab953b0feb91ca8ed9036 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Mon, 24 Apr 2023 16:43:58 -0400
Subject: [PATCH] qt6: fix startSearch usage
Overload incorrectly managed by Qt 6.5 and we must pass a const ref
Change-Id: Ib0a85165b59f6cffd3f01815b803f666623e1b89
---
src/app/mainview/components/MessagesResearchView.qml | 4 ++--
src/app/messagesadapter.cpp | 2 +-
src/app/messagesadapter.h | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/app/mainview/components/MessagesResearchView.qml b/src/app/mainview/components/MessagesResearchView.qml
index 85b7e3554..20e5cf383 100644
--- a/src/app/mainview/components/MessagesResearchView.qml
+++ b/src/app/mainview/components/MessagesResearchView.qml
@@ -47,13 +47,13 @@ ListView {
property var prompt: MessagesAdapter.searchbarPrompt
onPromptChanged: {
- MessagesAdapter.startSearch(prompt);
+ MessagesAdapter.startSearch(prompt, false);
}
Connections {
target: researchTabBar
function onFilterTabChange() {
- MessagesAdapter.startSearch(prompt);
+ MessagesAdapter.startSearch(prompt, false);
}
}
diff --git a/src/app/messagesadapter.cpp b/src/app/messagesadapter.cpp
index aa8f189b9..985e7259e 100644
--- a/src/app/messagesadapter.cpp
+++ b/src/app/messagesadapter.cpp
@@ -733,7 +733,7 @@ MessagesAdapter::getFormattedDay(const quint64 timestamp)
}
void
-MessagesAdapter::startSearch(QString& text, bool isMedia)
+MessagesAdapter::startSearch(const QString& text, bool isMedia)
{
mediaInteractions_.reset(new MessageListModel(this));
set_mediaMessageListModel(QVariant::fromValue(mediaInteractions_.get()));
diff --git a/src/app/messagesadapter.h b/src/app/messagesadapter.h
index 84fdd4d0d..25d1177a8 100644
--- a/src/app/messagesadapter.h
+++ b/src/app/messagesadapter.h
@@ -132,7 +132,7 @@ protected:
Q_INVOKABLE QVariantMap getTransferStats(const QString& messageId, int);
Q_INVOKABLE QVariant dataForInteraction(const QString& interactionId,
int role = Qt::DisplayRole) const;
- Q_INVOKABLE void startSearch(QString& text, bool isMedia = false);
+ Q_INVOKABLE void startSearch(const QString& text, bool isMedia);
Q_INVOKABLE int getMessageIndexFromId(QString& id);
// Run corrsponding js functions, c++ to qml.
--
GitLab