diff options
| -rw-r--r-- | quacker/lister.cpp | 5 | ||||
| -rw-r--r-- | quacker/newgame.cpp | 2 | ||||
| -rw-r--r-- | quacker/settings.cpp | 2 | ||||
| -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 |
7 files changed, 10 insertions, 10 deletions
diff --git a/quacker/lister.cpp b/quacker/lister.cpp index b0c7451..c3a4ea9 100644 --- a/quacker/lister.cpp +++ b/quacker/lister.cpp @@ -612,14 +612,13 @@ RegexFilter::RegexFilter(ListerDialog *dialog) void RegexFilter::apply() { - QRegExp regexp(m_lineEdit->text()); - regexp.setCaseSensitivity(Qt::CaseInsensitive); + QRegularExpression regexp(m_lineEdit->text(), QRegularExpression::PatternOption::CaseInsensitiveOption); Dict::WordList filteredList; const Dict::WordList &list = m_dialog->wordList();; for (const auto& it : list) - if (regexp.indexIn(it.word) >= 0) + if (regexp.match(it.word).hasMatch()) filteredList.append(it); m_dialog->setWordList(filteredList); diff --git a/quacker/newgame.cpp b/quacker/newgame.cpp index 380b650..001d37d 100644 --- a/quacker/newgame.cpp +++ b/quacker/newgame.cpp @@ -216,7 +216,7 @@ Quackle::PlayerList PlayerTab::players() const if (ret.back().name().empty()) ret.back().setName(QuackleIO::Util::qstringToString(tr("No Name"))); - QStringList splitName = QuackleIO::Util::uvStringToQString(ret.back().name()).split(QRegExp("\\s+")); + QStringList splitName = QuackleIO::Util::uvStringToQString(ret.back().name()).split(QRegularExpression("\\s+")); ret.back().setAbbreviatedName(QuackleIO::Util::qstringToString(splitName.join("_"))); } diff --git a/quacker/settings.cpp b/quacker/settings.cpp index 8442105..41ff9a3 100644 --- a/quacker/settings.cpp +++ b/quacker/settings.cpp @@ -89,7 +89,7 @@ Settings::Settings(QWidget *parent) QMessageBox::critical(0, tr("Error Initializing Data Files - Quacker"), tr("<p>Could not open data directory. Quackle will be useless. Try running the quacker executable with quackle/quacker/ as the current directory.</p>")); m_appDataDir = directory.absolutePath(); } - m_userDataDir = QStandardPaths::writableLocation(QStandardPaths::DataLocation); + m_userDataDir = QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation); QDir qdir(m_userDataDir); qdir.mkpath("lexica"); } 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> |