[network/ruqola] src/core/model: Use SortFilterProxyModelBase in FilesForRoomFilterProxyModel

Laurent Montel <[email protected]>
Newsgroups gmane.comp.kde.cvs
Message-ID <[email protected]>
Git commit a8c7aa78c3a7e15c69fc67bc12dbfdb0acee8fdf by Laurent Montel.
Committed on 27/07/2026 at 21:18.
Pushed by mlaurent into branch 'master'.

Use SortFilterProxyModelBase in FilesForRoomFilterProxyModel

M  +4    -13   src/core/model/filesforroomfilterproxymodel.cpp
M  +2    -4    src/core/model/filesforroomfilterproxymodel.h

https://invent.kde.org/network/ruqola/-/commit/a8c7aa78c3a7e15c69fc67bc12dbfdb0acee8fdf

diff --git a/src/core/model/filesforroomfilterproxymodel.cpp b/src/core/model/filesforroomfilterproxymodel.cpp
index ae639a3851..d540ef9018 100644
--- a/src/core/model/filesforroomfilterproxymodel.cpp
+++ b/src/core/model/filesforroomfilterproxymodel.cpp
@@ -8,7 +8,7 @@
 #include "filesforroommodel.h"
 
 FilesForRoomFilterProxyModel::FilesForRoomFilterProxyModel(FilesForRoomModel *fileModel, QObject *parent)
-    : QSortFilterProxyModel(parent)
+    : SortFilterProxyModelBase(parent)
     , mFilesForRoomModel(fileModel)
 {
     setSourceModel(mFilesForRoomModel);
@@ -26,15 +26,6 @@ FilesForRoomFilterProxyModel::FilesForRoomFilterProxyModel(FilesForRoomModel *fi
 
 FilesForRoomFilterProxyModel::~FilesForRoomFilterProxyModel() = default;
 
-void FilesForRoomFilterProxyModel::setFilterString(const QString &string)
-{
-    if (mSearchText != string) {
-        beginFilterChange();
-        mSearchText = string;
-        endFilterChange(QSortFilterProxyModel::Direction::Rows);
-    }
-}
-
 int FilesForRoomFilterProxyModel::total() const
 {
     return mFilesForRoomModel->total();
@@ -76,11 +67,11 @@ bool FilesForRoomFilterProxyModel::filterAcceptsRow(int source_row, const QModel
     const QString fileName = sourceIndex.data(FilesForRoomModel::FileName).toString();
     const QString username = sourceIndex.data(FilesForRoomModel::UserName).toString();
 
-    if (mSearchText.isEmpty() && mTypeGroup.isEmpty()) {
+    if (mFilterString.isEmpty() && mTypeGroup.isEmpty()) {
         return true;
     } else {
-        const bool indexContains = fileName.contains(mSearchText, Qt::CaseInsensitive) || username.contains(mSearchText, Qt::CaseInsensitive);
-        if (!mSearchText.isEmpty() && mTypeGroup.isEmpty()) {
+        const bool indexContains = contains(fileName) || contains(username);
+        if (!mFilterString.isEmpty() && mTypeGroup.isEmpty()) {
             return indexContains;
         }
         if (!mTypeGroup.isEmpty()) {
diff --git a/src/core/model/filesforroomfilterproxymodel.h b/src/core/model/filesforroomfilterproxymodel.h
index 8511059498..837941cf3d 100644
--- a/src/core/model/filesforroomfilterproxymodel.h
+++ b/src/core/model/filesforroomfilterproxymodel.h
@@ -7,16 +7,15 @@
 #pragma once
 
 #include "libruqolacore_export.h"
-#include <QSortFilterProxyModel>
+#include "sortfilterproxymodelbase.h"
 class FilesForRoomModel;
-class LIBRUQOLACORE_EXPORT FilesForRoomFilterProxyModel : public QSortFilterProxyModel
+class LIBRUQOLACORE_EXPORT FilesForRoomFilterProxyModel : public SortFilterProxyModelBase
 {
     Q_OBJECT
 public:
     explicit FilesForRoomFilterProxyModel(FilesForRoomModel *fileModel = nullptr, QObject *parent = nullptr);
     ~FilesForRoomFilterProxyModel() override;
 
-    void setFilterString(const QString &string);
     [[nodiscard]] int total() const;
 
     [[nodiscard]] bool hasFullList() const;
@@ -38,6 +37,5 @@ Q_SIGNALS:
 
 private:
     QString mTypeGroup;
-    QString mSearchText;
     FilesForRoomModel *const mFilesForRoomModel;
 };
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.