[LyX/master] Remove two remaining snippets from the QRegExp era.

Jean-Marc Lasgouttes lasgouttes at lyx.org
Fri Mar 3 09:16:30 UTC 2023


commit 309f8f4b40018a5bbd1d873aa9cac89261b96840
Author: Jean-Marc Lasgouttes <lasgouttes at lyx.org>
Date:   Fri Mar 3 11:17:58 2023 +0100

    Remove two remaining snippets from the QRegExp era.
---
 src/frontends/qt/CategorizedCombo.cpp |    4 ----
 src/frontends/qt/LayoutBox.cpp        |    4 ----
 2 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/src/frontends/qt/CategorizedCombo.cpp b/src/frontends/qt/CategorizedCombo.cpp
index 43ce6cb..ac4b450 100644
--- a/src/frontends/qt/CategorizedCombo.cpp
+++ b/src/frontends/qt/CategorizedCombo.cpp
@@ -287,11 +287,7 @@ void CategorizedCombo::Private::setFilter(QString const & s)
 		lastSel_ = filterModel_->mapToSource(filterModel_->index(sel, 0)).row();
 
 	filter_ = s;
-#if QT_VERSION < 0x060000
-	filterModel_->setFilterRegExp(charFilterRegExp(filter_));
-#else
 	filterModel_->setFilterRegularExpression(charFilterRegExp(filter_));
-#endif
 	countCategories();
 
 	// restore old selection
diff --git a/src/frontends/qt/LayoutBox.cpp b/src/frontends/qt/LayoutBox.cpp
index 573ec27..ab2cd7a 100644
--- a/src/frontends/qt/LayoutBox.cpp
+++ b/src/frontends/qt/LayoutBox.cpp
@@ -320,11 +320,7 @@ void LayoutBox::Private::setFilter(QString const & s)
 		lastSel_ = filterModel_->mapToSource(filterModel_->index(sel, 0)).row();
 
 	filter_ = s;
-#if QT_VERSION < 0x060000
-	filterModel_->setFilterRegExp(charFilterRegExp(filter_));
-#else
 	filterModel_->setFilterRegularExpression(charFilterRegExp(filter_));
-#endif
 	countCategories();
 
 	// restore old selection


More information about the lyx-cvs mailing list