From 0b8194043a40b7c19ccfc206f6f3ffea69f39ce3 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 28 Dec 2025 21:14:39 +0900 Subject: Remove Q_CANNOT_DELETE_CONSTANT define. We are using c++17 compilers, this should no longer be needed. Signed-off-by: Michele Calgaro --- doc/html/tqglobal-h.html | 4 ---- src/kernel/tqmetaobject.cpp | 4 ---- src/tools/tqglobal.h | 4 ---- 3 files changed, 12 deletions(-) diff --git a/doc/html/tqglobal-h.html b/doc/html/tqglobal-h.html index 0cbc709a..17f34565 100644 --- a/doc/html/tqglobal-h.html +++ b/doc/html/tqglobal-h.html @@ -251,8 +251,6 @@ body { background: #ffffff; color: black; } #elif defined(_MSC_VER) # define Q_CC_MSVC -/* proper support of bool for _MSC_VER >= 1100 */ -# define Q_CANNOT_DELETE_CONSTANT # define TQ_INLINE_TEMPLATES inline /* Visual C++.Net issues for _MSC_VER >= 1300 */ # if _MSC_VER >= 1300 @@ -276,7 +274,6 @@ body { background: #ffffff; color: black; } # if defined(Q_OS_QNX4) /* compiler flags */ # define TQ_TYPENAME -# define Q_CANNOT_DELETE_CONSTANT # define mutable /* no template classes in TQVariant */ # define TQT_NO_TEMPLATE_VARIANT @@ -348,7 +345,6 @@ body { background: #ffffff; color: black; } # define Q_NO_USING_KEYWORD # define TQ_TYPENAME # define TQ_INLINE_TEMPLATES inline -# define Q_CANNOT_DELETE_CONSTANT # endif /* Compilers with EDG front end are similar. To detect them we test: diff --git a/src/kernel/tqmetaobject.cpp b/src/kernel/tqmetaobject.cpp index 4464f716..d2119851 100644 --- a/src/kernel/tqmetaobject.cpp +++ b/src/kernel/tqmetaobject.cpp @@ -164,11 +164,7 @@ public: Internal dictionary for fast access to class members *****************************************************************************/ -#if defined(Q_CANNOT_DELETE_CONSTANT) -typedef TQMetaData TQConstMetaData; -#else typedef const TQMetaData TQConstMetaData; -#endif class TQ_EXPORT TQMemberDict : public TQAsciiDict { diff --git a/src/tools/tqglobal.h b/src/tools/tqglobal.h index 15c70005..e74c87f9 100644 --- a/src/tools/tqglobal.h +++ b/src/tools/tqglobal.h @@ -218,8 +218,6 @@ #elif defined(_MSC_VER) # define Q_CC_MSVC -/* proper support of bool for _MSC_VER >= 1100 */ -# define Q_CANNOT_DELETE_CONSTANT # define TQ_INLINE_TEMPLATES inline /* Visual C++.Net issues for _MSC_VER >= 1300 */ # if _MSC_VER >= 1300 @@ -243,7 +241,6 @@ # if defined(Q_OS_QNX4) /* compiler flags */ # define TQ_TYPENAME -# define Q_CANNOT_DELETE_CONSTANT # define mutable /* no template classes in TQVariant */ # define TQT_NO_TEMPLATE_VARIANT @@ -315,7 +312,6 @@ # define Q_NO_USING_KEYWORD # define TQ_TYPENAME # define TQ_INLINE_TEMPLATES inline -# define Q_CANNOT_DELETE_CONSTANT # endif /* Compilers with EDG front end are similar. To detect them we test: -- cgit v1.2.3