From cc86ff5b3de493bad19cbe00b49b0aeb946019dc Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 20 Sep 2023 21:22:04 +0200 Subject: [PATCH] qswap.h: use a more robust include guard Just "QSWAP_H" is a bit meager to be unique. We don't really have a monopoly on q-prefixed function and header names, there's the C std function qsort(), e.g... So use a somewhat more unique name as header guard. Pick-to: 6.5 Change-Id: I554fa224afcb6858b752e8044ef3c03dfc69c084 Reviewed-by: Fabian Kosmale Reviewed-by: Ahmad Samir (cherry picked from commit 0bd3e28b17d076da4816fbbfd65d7c8df0a9e37b) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/global/qswap.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/corelib/global/qswap.h b/src/corelib/global/qswap.h index 69fbe1197bc..7feff5eb08d 100644 --- a/src/corelib/global/qswap.h +++ b/src/corelib/global/qswap.h @@ -1,8 +1,8 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -#ifndef QSWAP_H -#define QSWAP_H +#ifndef QTCORE_QSWAP_H +#define QTCORE_QSWAP_H #include #include @@ -52,4 +52,4 @@ QT_WARNING_POP QT_END_NAMESPACE -#endif // QSWAP_H +#endif // QTCORE_QSWAP_H