From 216b394d4cc2cffb9f8666bbe7059359251a1621 Mon Sep 17 00:00:00 2001 From: Petr Bena Date: Thu, 18 Jul 2024 21:49:13 +0200 Subject: [PATCH] fixed regexp class name in qt5 --- src/huggle_core/definitions_prod.hpp | 2 +- src/huggle_core/generic.cpp | 4 ++-- src/huggle_core/resources.cpp | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/huggle_core/definitions_prod.hpp b/src/huggle_core/definitions_prod.hpp index cfea3e4ef..039cade0f 100644 --- a/src/huggle_core/definitions_prod.hpp +++ b/src/huggle_core/definitions_prod.hpp @@ -109,7 +109,7 @@ namespace std { typedef decltype(nullptr) nullptr_t; } #define HREGEX_TYPE QRegularExpression #else #define HMUTEX_TYPE QMutex - #define HREGEX_TYPE QRegEx + #define HREGEX_TYPE QRegExp #endif #if QT_VERSION >= 0x050000 diff --git a/src/huggle_core/generic.cpp b/src/huggle_core/generic.cpp index 4416e55a0..22e51c31c 100644 --- a/src/huggle_core/generic.cpp +++ b/src/huggle_core/generic.cpp @@ -18,7 +18,7 @@ #ifdef QT6_BUILD #include #else -#include +#include #endif using namespace Huggle; @@ -223,7 +223,7 @@ bool Generic::RegexExactMatch(const QString& regex, const QString& input_text) QRegularExpressionMatch match = re.match(input_text); return match.hasMatch() && (match.captured(0) == input_text); #else - QRegEx re(regex); + QRegExp re(regex); return re.exactMatch(input_text); #endif } diff --git a/src/huggle_core/resources.cpp b/src/huggle_core/resources.cpp index 6e1311c94..a989ac832 100644 --- a/src/huggle_core/resources.cpp +++ b/src/huggle_core/resources.cpp @@ -116,8 +116,10 @@ void Huggle::Resources::Uninit() #ifndef HUGGLE_NOAUDIO mediaPlayer->deleteLater(); mediaPlayer = nullptr; - audioOutput->deleteLater(); - audioOutput = nullptr; + #ifdef QT6_BUILD + audioOutput->deleteLater(); + audioOutput = nullptr; + #endif #endif }