summaryrefslogtreecommitdiff
path: root/quacker
diff options
context:
space:
mode:
Diffstat (limited to 'quacker')
-rw-r--r--quacker/lister.cpp5
-rw-r--r--quacker/newgame.cpp2
-rw-r--r--quacker/settings.cpp2
3 files changed, 4 insertions, 5 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");
}