rbutil: Replace QRegExp with QRegularExpression.

More updating for Qt6 compatibility.

Change-Id: I2f5bb943acc1f6bdd7bdab0e90e3c0ede596f43a

2 files changed, 8 insertions, 5 deletions

diff --git a/utils/rbutilqt/base/talkfile.cpp b/utils/rbutilqt/base/talkfile.cpp
index 4c9cae5a16..c9876a81f9 100644
--- a/utils/rbutilqt/base/talkfile.cpp
+++ b/utils/rbutilqt/base/talkfile.cpp
@@ -169,16 +169,20 @@ bool TalkFileCreator::createTalkList(QDir startDir)
         else  // its a File
         {
             // insert into List
-            if( !fileInf.fileName().isEmpty() && !fileInf.fileName().endsWith(".talk") && m_talkFiles)
+            if(!fileInf.fileName().isEmpty()
+                    && !fileInf.fileName().endsWith(".talk")
+                    && m_talkFiles)
             {
                 //test if we should ignore this file
                 bool match = false;
                 for(int i=0; i < m_ignoreFiles.size();i++)
                 {
-                    QRegExp rx(m_ignoreFiles[i].trimmed());
-                    rx.setPatternSyntax(QRegExp::Wildcard);
-                    if(rx.exactMatch(fileInf.fileName()))
+                    QRegularExpression rx(
+                            QRegularExpression::wildcardToRegularExpression(
+                                (m_ignoreFiles[i].trimmed())));
+                    if(rx.match(fileInf.fileName()).hasMatch())
                         match = true;
+
                 }
                 if(match)
                     continue;
diff --git a/utils/rbutilqt/base/talkgenerator.cpp b/utils/rbutilqt/base/talkgenerator.cpp
index 6798d53829..eb000bf188 100644
--- a/utils/rbutilqt/base/talkgenerator.cpp
+++ b/utils/rbutilqt/base/talkgenerator.cpp
@@ -275,7 +275,6 @@ QString TalkGenerator::correctString(QString s)
         LOG_INFO() << "corrected string" << s << "to" << corrected;
 
     return corrected;
-    m_abort = true;
 }
 
 void TalkGenerator::setLang(QString name)