diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index 6536d9b..1414212 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -1,10 +1,10 @@ # SPDX-FileCopyrightText: 2023 g10 code Gmbh # SPDX-Contributor: Carl Schwan # SPDX-License-Identifier: BSD-2-Clause add_library(common STATIC utils.cpp utils.h ) -target_link_libraries(common PRIVATE Qt6::Core) +target_link_libraries(common PRIVATE Qt6::Core Qt6::Network) diff --git a/common/utils.cpp b/common/utils.cpp index 173fe21..0a17b41 100644 --- a/common/utils.cpp +++ b/common/utils.cpp @@ -1,19 +1,26 @@ // SPDX-FileCopyrightText: 2023 g10 code GmbH // SPDX-Contributor: Carl Schwan // SPDX-License-Identifier: GPL-2.0-or-later #include "utils.h" #include +#if QT_VERSION >= QT_VERSION_CHECK(6,7,0) +QByteArray Utils::findHeader(const QHttpHeaders &headers, const QByteArray &key) +{ + return headers.value(key).toByteArray(); +} +#else QByteArray Utils::findHeader(QList> headers, const QByteArray &key) { const auto it = std::find_if(std::cbegin(headers), std::cend(headers), [&key](auto header) { return header.first == key; }); if (it == std::cend(headers)) { return {}; } return it->second; } +#endif diff --git a/common/utils.h b/common/utils.h index 6e0f097..b82d074 100644 --- a/common/utils.h +++ b/common/utils.h @@ -1,10 +1,18 @@ // SPDX-FileCopyrightText: 2023 g10 code GmbH // SPDX-Contributor: Carl Schwan // SPDX-License-Identifier: GPL-2.0-or-later #include +#if QT_VERSION >= QT_VERSION_CHECK(6,7,0) +#include +#endif + namespace Utils { +#if QT_VERSION >= QT_VERSION_CHECK(6,7,0) +QByteArray findHeader(const QHttpHeaders &headers, const QByteArray &key); +#else QByteArray findHeader(QList> headers, const QByteArray &key); +#endif }