fix(search): address review feedback

Replace deprecated QML effects, rely on JsonApiJob self-deletion, and expose people-search retry as a slot. Align the reviewed constructor signature and correct model index assertions exposed by the focused tests.

Signed-off-by: Rello <github@scherello.de>
Assisted-by: Codex:GPT-5

Author: Rello

src/gui/search/unifiedsearchpeoplemodel.cpp

@@ -32,7 +32,7 @@ UnifiedSearchPeopleModel::~UnifiedSearchPeopleModel() { cancel(); }
 
 QVariant UnifiedSearchPeopleModel::data(const QModelIndex &index, int role) const
 {
-    Q_ASSERT(!checkIndex(index, CheckIndexOption::IndexIsValid));
+    Q_ASSERT(checkIndex(index, CheckIndexOption::IndexIsValid));
     const auto &person = _people.at(index.row());
     switch (role) {
     case UserIdRole: return person.id;
@@ -186,8 +186,8 @@ void UnifiedSearchPeopleModel::cancel()
     ++_generation;
     if (_job) {
         disconnect(_job, nullptr, this, nullptr);
-        if (const auto job = qobject_cast<JsonApiJob *>(_job.data()); job && job->reply() && job->reply()->isRunning()) job->reply()->abort();
-        _job->deleteLater();
+        if (const auto job = qobject_cast<JsonApiJob *>(_job.data()); job && job->reply() && job->reply()->isRunning())
+            job->reply()->abort();
         _job.clear();
     }
     setBusy(false);

src/gui/search/unifiedsearchpeoplemodel.h

@@ -34,11 +34,11 @@ class UnifiedSearchPeopleModel : public QAbstractListModel
     [[nodiscard]] QString searchTerm() const;
     [[nodiscard]] bool busy() const;
     [[nodiscard]] QString errorString() const;
-    Q_INVOKABLE void retry();
 
 public Q_SLOTS:
     void setAccountState(AccountState *accountState);
     void setSearchTerm(const QString &searchTerm);
+    void retry();
 
 Q_SIGNALS:
     void accountStateChanged();

src/gui/search/unifiedsearchresultslistmodel.cpp

@@ -177,10 +177,7 @@ QString navigationAppIconForResult(const OCC::AccountState *accountState,
 namespace OCC {
 Q_LOGGING_CATEGORY(lcUnifiedSearch, "nextcloud.gui.unifiedsearch", QtInfoMsg)
 
-UnifiedSearchResultsListModel::UnifiedSearchResultsListModel(AccountState *accountState,
-                                                             QObject *parent,
-                                                             int debounceInterval,
-                                                             int revealInterval)
+UnifiedSearchResultsListModel::UnifiedSearchResultsListModel(AccountState *accountState, int debounceInterval, int revealInterval, QObject *parent)
     : QAbstractListModel(parent)
     , _accountState(accountState)
 {
@@ -254,7 +251,7 @@ UnifiedSearchResultsListModel::~UnifiedSearchResultsListModel()
 
 QVariant UnifiedSearchResultsListModel::data(const QModelIndex &index, int role) const
 {
-    Q_ASSERT(!checkIndex(index, QAbstractItemModel::CheckIndexOption::IndexIsValid));
+    Q_ASSERT(checkIndex(index, QAbstractItemModel::CheckIndexOption::IndexIsValid));
     const auto &result = _results.at(index.row());
     switch (role) {
     case ProviderNameRole:
@@ -1071,7 +1068,6 @@ void UnifiedSearchResultsListModel::abortSearchJobs()
         if (const auto job = qobject_cast<JsonApiJob *>(jobObject.data()); job && job->reply() && job->reply()->isRunning()) {
             job->reply()->abort();
         }
-        jobObject->deleteLater();
     }
     _activeSearchJobs.clear();
     _inFlightSearchRequests = 0;
@@ -1090,7 +1086,6 @@ void UnifiedSearchResultsListModel::abortProviderDiscovery()
     if (const auto job = qobject_cast<JsonApiJob *>(_providerDiscoveryJob.data()); job && job->reply() && job->reply()->isRunning()) {
         job->reply()->abort();
     }
-    _providerDiscoveryJob->deleteLater();
     _providerDiscoveryJob.clear();
     _providersLoading = false;
 }

src/gui/systray.cpp

@@ -461,7 +461,8 @@ void Systray::showSearchWindow(int userIndex)
         return;
     }
 
-    auto *const searchModel = new UnifiedSearchResultsListModel(accountState.data(), accountState.data());
+    auto *const searchModel = new UnifiedSearchResultsListModel(accountState.data());
+    searchModel->setParent(accountState.data());
     const QVariantMap initialProperties{
         {"account", QVariantMap{
                         {"avatar", user->avatarUrl()},

src/gui/wizard/qml/WizardButton.qml

@@ -5,8 +5,8 @@
 
 import QtQuick
 import QtQuick.Controls.Basic as BasicControls
+import QtQuick.Effects
 import QtQuick.Layouts
-import Qt5Compat.GraphicalEffects
 import Style
 
 BasicControls.Button {
@@ -56,13 +56,13 @@ BasicControls.Button {
                 Accessible.ignored: true
             }
 
-            ColorOverlay {
+            MultiEffect {
                 objectName: "wizardButtonLeadingIconTint"
                 anchors.fill: leadingIconImage
                 visible: root.tintIcon
                 source: leadingIconImage
-                color: root.iconTintColor
-                cached: true
+                colorization: 1.0
+                colorizationColor: root.iconTintColor
                 Accessible.ignored: true
             }
         }

src/gui/wizard/qml/WizardMenuItem.qml

@@ -5,8 +5,8 @@
 
 import QtQuick
 import QtQuick.Controls.Basic as BasicControls
+import QtQuick.Effects
 import QtQuick.Layouts
-import Qt5Compat.GraphicalEffects
 
 import Style
 
@@ -42,13 +42,13 @@ BasicControls.MenuItem {
                 Accessible.ignored: true
             }
 
-            ColorOverlay {
+            MultiEffect {
                 objectName: "wizardMenuItemIconTint"
                 anchors.fill: menuIconImage
                 visible: root.tintIcon
                 source: menuIconImage
-                color: root.iconTintColor
-                cached: true
+                colorization: 1.0
+                colorizationColor: root.iconTintColor
                 Accessible.ignored: true
             }
 

test/qml/search/testsearch.qml

@@ -578,7 +578,8 @@ Item {
             const iconTint = findChild(wizardHoverButton, "wizardButtonLeadingIconTint")
             verify(iconTint !== null)
             compare(iconTint.visible, true)
-            compare(iconTint.color.toString(), Style.wizardPrimaryText.toString())
+            compare(iconTint.colorization, 1.0)
+            compare(iconTint.colorizationColor.toString(), Style.wizardPrimaryText.toString())
         }
 
         function test_trailingIconCannotOverlapLongText() {
@@ -618,7 +619,8 @@ Item {
             const iconTint = findChild(wizardMenuHoverItem, "wizardMenuItemIconTint")
             verify(iconTint !== null)
             compare(iconTint.visible, true)
-            compare(iconTint.color.toString(), Style.wizardPrimaryText.toString())
+            compare(iconTint.colorization, 1.0)
+            compare(iconTint.colorizationColor.toString(), Style.wizardPrimaryText.toString())
         }
     }
 

test/testunifiedsearchpeoplemodel.cpp

@@ -30,6 +30,12 @@ class TestUnifiedSearchPeopleModel : public QObject
     Q_OBJECT
 
 private Q_SLOTS:
+    void retryIsExposedAsSlot()
+    {
+        const auto methodIndex = OCC::UnifiedSearchPeopleModel::staticMetaObject.indexOfSlot("retry()");
+        QVERIFY(methodIndex >= 0);
+    }
+
     void emptyQueryShowsSignedInUserWithoutRequest()
     {
         auto qnam = std::unique_ptr<FakeQNAM>(new FakeQNAM({}));