From 5d0b30a9152367714ad839d8e41332c0879f6a98 Mon Sep 17 00:00:00 2001 From: saturneric Date: Tue, 30 Jul 2024 19:13:31 +0200 Subject: fix: use standard qt version checking macro --- src/core/module/Event.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/core/module/Event.cpp') diff --git a/src/core/module/Event.cpp b/src/core/module/Event.cpp index 221b6001..b6d31369 100644 --- a/src/core/module/Event.cpp +++ b/src/core/module/Event.cpp @@ -105,27 +105,27 @@ class Event::Impl { int index = 0; -#ifdef QT5_BUILD - for (auto it = data_.keyValueBegin(); it != data_.keyValueEnd(); ++it) { +#if QT_VERSION >= QT_VERSION_CHECK(6, 4, 0) + for (const auto& data : data_.asKeyValueRange()) { p_param = static_cast( SecureMalloc(sizeof(GFModuleEventParam))); if (index++ == 0) event->params = p_param; - p_param->name = GFStrDup(it->first); - p_param->value = GFStrDup(it->second); + p_param->name = GFStrDup(data.first); + p_param->value = GFStrDup(data.second); p_param->next = nullptr; if (l_param != nullptr) l_param->next = p_param; l_param = p_param; } #else - for (const auto& data : data_.asKeyValueRange()) { + for (auto it = data_.keyValueBegin(); it != data_.keyValueEnd(); ++it) { p_param = static_cast( SecureMalloc(sizeof(GFModuleEventParam))); if (index++ == 0) event->params = p_param; - p_param->name = GFStrDup(data.first); - p_param->value = GFStrDup(data.second); + p_param->name = GFStrDup(it->first); + p_param->value = GFStrDup(it->second); p_param->next = nullptr; if (l_param != nullptr) l_param->next = p_param; -- cgit v1.2.3