qt: Use QRegularExpression in AddressBookSortFilterProxyModel class

hebasto · hebasto · commit b649103d0554 · 2022-04-15T12:06:18.000+02:00
diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp
@@ -18,6 +18,7 @@
 #include <QIcon>
 #include <QMenu>
 #include <QMessageBox>
+#include <QRegularExpression>
 #include <QSortFilterProxyModel>
 
 class AddressBookSortFilterProxyModel final : public QSortFilterProxyModel
@@ -46,12 +47,9 @@ class AddressBookSortFilterProxyModel final : public QSortFilterProxyModel
 
         auto address = model->index(row, AddressTableModel::Address, parent);
 
-        if (filterRegExp().indexIn(model->data(address).toString()) < 0 &&
-            filterRegExp().indexIn(model->data(label).toString()) < 0) {
-            return false;
-        }
-
-        return true;
+        auto match_address = filterRegularExpression().match(model->data(address).toString());
+        auto match_label = filterRegularExpression().match(model->data(label).toString());
+        return match_address.hasMatch() || match_label.hasMatch();
     }
 };
 
