From 8c2ab29927967461f0bbf73e0327f9166758d82f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 30 Jul 2023 16:35:34 +0200 Subject: [PATCH] Make JavaScript processing code compatible with Qt 5 --- cli/mediafileinfoobject.cpp | 17 +++++++++++++++++ cli/mediafileinfoobject.h | 9 +++++++++ 2 files changed, 26 insertions(+) diff --git a/cli/mediafileinfoobject.cpp b/cli/mediafileinfoobject.cpp index 9aaf944..1c6ea7c 100644 --- a/cli/mediafileinfoobject.cpp +++ b/cli/mediafileinfoobject.cpp @@ -26,6 +26,16 @@ #include #include +#include + +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) +QT_BEGIN_NAMESPACE +uint qHash(const TagParser::KnownField key, uint seed) noexcept +{ + return ::qHash(static_cast>(key), seed); +} +QT_END_NAMESPACE +#endif namespace Cli { @@ -95,9 +105,16 @@ QString UtilityObject::fixUmlauts(const QString &str) const TagValueObject::TagValueObject(const TagParser::TagValue &value, QJSEngine *engine, QObject *parent) : QObject(parent) +#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) , m_type(QString::fromUtf8(TagParser::tagDataTypeString(value.type()))) +#endif , m_initial(true) { +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) + const auto type = TagParser::tagDataTypeString(value.type()); + m_type = QString::fromUtf8(type.data(), type.size()); +#endif + switch (value.type()) { case TagParser::TagDataType::Undefined: break; diff --git a/cli/mediafileinfoobject.h b/cli/mediafileinfoobject.h index 39db4ed..80921f2 100644 --- a/cli/mediafileinfoobject.h +++ b/cli/mediafileinfoobject.h @@ -1,6 +1,15 @@ #ifndef CLI_MEDIA_FILE_INFO_OBJECT_H #define CLI_MEDIA_FILE_INFO_OBJECT_H +#include +#if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) +QT_BEGIN_NAMESPACE +namespace TagParser { +enum class KnownField : unsigned int; +} +uint qHash(const TagParser::KnownField key, uint seed = 0) noexcept; +#endif + #include #include