diff options
Diffstat (limited to 'quackleio')
| -rw-r--r-- | quackleio/dictimplementation.cpp | 4 | ||||
| -rw-r--r-- | quackleio/flexiblealphabet.cpp | 2 | ||||
| -rw-r--r-- | quackleio/gcgio.cpp | 4 | ||||
| -rw-r--r-- | quackleio/util.h | 1 |
4 files changed, 6 insertions, 5 deletions
diff --git a/quackleio/dictimplementation.cpp b/quackleio/dictimplementation.cpp index 43c1005..4dd4260 100644 --- a/quackleio/dictimplementation.cpp +++ b/quackleio/dictimplementation.cpp @@ -42,8 +42,8 @@ Dict::WordList QuackleIO::DictImplementation::query(const QString &query, int fl if (flags & Dict::Querier::NoRequireAllLetters) anagramFlags |= Quackle::Generator::NoRequireAllLetters; - QRegExp wildcardRegexp("[\\*/]"); - if (wildcardRegexp.indexIn(modifiedQuery) >= 0) + QRegularExpression wildcardRegexp("[\\*/]"); + if (wildcardRegexp.match(modifiedQuery).hasMatch()) { if (!(flags & Dict::Querier::NoRequireAllLetters)) anagramFlags |= Quackle::Generator::AddAnyLetters; diff --git a/quackleio/flexiblealphabet.cpp b/quackleio/flexiblealphabet.cpp index 34ce229..011e59b 100644 --- a/quackleio/flexiblealphabet.cpp +++ b/quackleio/flexiblealphabet.cpp @@ -51,7 +51,7 @@ bool FlexibleAlphabetParameters::load(const QString &filename) while (!stream.atEnd()) { line = stream.readLine().simplified(); - QStringList strings = line.split(QRegExp("\\s+")); + QStringList strings = line.split(QRegularExpression("\\s+")); if (line.startsWith("#")) continue; diff --git a/quackleio/gcgio.cpp b/quackleio/gcgio.cpp index 862f07b..e2c569d 100644 --- a/quackleio/gcgio.cpp +++ b/quackleio/gcgio.cpp @@ -65,9 +65,9 @@ Quackle::Game *GCGIO::read(QTextStream &stream, int flags) { line = stream.readLine(); #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) - QStringList strings = line.split(QRegExp("\\s+"), Qt::SkipEmptyParts); + QStringList strings = line.split(QRegularExpression("\\s+"), Qt::SkipEmptyParts); #else - QStringList strings = line.split(QRegExp("\\s+"), QString::SkipEmptyParts); + QStringList strings = line.split(QRegularExpression("\\s+"), QString::SkipEmptyParts); #endif if (line.startsWith("#")) diff --git a/quackleio/util.h b/quackleio/util.h index fe514a9..19ec469 100644 --- a/quackleio/util.h +++ b/quackleio/util.h @@ -20,6 +20,7 @@ #define QUACKER_UTIL_H #include <QString> +#include <QRegularExpression> #include <alphabetparameters.h> #include <datamanager.h> |