Enable regexp search in QPlainTextEdit prior to ver.5.13

emsec · Oct 31, 2023 · db4fa7f · db4fa7f
1 parent f7b2a66
commit db4fa7f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/plugins/gui/src/code_editor/code_editor.cpp b/plugins/gui/src/code_editor/code_editor.cpp
@@ -13,6 +13,12 @@
 #include <QTextBlock>
 #include <QDebug>
 
+#if QT_VERSION >= QT_VERSION_CHECK(5,13,0)
+   #include <QRegularExpression>
+#else
+   #include <QRegExp>
+#endif
+
 namespace hal
 {
 
@@ -213,9 +219,12 @@ namespace hal
 
         if(searchOpts.isRegularExpression())
         {
-            QRegularExpression* regEx = new QRegularExpression(string, searchOpts.isCaseSensitive() ? QRegularExpression::NoPatternOption : QRegularExpression::CaseInsensitiveOption);
-
-            while (find(*regEx, options))
+#if QT_VERSION >= QT_VERSION_CHECK(5,13,0)
+            QRegularExpression regExp(string, searchOpts.isCaseSensitive() ? QRegularExpression::NoPatternOption : QRegularExpression::CaseInsensitiveOption);
+#else
+            QRegExp regExp(string, searchOpts.isCaseSensitive() ? Qt::CaseSensitive : Qt::CaseInsensitive);
+#endif
+            while (find(regExp, options))
             {
                 QTextEdit::ExtraSelection extra;
                 extra.format.setForeground(QBrush(color));

diff --git a/plugins/gui/src/comment_system/widgets/comment_item.cpp b/plugins/gui/src/comment_system/widgets/comment_item.cpp
@@ -11,6 +11,11 @@
 #include <QToolButton>
 #include <QDebug>
 #include "gui/gui_utils/graphics.h"
+#if QT_VERSION >= QT_VERSION_CHECK(5,13,0)
+   #include <QRegularExpression>
+#else
+   #include <QRegExp>
+#endif
 
 namespace hal
 {
@@ -61,9 +66,13 @@ namespace hal
         if(searchOpts.isRegularExpression())
         {
             qInfo() << "is regex";
-            QRegularExpression* regEx = new QRegularExpression(string, searchOpts.isCaseSensitive() ? QRegularExpression::NoPatternOption : QRegularExpression::CaseInsensitiveOption);
+#if QT_VERSION >= QT_VERSION_CHECK(5,13,0)
+            QRegularExpression regExp(string, searchOpts.isCaseSensitive() ? QRegularExpression::NoPatternOption : QRegularExpression::CaseInsensitiveOption);
+#else
+            QRegExp regExp(string, searchOpts.isCaseSensitive() ? Qt::CaseSensitive : Qt::CaseInsensitive);
+#endif
 
-            while (mTextEdit->find(*regEx, options))
+            while (mTextEdit->find(regExp, options))
             {
                 found = true; // just return if something is found, position doesnt matter
                 QTextEdit::ExtraSelection extra;