String: Added a method for checking for words in a string

skyjake · Nov 14, 2016 · 909b101 · 909b101
1 parent a121b90
commit 909b101
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/doomsday/sdk/libcore/include/de/data/string.h b/doomsday/sdk/libcore/include/de/data/string.h
@@ -217,6 +217,8 @@ class DENG2_PUBLIC String : public QString
     /// Extracts everything but the extension from string.
     String fileNameAndPathWithoutExtension(QChar dirChar = '/') const;
 
+    bool containsWord(String const &word) const;
+
     /**
      * Compare two strings (case sensitive).
      *

diff --git a/doomsday/sdk/libcore/src/data/record.cpp b/doomsday/sdk/libcore/src/data/record.cpp
@@ -625,9 +625,8 @@ Variable &Record::appendUniqueWord(String const &name, String const &word, Strin
 {
     DENG2_GUARD(d);
 
-    QRegExp re(QString("\\b%1\\b").arg(word));
     String const value = gets(name, "");
-    if (re.indexIn(value) < 0)
+    if (!value.containsWord(word))
     {
         appendWord(name, word, separator);
     }

diff --git a/doomsday/sdk/libcore/src/data/string.cpp b/doomsday/sdk/libcore/src/data/string.cpp
@@ -24,6 +24,7 @@
 
 #include <QDir>
 #include <QTextStream>
+#include <QRegularExpression>
 #include <QUrl> // percent encoding
 #include <cstdio>
 #include <cstdarg>
@@ -412,6 +413,15 @@ String String::fileNameAndPathWithoutExtension(QChar dirChar) const
     return fileNamePath(dirChar) / fileNameWithoutExtension();
 }
 
+bool String::containsWord(String const &word) const
+{
+    if (word.isEmpty())
+    {
+        return false;
+    }
+    return QRegularExpression(QString("\\b%1\\b").arg(word)).match(*this).hasMatch();
+}
+
 dint String::compareWithCase(String const &str) const
 {
     return compare(str, Qt::CaseSensitive);