From 00f3ca950a6cab105c95b53ce2b3b93282abcea8 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 12 Feb 2025 22:37:49 -0800 Subject: [PATCH] CBOR: remove QT_X11_DEFINES_FOUND dead code Amends commit be0f1af3f1829da0d321c12dbd40d5743d3b2eb5 ("CBOR: remove the X11 True and False for good"), which removed the #define from the top of the files, but didn't remove the checking of the macro from the bottom of them. Pick-to: 6.9 Change-Id: I92e76842a4117f6feed3fffdac2fcec01367101e Reviewed-by: Ulf Hermann --- src/corelib/serialization/qcborcommon.h | 7 ------- src/corelib/serialization/qcborstreamreader.h | 5 ----- src/corelib/serialization/qcborstreamwriter.h | 5 ----- src/corelib/serialization/qcborvalue.h | 5 ----- 4 files changed, 22 deletions(-) diff --git a/src/corelib/serialization/qcborcommon.h b/src/corelib/serialization/qcborcommon.h index 202bc49278d..4c52e8bfa48 100644 --- a/src/corelib/serialization/qcborcommon.h +++ b/src/corelib/serialization/qcborcommon.h @@ -118,11 +118,4 @@ QT_END_NAMESPACE QT_DECL_METATYPE_EXTERN(QCborTag, Q_CORE_EXPORT) -// To avoid changing namespace we need to reinstate defines, even though our .cpp -// will then have to remove them again. -#if defined(QT_X11_DEFINES_FOUND) -# define True 1 -# define False 0 -#endif - #endif // QCBORSTREAM_H diff --git a/src/corelib/serialization/qcborstreamreader.h b/src/corelib/serialization/qcborstreamreader.h index aa11306fb22..c57db6a1bad 100644 --- a/src/corelib/serialization/qcborstreamreader.h +++ b/src/corelib/serialization/qcborstreamreader.h @@ -210,9 +210,4 @@ private: QT_END_NAMESPACE -#if defined(QT_X11_DEFINES_FOUND) -# define True 1 -# define False 0 -#endif - #endif // QCBORSTREAMREADER_H diff --git a/src/corelib/serialization/qcborstreamwriter.h b/src/corelib/serialization/qcborstreamwriter.h index 630cf67b7a4..976a0cb34a4 100644 --- a/src/corelib/serialization/qcborstreamwriter.h +++ b/src/corelib/serialization/qcborstreamwriter.h @@ -88,9 +88,4 @@ private: QT_END_NAMESPACE -#if defined(QT_X11_DEFINES_FOUND) -# define True 1 -# define False 0 -#endif - #endif // QCBORSTREAMWRITER_H diff --git a/src/corelib/serialization/qcborvalue.h b/src/corelib/serialization/qcborvalue.h index 3b20ac4487b..04c391eb69f 100644 --- a/src/corelib/serialization/qcborvalue.h +++ b/src/corelib/serialization/qcborvalue.h @@ -625,9 +625,4 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QCborValue &); QT_END_NAMESPACE -#if defined(QT_X11_DEFINES_FOUND) -# define True 1 -# define False 0 -#endif - #endif // QCBORVALUE_H