rbutil: Replace use of QRegExp with QRegularExpression.

Change-Id: Ie89057a9857bc66612cb15fef81d3ca6c3e71b4c

3 files changed, 11 insertions, 11 deletions

diff --git a/utils/rbutilqt/base/system.cpp b/utils/rbutilqt/base/system.cpp
index a1d3d1165d..0ec1a9d424 100644
--- a/utils/rbutilqt/base/system.cpp
+++ b/utils/rbutilqt/base/system.cpp
@@ -418,10 +418,11 @@ QMultiMap<uint32_t, QString> System::listUsbDevices(void)
             // the keys (W7 uses different casing than XP at least), in addition
             // XP may use "Vid_" and "Pid_".
             QString data = QString::fromWCharArray(buffer).toUpper();
-            QRegExp rex("USB\\\\VID_([0-9A-F]{4})&PID_([0-9A-F]{4}).*");
-            if(rex.indexIn(data) >= 0) {
+            QRegularExpression regex("^USB\\\\VID_([0-9A-F]{4})&PID_([0-9A-F]{4})&REV_([0-9A-F]{4})$");
+            QRegularExpressionMatch match = regex.match(data);
+            if(match.hasMatch()) {
                 uint32_t id;
-                id = rex.cap(1).toUInt(0, 16) << 16 | rex.cap(2).toUInt(0, 16);
+                id = match.captured(1).toUInt(0, 16) << 16 | match.captured(2).toUInt(0, 16);
                 usbids.insert(id, description);
                 LOG_INFO() << "USB:" << QString("0x%1").arg(id, 8, 16);
             }
diff --git a/utils/rbutilqt/base/talkfile.cpp b/utils/rbutilqt/base/talkfile.cpp
index c9876a81f9..aab5fbc29a 100644
--- a/utils/rbutilqt/base/talkfile.cpp
+++ b/utils/rbutilqt/base/talkfile.cpp
@@ -177,9 +177,9 @@ bool TalkFileCreator::createTalkList(QDir startDir)
                 bool match = false;
                 for(int i=0; i < m_ignoreFiles.size();i++)
                 {
-                    QRegularExpression rx(
-                            QRegularExpression::wildcardToRegularExpression(
-                                (m_ignoreFiles[i].trimmed())));
+                    QString pattern = m_ignoreFiles[i].trimmed()
+                                        .replace("?", ".").replace("*", ".*");
+                    QRegularExpression rx(pattern);
                     if(rx.match(fileInf.fileName()).hasMatch())
                         match = true;
 
diff --git a/utils/rbutilqt/rbutilqt.cpp b/utils/rbutilqt/rbutilqt.cpp
index 680303859e..f3b12c63af 100644
--- a/utils/rbutilqt/rbutilqt.cpp
+++ b/utils/rbutilqt/rbutilqt.cpp
@@ -662,13 +662,12 @@ void RbUtilQt::downloadUpdateDone(QNetworkReply::NetworkError error)
     else {
         QString toParse(update->readAll());
 
-        QRegExp searchString("<a[^>]*>([a-zA-Z]+[^<]*)</a>");
+        QRegularExpression searchString("<a[^>]*>([a-zA-Z]+[^<]*)</a>");
         QStringList rbutilList;
-        int pos = 0;
-        while ((pos = searchString.indexIn(toParse, pos)) != -1)
+        auto it = searchString.globalMatch(toParse);
+        while (it.hasNext())
         {
-            rbutilList << searchString.cap(1);
-            pos += searchString.matchedLength();
+            rbutilList << it.next().captured(1);
         }
         LOG_INFO() << "Checking for update";