Changeset 100795 in vbox for trunk

Timestamp:

Aug 4, 2023 10:34:46 AM (19 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

158686

Message:

FE/Qt: Search media with regexes.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSearchWidget.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumSearchWidget.cpp

@@ -28 +28 @@
 /* Qt includes: */
 #include <QComboBox>
+#include <QHBoxLayout>
 #include <QLineEdit>
 #include <QPushButton>
 #include <QPainter>
-#include <QHBoxLayout>
+#ifdef VBOX_IS_QT6_OR_LATER /* fromWildcard is available since 6.0 */
+# include <QRegularExpression>
+#else
+# include <QRegExp>
+#endif
 
 /* GUI includes: */
@@ -69 +74 @@
         if (!pMediumItem)
             return false;
-        if (m_enmSearchType == UIMediumSearchWidget::SearchByUUID &&
-            !pMediumItem->id().toString().contains(m_strSearchTerm, Qt::CaseInsensitive))
-            return false;
-        if (m_enmSearchType == UIMediumSearchWidget::SearchByName &&
-            !pMediumItem->name().contains(m_strSearchTerm, Qt::CaseInsensitive))
-            return false;
-        return true;
+        QString strValue;
+        if (m_enmSearchType == UIMediumSearchWidget::SearchByUUID)
+            strValue = pMediumItem->id().toString();
+        else if (m_enmSearchType == UIMediumSearchWidget::SearchByName)
+            strValue = pMediumItem->name();
+        else
+            return false;
+#ifdef VBOX_IS_QT6_OR_LATER /* fromWildcard is available since 6.0 */
+        QRegularExpression searchRegEx = QRegularExpression::fromWildcard(m_strSearchTerm, Qt::CaseInsensitive,
+                                                                          QRegularExpression::UnanchoredWildcardConversion);
+#else
+        QRegExp searchRegEx(m_strSearchTerm, Qt::CaseInsensitive, QRegExp::Wildcard);
+#endif
+        if (strValue.contains(searchRegEx))
+            return true;
+        return false;
     }