From 1df9f282051905555d02d43069a2c9ca0cc89270 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 28 Dec 2025 17:25:10 +0900 Subject: Remove Q_NO_EXPLICIT_KEYWORD and Q_EXPLICIT macros. We are using c++17 compilers, so 'explicit' is supported. Signed-off-by: Michele Calgaro --- doc/html/tqdialog-h.html | 2 +- doc/html/tqdom-h.html | 4 ++-- doc/html/tqglobal-h.html | 21 --------------------- doc/html/tqmemarray-h.html | 2 +- doc/html/tqsqlquery-h.html | 2 +- doc/html/tqwidget-h.html | 2 +- src/dialogs/tqdialog.h | 2 +- src/kernel/tqwidget.h | 2 +- src/sql/tqsqlquery.h | 2 +- src/tools/tqglobal.h | 21 --------------------- src/tools/tqmemarray.h | 2 +- src/tools/tqtl.h | 2 +- src/xml/tqdom.h | 4 ++-- 13 files changed, 13 insertions(+), 55 deletions(-) diff --git a/doc/html/tqdialog-h.html b/doc/html/tqdialog-h.html index d137f6639..d6bc2919f 100644 --- a/doc/html/tqdialog-h.html +++ b/doc/html/tqdialog-h.html @@ -95,7 +95,7 @@ friend class TQPushButton; TQ_PROPERTY( bool modal READ isModal WRITE setModal ) public: - Q_EXPLICIT TQDialog( TQWidget* parent=0, const char* name=0, bool modal=false, + explicit TQDialog( TQWidget* parent=0, const char* name=0, bool modal=false, WFlags f=0 ); ~TQDialog(); diff --git a/doc/html/tqdom-h.html b/doc/html/tqdom-h.html index 1c93e2f5e..2a9f03fbb 100644 --- a/doc/html/tqdom-h.html +++ b/doc/html/tqdom-h.html @@ -325,8 +325,8 @@ class TQM_EXPORT_DOM TQDomDocument : public TQDomNode { public: TQDomDocument(); - Q_EXPLICIT TQDomDocument( const TQString& name ); - Q_EXPLICIT TQDomDocument( const TQDomDocumentType& doctype ); + explicit TQDomDocument( const TQString& name ); + explicit TQDomDocument( const TQDomDocumentType& doctype ); TQDomDocument( const TQDomDocument& x ); TQDomDocument& operator= ( const TQDomDocument& ); ~TQDomDocument(); diff --git a/doc/html/tqglobal-h.html b/doc/html/tqglobal-h.html index 834389c50..0cbc709a7 100644 --- a/doc/html/tqglobal-h.html +++ b/doc/html/tqglobal-h.html @@ -240,10 +240,6 @@ body { background: #ffffff; color: black; } /* Symantec C++ is now Digital Mars */ #if defined(__DMC__) || defined(__SC__) # define Q_CC_SYM -/* "explicit" semantics implemented in 8.1e but keyword recognized since 7.5 */ -# if defined(__SC__) && __SC__ < 0x750 -# define Q_NO_EXPLICIT_KEYWORD -# endif # define Q_NO_USING_KEYWORD # if !defined(_CPPUNWIND) # define Q_NO_EXCEPTIONS @@ -251,7 +247,6 @@ body { background: #ffffff; color: black; } #elif defined(applec) # define Q_CC_MPW -# define Q_NO_EXPLICIT_KEYWORD # define Q_NO_USING_KEYWORD #elif defined(_MSC_VER) @@ -350,7 +345,6 @@ body { background: #ffffff; color: black; } # define Q_CC_XLC # define TQ_FULL_TEMPLATE_INSTANTIATION # if __xlC__ < 0x400 -# define Q_NO_EXPLICIT_KEYWORD # define Q_NO_USING_KEYWORD # define TQ_TYPENAME # define TQ_INLINE_TEMPLATES inline @@ -417,7 +411,6 @@ body { background: #ffffff; color: black; } # define Q_CC_MIPS # if defined(_MIPS_SIM) && (_MIPS_SIM == _ABIO32) /* o32 ABI */ # define TQ_TYPENAME -# define Q_NO_EXPLICIT_KEYWORD # define TQ_INLINE_TEMPLATES inline # elif defined(_COMPILER_VERSION) && (_COMPILER_VERSION < 730) /* 7.2 */ # define TQ_TYPENAME @@ -432,7 +425,6 @@ body { background: #ffffff; color: black; } #elif defined(__USLC__) # define Q_CC_USLC # define TQ_TYPENAME -# define Q_NO_EXPLICIT_KEYWORD # define Q_NO_USING_KEYWORD # define TQ_INLINE_TEMPLATES inline @@ -449,7 +441,6 @@ body { background: #ffffff; color: black; } # define Q_C_CALLBACKS /* 4.2 compiler or older */ # else -# define Q_NO_EXPLICIT_KEYWORD # define Q_NO_USING_KEYWORD # endif @@ -460,7 +451,6 @@ body { background: #ffffff; color: black; } # else # define Q_CC_HP # define TQ_FULL_TEMPLATE_INSTANTIATION -# define Q_NO_EXPLICIT_KEYWORD # endif # define Q_NO_USING_KEYWORD /* ### check "using" status */ @@ -544,17 +534,6 @@ typedef uchar *puchar; typedef const char *pcchar; -// -// Use the "explicit" keyword on platforms that support it. -// - -#if !defined(Q_NO_EXPLICIT_KEYWORD) -# define Q_EXPLICIT explicit -#else -# define Q_EXPLICIT -#endif - - // // Utility macros and inline functions // diff --git a/doc/html/tqmemarray-h.html b/doc/html/tqmemarray-h.html index 39beae5f8..452e54d26 100644 --- a/doc/html/tqmemarray-h.html +++ b/doc/html/tqmemarray-h.html @@ -94,7 +94,7 @@ protected: public: TQMemArray() {} - TQMemArray( int size ) : TQGArray(size*sizeof(type)) {} // ### 4.0 Q_EXPLICIT + TQMemArray( int size ) : TQGArray(size*sizeof(type)) {} // ### 4.0 explicit TQMemArray( const TQMemArray<type> &a ) : TQGArray(a) {} ~TQMemArray() {} TQMemArray<type> &operator=(const TQMemArray<type> &a) diff --git a/doc/html/tqsqlquery-h.html b/doc/html/tqsqlquery-h.html index 520984073..08e2b932a 100644 --- a/doc/html/tqsqlquery-h.html +++ b/doc/html/tqsqlquery-h.html @@ -108,7 +108,7 @@ class TQ_EXPORT TQSqlQuery public: TQSqlQuery( TQSqlResult * r ); TQSqlQuery( const TQString& query = TQString::null, TQSqlDatabase* db = 0 ); - Q_EXPLICIT TQSqlQuery( TQSqlDatabase* db ); + explicit TQSqlQuery( TQSqlDatabase* db ); TQSqlQuery( const TQSqlQuery& other ); TQSqlQuery& operator=( const TQSqlQuery& other ); virtual ~TQSqlQuery(); diff --git a/doc/html/tqwidget-h.html b/doc/html/tqwidget-h.html index 62cb12e98..0bd7b09dd 100644 --- a/doc/html/tqwidget-h.html +++ b/doc/html/tqwidget-h.html @@ -169,7 +169,7 @@ class TQ_EXPORT TQWidget : public TQObject, public TQPaintDevice TQ_PROPERTY( double windowOpacity READ windowOpacity WRITE setWindowOpacity DESIGNABLE false ) public: - Q_EXPLICIT TQWidget( TQWidget* parent=0, const char* name=0, WFlags f=0 ); + explicit TQWidget( TQWidget* parent=0, const char* name=0, WFlags f=0 ); ~TQWidget(); WId winId() const; diff --git a/src/dialogs/tqdialog.h b/src/dialogs/tqdialog.h index 786be4cf5..35bd0e40c 100644 --- a/src/dialogs/tqdialog.h +++ b/src/dialogs/tqdialog.h @@ -60,7 +60,7 @@ friend class TQPushButton; TQ_PROPERTY( bool modal READ isModal WRITE setModal ) public: - Q_EXPLICIT TQDialog( TQWidget* parent=0, const char* name=0, bool modal=false, + explicit TQDialog( TQWidget* parent=0, const char* name=0, bool modal=false, WFlags f=0 ); ~TQDialog(); diff --git a/src/kernel/tqwidget.h b/src/kernel/tqwidget.h index ce26e00cb..c7a9733bb 100644 --- a/src/kernel/tqwidget.h +++ b/src/kernel/tqwidget.h @@ -139,7 +139,7 @@ class TQ_EXPORT TQWidget : public TQObject, public TQPaintDevice TQ_PROPERTY( double windowOpacity READ windowOpacity WRITE setWindowOpacity DESIGNABLE false ) public: - Q_EXPLICIT TQWidget( TQWidget* parent=0, const char* name=0, WFlags f=0, NFlags n=0 ); + explicit TQWidget( TQWidget* parent=0, const char* name=0, WFlags f=0, NFlags n=0 ); ~TQWidget(); WId winId() const; diff --git a/src/sql/tqsqlquery.h b/src/sql/tqsqlquery.h index 70c6f4b20..bfd36941f 100644 --- a/src/sql/tqsqlquery.h +++ b/src/sql/tqsqlquery.h @@ -74,7 +74,7 @@ class TQ_EXPORT TQSqlQuery public: TQSqlQuery( TQSqlResult * r ); TQSqlQuery( const TQString& query = TQString::null, TQSqlDatabase* db = 0 ); - Q_EXPLICIT TQSqlQuery( TQSqlDatabase* db ); + explicit TQSqlQuery( TQSqlDatabase* db ); TQSqlQuery( const TQSqlQuery& other ); TQSqlQuery& operator=( const TQSqlQuery& other ); virtual ~TQSqlQuery(); diff --git a/src/tools/tqglobal.h b/src/tools/tqglobal.h index 4060ebe52..15c700058 100644 --- a/src/tools/tqglobal.h +++ b/src/tools/tqglobal.h @@ -207,10 +207,6 @@ /* Symantec C++ is now Digital Mars */ #if defined(__DMC__) || defined(__SC__) # define Q_CC_SYM -/* "explicit" semantics implemented in 8.1e but keyword recognized since 7.5 */ -# if defined(__SC__) && __SC__ < 0x750 -# define Q_NO_EXPLICIT_KEYWORD -# endif # define Q_NO_USING_KEYWORD # if !defined(_CPPUNWIND) # define Q_NO_EXCEPTIONS @@ -218,7 +214,6 @@ #elif defined(applec) # define Q_CC_MPW -# define Q_NO_EXPLICIT_KEYWORD # define Q_NO_USING_KEYWORD #elif defined(_MSC_VER) @@ -317,7 +312,6 @@ # define Q_CC_XLC # define TQ_FULL_TEMPLATE_INSTANTIATION # if __xlC__ < 0x400 -# define Q_NO_EXPLICIT_KEYWORD # define Q_NO_USING_KEYWORD # define TQ_TYPENAME # define TQ_INLINE_TEMPLATES inline @@ -384,7 +378,6 @@ # define Q_CC_MIPS # if defined(_MIPS_SIM) && (_MIPS_SIM == _ABIO32) /* o32 ABI */ # define TQ_TYPENAME -# define Q_NO_EXPLICIT_KEYWORD # define TQ_INLINE_TEMPLATES inline # elif defined(_COMPILER_VERSION) && (_COMPILER_VERSION < 730) /* 7.2 */ # define TQ_TYPENAME @@ -399,7 +392,6 @@ #elif defined(__USLC__) # define Q_CC_USLC # define TQ_TYPENAME -# define Q_NO_EXPLICIT_KEYWORD # define Q_NO_USING_KEYWORD # define TQ_INLINE_TEMPLATES inline @@ -416,7 +408,6 @@ # define Q_C_CALLBACKS /* 4.2 compiler or older */ # else -# define Q_NO_EXPLICIT_KEYWORD # define Q_NO_USING_KEYWORD # endif @@ -427,7 +418,6 @@ # else # define Q_CC_HP # define TQ_FULL_TEMPLATE_INSTANTIATION -# define Q_NO_EXPLICIT_KEYWORD # endif # define Q_NO_USING_KEYWORD /* ### check "using" status */ @@ -511,17 +501,6 @@ typedef uchar *puchar; typedef const char *pcchar; -// -// Use the "explicit" keyword on platforms that support it. -// - -#if !defined(Q_NO_EXPLICIT_KEYWORD) -# define Q_EXPLICIT explicit -#else -# define Q_EXPLICIT -#endif - - // // Utility macros and inline functions // diff --git a/src/tools/tqmemarray.h b/src/tools/tqmemarray.h index 39898a47a..2f7aab38c 100644 --- a/src/tools/tqmemarray.h +++ b/src/tools/tqmemarray.h @@ -59,7 +59,7 @@ protected: public: TQMemArray() {} - TQMemArray( int size ) : TQGArray(size*sizeof(type)) {} // ### 4.0 Q_EXPLICIT + TQMemArray( int size ) : TQGArray(size*sizeof(type)) {} // ### 4.0 explicit TQMemArray( const TQMemArray &a ) : TQGArray(a) {} ~TQMemArray() {} TQMemArray &operator=(const TQMemArray &a) diff --git a/src/tools/tqtl.h b/src/tools/tqtl.h index c70f198f2..63da09080 100644 --- a/src/tools/tqtl.h +++ b/src/tools/tqtl.h @@ -285,7 +285,7 @@ template class TQBackInsertIterator { public: - Q_EXPLICIT TQBackInsertIterator( Container &c ) + explicit TQBackInsertIterator( Container &c ) : container( &c ) { } diff --git a/src/xml/tqdom.h b/src/xml/tqdom.h index 865da3ad3..16fd11c1a 100644 --- a/src/xml/tqdom.h +++ b/src/xml/tqdom.h @@ -290,8 +290,8 @@ class TQM_EXPORT_DOM TQDomDocument : public TQDomNode { public: TQDomDocument(); - Q_EXPLICIT TQDomDocument( const TQString& name ); - Q_EXPLICIT TQDomDocument( const TQDomDocumentType& doctype ); + explicit TQDomDocument( const TQString& name ); + explicit TQDomDocument( const TQDomDocumentType& doctype ); TQDomDocument( const TQDomDocument& x ); TQDomDocument& operator= ( const TQDomDocument& ); ~TQDomDocument(); -- cgit v1.2.3