summaryrefslogtreecommitdiff
path: root/src/modinfo.cpp
diff options
context:
space:
mode:
authorJeremy Rimpo <jeremy.rimpo@servermonkey.com>2021-12-06 03:51:08 -0600
committerMikaƫl Capelle <capelle.mikael@gmail.com>2022-04-19 15:17:23 +0200
commitc4b2be45d29a247422e60bb8fdf1664c10384eee (patch)
tree729640dc3e5105fe6eea04a5a03451176fc91a7e /src/modinfo.cpp
parentec01532ecbd2d7c99d1b3bdd8cf261795df59327 (diff)
First pass for Qt6 compatibility
Diffstat (limited to 'src/modinfo.cpp')
-rw-r--r--src/modinfo.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/modinfo.cpp b/src/modinfo.cpp
index 59026262..3c54fc27 100644
--- a/src/modinfo.cpp
+++ b/src/modinfo.cpp
@@ -55,7 +55,7 @@ ModInfo::Ptr ModInfo::s_Overwrite;
std::map<QString, unsigned int, MOBase::FileNameComparator> ModInfo::s_ModsByName;
std::map<std::pair<QString, int>, std::vector<unsigned int>> ModInfo::s_ModsByModID;
int ModInfo::s_NextID;
-QMutex ModInfo::s_Mutex(QMutex::Recursive);
+QRecursiveMutex ModInfo::s_Mutex;
QString ModInfo::s_HiddenExt(".mohidden");
@@ -67,14 +67,14 @@ bool ModInfo::ByName(const ModInfo::Ptr &LHS, const ModInfo::Ptr &RHS)
bool ModInfo::isSeparatorName(const QString& name)
{
- static QRegExp separatorExp(".*_separator");
- return separatorExp.exactMatch(name);
+ static QRegularExpression separatorExp(QRegularExpression::anchoredPattern(".*_separator"));
+ return separatorExp.match(name).hasMatch();
}
bool ModInfo::isBackupName(const QString& name)
{
- static QRegExp backupExp(".*backup[0-9]*");
- return backupExp.exactMatch(name);
+ static QRegularExpression backupExp(QRegularExpression::anchoredPattern(".*backup[0-9]*"));
+ return backupExp.match(name).hasMatch();
}
bool ModInfo::isRegularName(const QString& name)