From 45d592deb685e106e20933502bbecda04ab73d75 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 1 Jan 2026 19:03:47 +0900 Subject: Remove usage of TQ_FULL_TEMPLATE_INSTANTIATION and TQ_DUMMY_COMPARISON_OPERATOR. The #defines were used for some very old compilers which had issues with template instantiation. We are now using c++17 compilers, so this is unnecessary. Signed-off-by: Michele Calgaro --- doc/html/canvas-chart-example.html | 8 -------- doc/html/chart-element-h.html | 8 -------- doc/html/tqdns-h.html | 2 -- doc/html/tqglobal-h.html | 28 +--------------------------- doc/html/tqiconset-h.html | 4 ---- doc/html/tqmap-h.html | 7 ------- doc/html/tqpixmap-h.html | 4 ---- doc/html/tqtl-tqvaluelist-example.html | 3 --- doc/html/tqwidgetfactory-h.html | 2 -- examples/chart/element.h | 8 -------- examples/demo/dnd/dnd.h | 2 -- examples/tqtl/tqvaluelistiterator.cpp | 3 --- src/kernel/tqiconset.cpp | 2 -- src/kernel/tqiconset.h | 4 ---- src/kernel/tqpixmap.h | 4 ---- src/kernel/tqrichtext.cpp | 3 --- src/kernel/tqrichtext_p.h | 2 -- src/kernel/tqtranslator.cpp | 1 - src/network/tqdns.h | 2 -- src/sql/tqsqlextension_p.h | 1 - src/sql/tqsqlrecord.cpp | 1 - src/tools/tqglobal.h | 28 +--------------------------- src/tools/tqmap.h | 7 ------- src/widgets/tqdatetimeedit.cpp | 1 - src/widgets/tqdockarea.cpp | 2 -- src/xml/tqsvgdevice.cpp | 3 --- src/xml/tqxml.cpp | 3 --- tools/assistant/docuparser.h | 1 - tools/assistant/helpdialogimpl.cpp | 1 - tools/designer/designer/command.h | 4 ---- tools/designer/designer/editfunctionsimpl.h | 2 -- tools/designer/designer/formwindow.h | 5 ----- tools/designer/designer/hierarchyview.h | 2 -- tools/designer/designer/layout.h | 1 - tools/designer/designer/listvieweditorimpl.h | 1 - tools/designer/designer/mainwindow.h | 6 ------ tools/designer/designer/pixmapcollection.h | 1 - tools/designer/editor/conf.h | 2 -- tools/designer/editor/parenmatcher.h | 2 -- tools/designer/plugins/cppeditor/yyreg.h | 4 ---- tools/designer/plugins/dlg/dlg2ui.h | 6 ------ tools/designer/tquic/tquic.h | 1 - tools/designer/uilib/tqwidgetfactory.h | 2 -- 43 files changed, 2 insertions(+), 182 deletions(-) diff --git a/doc/html/canvas-chart-example.html b/doc/html/canvas-chart-example.html index 85780a420..f6ed19806 100644 --- a/doc/html/canvas-chart-example.html +++ b/doc/html/canvas-chart-example.html @@ -122,14 +122,6 @@ public: void setProX( int index, double value ); void setProY( int index, double value ); -#ifdef TQ_FULL_TEMPLATE_INSTANTIATION - // xlC 3.x workaround - TQ_DUMMY_COMPARISON_OPERATOR(Element) - bool operator!=( const Element& e) const { - return ( !(e == *this) ); - } -#endif - private: void init( double value, TQColor valueColor, int valuePattern, const TQString& label, TQColor labelColor ); diff --git a/doc/html/chart-element-h.html b/doc/html/chart-element-h.html index fdd0b383b..c60dbe723 100644 --- a/doc/html/chart-element-h.html +++ b/doc/html/chart-element-h.html @@ -90,14 +90,6 @@ public: void setProX( int index, double value ); void setProY( int index, double value ); -#ifdef TQ_FULL_TEMPLATE_INSTANTIATION - // xlC 3.x workaround - TQ_DUMMY_COMPARISON_OPERATOR(Element) - bool operator!=( const Element& e) const { - return ( !(e == *this) ); - } -#endif - private: void init( double value, TQColor valueColor, int valuePattern, const TQString& label, TQColor labelColor ); diff --git a/doc/html/tqdns-h.html b/doc/html/tqdns-h.html index 704355867..e41495e4f 100644 --- a/doc/html/tqdns-h.html +++ b/doc/html/tqdns-h.html @@ -132,7 +132,6 @@ public: :name(n), priority(p) {} TQString name; TQ_UINT16 priority; - TQ_DUMMY_COMPARISON_OPERATOR(MailServer) }; TQValueList<MailServer> mailServers() const; @@ -144,7 +143,6 @@ public: TQ_UINT16 priority; TQ_UINT16 weight; TQ_UINT16 port; - TQ_DUMMY_COMPARISON_OPERATOR(Server) }; TQValueList<Server> servers() const; diff --git a/doc/html/tqglobal-h.html b/doc/html/tqglobal-h.html index 42a7d8d7b..c022f9632 100644 --- a/doc/html/tqglobal-h.html +++ b/doc/html/tqglobal-h.html @@ -276,11 +276,6 @@ body { background: #ffffff; color: black; } # define mutable /* no template classes in TQVariant */ # define TQT_NO_TEMPLATE_VARIANT -/* Wcc does not fill in functions needed by valuelists, maps, and - valuestacks implicitly */ -# define TQ_FULL_TEMPLATE_INSTANTIATION -/* can we just compare the structures? */ -# define TQ_FULL_TEMPLATE_INSTANTIATION_MEMCMP /* these are not useful to our customers */ # define TQT_NO_SQL # endif @@ -288,9 +283,6 @@ body { background: #ffffff; color: black; } #elif defined(__GNUC__) # define Q_CC_GNU # define Q_C_CALLBACKS -# if __GNUC__ == 2 && __GNUC_MINOR__ <= 7 -# define TQ_FULL_TEMPLATE_INSTANTIATION -# endif /* GCC 2.95 knows "using" but does not support it correctly */ # if __GNUC__ == 2 && __GNUC_MINOR__ <= 95 # define Q_NO_USING_KEYWORD @@ -339,7 +331,6 @@ body { background: #ffffff; color: black; } but it is not defined on older compilers like C Set 3.1 */ #elif defined(__xlC__) # define Q_CC_XLC -# define TQ_FULL_TEMPLATE_INSTANTIATION # if __xlC__ < 0x400 # define Q_NO_USING_KEYWORD # define TQ_TYPENAME @@ -438,7 +429,6 @@ body { background: #ffffff; color: black; } # define Q_CC_HPACC # else # define Q_CC_HP -# define TQ_FULL_TEMPLATE_INSTANTIATION # endif # define Q_NO_USING_KEYWORD /* ### check "using" status */ @@ -860,23 +850,7 @@ TQ_EXPORT const char *tqInstallPathSysconf(); #endif /* __cplusplus */ -/* - compilers which follow outdated template instantiation rules - require a class to have a comparison operator to exist when - a TQValueList of this type is instantiated. It's not actually - used in the list, though. Hence the dummy implementation. - Just in case other code relies on it we better trigger a warning - mandating a real implementation. -*/ -#ifdef TQ_FULL_TEMPLATE_INSTANTIATION -# define TQ_DUMMY_COMPARISON_OPERATOR(C) \ - bool operator==( const C& ) const { \ - tqWarning( #C"::operator==( const "#C"& ) got called." ); \ - return false; \ - } -#else -# define TQ_DUMMY_COMPARISON_OPERATOR(C) -#endif +#define TQ_DUMMY_COMPARISON_OPERATOR(C) #endif /* TQGLOBAL_H */ diff --git a/doc/html/tqiconset-h.html b/doc/html/tqiconset-h.html index 4dae2f354..a2a4d4cd8 100644 --- a/doc/html/tqiconset-h.html +++ b/doc/html/tqiconset-h.html @@ -124,10 +124,6 @@ public: static void setIconSize( Size which, const TQSize& size ); static const TQSize& iconSize( Size which ); -#ifndef Q_QDOC - TQ_DUMMY_COMPARISON_OPERATOR(TQIconSet) -#endif - private: void normalize( Size& which, const TQSize& pixSize ); TQPixmap *createScaled( Size size, const TQPixmap *suppliedPix ) const; diff --git a/doc/html/tqmap-h.html b/doc/html/tqmap-h.html index 21405dfa0..b75d6ea55 100644 --- a/doc/html/tqmap-h.html +++ b/doc/html/tqmap-h.html @@ -763,13 +763,6 @@ public: void remove( iterator it ) { detach(); sh->remove( it ); } void remove( const Key& k ); -#if defined(TQ_FULL_TEMPLATE_INSTANTIATION) - bool operator==( const TQMap<Key,T>& ) const { return false; } -#ifndef TQT_NO_STL - bool operator==( const std::map<Key,T>& ) const { return false; } -#endif -#endif - protected: /** * Helpers diff --git a/doc/html/tqpixmap-h.html b/doc/html/tqpixmap-h.html index b6f8fca80..8a8d6748d 100644 --- a/doc/html/tqpixmap-h.html +++ b/doc/html/tqpixmap-h.html @@ -203,10 +203,6 @@ public: void x11SetScreen( int screen ); #endif -#ifndef Q_QDOC - TQ_DUMMY_COMPARISON_OPERATOR(TQPixmap) -#endif - protected: TQPixmap( int w, int h, const uchar *data, bool isXbitmap ); int metric( int ) const; diff --git a/doc/html/tqtl-tqvaluelist-example.html b/doc/html/tqtl-tqvaluelist-example.html index 9600b07fe..33a6cfb89 100644 --- a/doc/html/tqtl-tqvaluelist-example.html +++ b/doc/html/tqtl-tqvaluelist-example.html @@ -63,9 +63,6 @@ public: int salary() const { return s; } void setSalary( int salary ) { s = salary; } - // this is here to support very old compilers - TQ_DUMMY_COMPARISON_OPERATOR( Employee ) - private: TQString n; int s; diff --git a/doc/html/tqwidgetfactory-h.html b/doc/html/tqwidgetfactory-h.html index 8c35945d3..2e1126ff5 100644 --- a/doc/html/tqwidgetfactory-h.html +++ b/doc/html/tqwidgetfactory-h.html @@ -186,7 +186,6 @@ private: TQString name; TQPixmap pix; TQString field; - TQ_DUMMY_COMPARISON_OPERATOR( Field ) }; struct SqlWidgetConnection @@ -197,7 +196,6 @@ private: TQString conn; TQString table; TQMap<TQString, TQString> *dbControls; - TQ_DUMMY_COMPARISON_OPERATOR( SqlWidgetConnection ) }; TQValueList<Image> images; diff --git a/examples/chart/element.h b/examples/chart/element.h index 4241a7fee..88a278aa0 100644 --- a/examples/chart/element.h +++ b/examples/chart/element.h @@ -57,14 +57,6 @@ public: void setProX( int index, double value ); void setProY( int index, double value ); -#ifdef TQ_FULL_TEMPLATE_INSTANTIATION - // xlC 3.x workaround - TQ_DUMMY_COMPARISON_OPERATOR(Element) - bool operator!=( const Element& e) const { - return ( !(e == *this) ); - } -#endif - private: void init( double value, TQColor valueColor, int valuePattern, const TQString& label, TQColor labelColor ); diff --git a/examples/demo/dnd/dnd.h b/examples/demo/dnd/dnd.h index b064b9c8f..96a86debc 100644 --- a/examples/demo/dnd/dnd.h +++ b/examples/demo/dnd/dnd.h @@ -13,8 +13,6 @@ public: TQString name() { return _name; } TQPixmap *pixmap() { return &_pixmap; } - TQ_DUMMY_COMPARISON_OPERATOR( IconItem ) - protected: TQPixmap loadPixmap( const TQString& name ); diff --git a/examples/tqtl/tqvaluelistiterator.cpp b/examples/tqtl/tqvaluelistiterator.cpp index cfb87c31d..49f233934 100644 --- a/examples/tqtl/tqvaluelistiterator.cpp +++ b/examples/tqtl/tqvaluelistiterator.cpp @@ -25,9 +25,6 @@ public: int salary() const { return s; } void setSalary( int salary ) { s = salary; } - // this is here to support very old compilers - TQ_DUMMY_COMPARISON_OPERATOR( Employee ) - private: TQString n; int s; diff --git a/src/kernel/tqiconset.cpp b/src/kernel/tqiconset.cpp index d22116207..71b71ffee 100644 --- a/src/kernel/tqiconset.cpp +++ b/src/kernel/tqiconset.cpp @@ -156,8 +156,6 @@ public: delete factory; factory = newFactory; } - - TQ_DUMMY_COMPARISON_OPERATOR( TQIconSetPrivate ) }; TQIconSetIcon *TQIconSetPrivate::icon( const TQIconSet *iconSet, diff --git a/src/kernel/tqiconset.h b/src/kernel/tqiconset.h index 7caa24b74..798c4bbe5 100644 --- a/src/kernel/tqiconset.h +++ b/src/kernel/tqiconset.h @@ -89,10 +89,6 @@ public: static void setIconSize( Size which, const TQSize& size ); static const TQSize& iconSize( Size which ); -#ifndef Q_QDOC - TQ_DUMMY_COMPARISON_OPERATOR(TQIconSet) -#endif - private: void normalize( Size& which, const TQSize& pixSize ); TQPixmap *createScaled( Size size, const TQPixmap *suppliedPix ) const; diff --git a/src/kernel/tqpixmap.h b/src/kernel/tqpixmap.h index 0a89e98bf..4af4a451b 100644 --- a/src/kernel/tqpixmap.h +++ b/src/kernel/tqpixmap.h @@ -168,10 +168,6 @@ public: void x11SetScreen( int screen ); #endif -#ifndef Q_QDOC - TQ_DUMMY_COMPARISON_OPERATOR(TQPixmap) -#endif - protected: TQPixmap( int w, int h, const uchar *data, bool isXbitmap ); int metric( int ) const; diff --git a/src/kernel/tqrichtext.cpp b/src/kernel/tqrichtext.cpp index eddb23761..a4a80e0dd 100644 --- a/src/kernel/tqrichtext.cpp +++ b/src/kernel/tqrichtext.cpp @@ -1567,8 +1567,6 @@ struct TQ_EXPORT TQTextDocumentTag { liststyle = t.liststyle; return *this; } - - TQ_DUMMY_COMPARISON_OPERATOR(TQTextDocumentTag) }; @@ -6584,7 +6582,6 @@ struct TQPixmapInt TQPixmapInt() : ref( 0 ) {} TQPixmap pm; int ref; - TQ_DUMMY_COMPARISON_OPERATOR(TQPixmapInt) }; static TQMap *pixmap_map = 0; diff --git a/src/kernel/tqrichtext_p.h b/src/kernel/tqrichtext_p.h index 2d75c779b..d2219b562 100644 --- a/src/kernel/tqrichtext_p.h +++ b/src/kernel/tqrichtext_p.h @@ -760,7 +760,6 @@ struct TQ_EXPORT TQTextDocumentSelection { TQTextCursor startCursor, endCursor; bool swapped; - TQ_DUMMY_COMPARISON_OPERATOR(TQTextDocumentSelection) }; #if defined(Q_TEMPLATEDLL) @@ -1128,7 +1127,6 @@ struct TQ_EXPORT TQTextParagraphSelection { TQTextParagraphSelection() : start(0), end(0) { } int start, end; - TQ_DUMMY_COMPARISON_OPERATOR(TQTextParagraphSelection) }; struct TQ_EXPORT TQTextLineStart diff --git a/src/kernel/tqtranslator.cpp b/src/kernel/tqtranslator.cpp index 59444c327..2d22dfff1 100644 --- a/src/kernel/tqtranslator.cpp +++ b/src/kernel/tqtranslator.cpp @@ -182,7 +182,6 @@ public: bool operator<( const Offset&k ) const { return ( h != k.h ) ? h < k.h : o < k.o; } - TQ_DUMMY_COMPARISON_OPERATOR(TQTranslatorPrivate::Offset) uint h; uint o; }; diff --git a/src/network/tqdns.h b/src/network/tqdns.h index 703edb229..65058c4f3 100644 --- a/src/network/tqdns.h +++ b/src/network/tqdns.h @@ -97,7 +97,6 @@ public: :name(n), priority(p) {} TQString name; TQ_UINT16 priority; - TQ_DUMMY_COMPARISON_OPERATOR(MailServer) }; TQValueList mailServers() const; @@ -109,7 +108,6 @@ public: TQ_UINT16 priority; TQ_UINT16 weight; TQ_UINT16 port; - TQ_DUMMY_COMPARISON_OPERATOR(Server) }; TQValueList servers() const; diff --git a/src/sql/tqsqlextension_p.h b/src/sql/tqsqlextension_p.h index 76cb27337..2723b0d4b 100644 --- a/src/sql/tqsqlextension_p.h +++ b/src/sql/tqsqlextension_p.h @@ -75,7 +75,6 @@ struct TQSqlParam { TQSqlParam( const TQVariant& v = TQVariant(), TQSql::ParameterType t = TQSql::In ): value( v ), typ( t ) {} TQVariant value; TQSql::ParameterType typ; - TQ_DUMMY_COMPARISON_OPERATOR(TQSqlParam) }; struct Holder { diff --git a/src/sql/tqsqlrecord.cpp b/src/sql/tqsqlrecord.cpp index 72b8e4867..ad8773a9d 100644 --- a/src/sql/tqsqlrecord.cpp +++ b/src/sql/tqsqlrecord.cpp @@ -68,7 +68,6 @@ public: { return !field.name().isNull(); } - TQ_DUMMY_COMPARISON_OPERATOR(info) TQSqlField field; bool nogen; }; diff --git a/src/tools/tqglobal.h b/src/tools/tqglobal.h index f21e0324c..d1e0064b4 100644 --- a/src/tools/tqglobal.h +++ b/src/tools/tqglobal.h @@ -243,11 +243,6 @@ # define mutable /* no template classes in TQVariant */ # define TQT_NO_TEMPLATE_VARIANT -/* Wcc does not fill in functions needed by valuelists, maps, and - valuestacks implicitly */ -# define TQ_FULL_TEMPLATE_INSTANTIATION -/* can we just compare the structures? */ -# define TQ_FULL_TEMPLATE_INSTANTIATION_MEMCMP /* these are not useful to our customers */ # define TQT_NO_SQL # endif @@ -255,9 +250,6 @@ #elif defined(__GNUC__) # define Q_CC_GNU # define Q_C_CALLBACKS -# if __GNUC__ == 2 && __GNUC_MINOR__ <= 7 -# define TQ_FULL_TEMPLATE_INSTANTIATION -# endif /* GCC 2.95 knows "using" but does not support it correctly */ # if __GNUC__ == 2 && __GNUC_MINOR__ <= 95 # define Q_NO_USING_KEYWORD @@ -306,7 +298,6 @@ but it is not defined on older compilers like C Set 3.1 */ #elif defined(__xlC__) # define Q_CC_XLC -# define TQ_FULL_TEMPLATE_INSTANTIATION # if __xlC__ < 0x400 # define Q_NO_USING_KEYWORD # define TQ_TYPENAME @@ -405,7 +396,6 @@ # define Q_CC_HPACC # else # define Q_CC_HP -# define TQ_FULL_TEMPLATE_INSTANTIATION # endif # define Q_NO_USING_KEYWORD /* ### check "using" status */ @@ -842,23 +832,7 @@ TQ_EXPORT const char *tqInstallPathShare(); #endif /* __cplusplus */ -/* - compilers which follow outdated template instantiation rules - require a class to have a comparison operator to exist when - a TQValueList of this type is instantiated. It's not actually - used in the list, though. Hence the dummy implementation. - Just in case other code relies on it we better trigger a warning - mandating a real implementation. -*/ -#ifdef TQ_FULL_TEMPLATE_INSTANTIATION -# define TQ_DUMMY_COMPARISON_OPERATOR(C) \ - bool operator==( const C& ) const { \ - tqWarning( #C"::operator==( const "#C"& ) got called." ); \ - return false; \ - } -#else -# define TQ_DUMMY_COMPARISON_OPERATOR(C) -#endif +#define TQ_DUMMY_COMPARISON_OPERATOR(C) #endif /* TQGLOBAL_H */ diff --git a/src/tools/tqmap.h b/src/tools/tqmap.h index 5f594c068..9b1888856 100644 --- a/src/tools/tqmap.h +++ b/src/tools/tqmap.h @@ -733,13 +733,6 @@ public: void remove( iterator it ) { detach(); sh->remove( it ); } void remove( const Key& k ); -#if defined(TQ_FULL_TEMPLATE_INSTANTIATION) - bool operator==( const TQMap& ) const { return false; } -#ifndef TQT_NO_STL - bool operator==( const std::map& ) const { return false; } -#endif -#endif - protected: /** * Helpers diff --git a/src/widgets/tqdatetimeedit.cpp b/src/widgets/tqdatetimeedit.cpp index 2531dd732..4159f66e8 100644 --- a/src/widgets/tqdatetimeedit.cpp +++ b/src/widgets/tqdatetimeedit.cpp @@ -70,7 +70,6 @@ public: int width() const { return selend - selstart; } int index() const { return act; } bool separator() const { return sep; } - TQ_DUMMY_COMPARISON_OPERATOR( TQNumberSection ) private: int selstart :12; int selend :12; diff --git a/src/widgets/tqdockarea.cpp b/src/widgets/tqdockarea.cpp index 83b202971..9a2e429cc 100644 --- a/src/widgets/tqdockarea.cpp +++ b/src/widgets/tqdockarea.cpp @@ -58,8 +58,6 @@ struct TQ_EXPORT DockData DockData( TQDockWindow *dw, const TQRect &r ) : w( dw ), rect( r ) {} TQDockWindow *w; TQRect rect; - - TQ_DUMMY_COMPARISON_OPERATOR( DockData ) }; static int fix_x( TQDockWindow* w, int width = -1 ) { diff --git a/src/xml/tqsvgdevice.cpp b/src/xml/tqsvgdevice.cpp index 51c48179c..3aec30c7a 100644 --- a/src/xml/tqsvgdevice.cpp +++ b/src/xml/tqsvgdevice.cpp @@ -60,19 +60,16 @@ const char systemId[] = "http://www.w3.org/TR/2000/CR-SVG-20001102/DTD/svg-20001 struct TQM_EXPORT_SVG ImgElement { TQDomElement element; TQImage image; - TQ_DUMMY_COMPARISON_OPERATOR( ImgElement ) }; struct TQM_EXPORT_SVG PixElement { TQDomElement element; TQPixmap pixmap; - TQ_DUMMY_COMPARISON_OPERATOR( PixElement ) }; struct TQSvgDeviceState { int textx, texty; // current text position int textalign; // text alignment - TQ_DUMMY_COMPARISON_OPERATOR( TQSvgDeviceState ) }; typedef TQValueList ImageList; diff --git a/src/xml/tqxml.cpp b/src/xml/tqxml.cpp index 591890976..eab061cb0 100644 --- a/src/xml/tqxml.cpp +++ b/src/xml/tqxml.cpp @@ -2248,8 +2248,6 @@ private: : publicId(p), systemId(s) {} TQString publicId; TQString systemId; - - TQ_DUMMY_COMPARISON_OPERATOR(ExternParameterEntity) }; struct ExternEntity { @@ -2259,7 +2257,6 @@ private: TQString publicId; TQString systemId; TQString notation; - TQ_DUMMY_COMPARISON_OPERATOR(ExternEntity) }; TQMap externParameterEntities; TQMap parameterEntities; diff --git a/tools/assistant/docuparser.h b/tools/assistant/docuparser.h index f09b913d7..f2a7c14b8 100644 --- a/tools/assistant/docuparser.h +++ b/tools/assistant/docuparser.h @@ -48,7 +48,6 @@ struct ContentItem { TQString title; TQString reference; int depth; - TQ_DUMMY_COMPARISON_OPERATOR(ContentItem) }; TQDataStream &operator>>( TQDataStream &s, ContentItem &ci ); diff --git a/tools/assistant/helpdialogimpl.cpp b/tools/assistant/helpdialogimpl.cpp index 91b0fe9b8..4824c5d92 100644 --- a/tools/assistant/helpdialogimpl.cpp +++ b/tools/assistant/helpdialogimpl.cpp @@ -100,7 +100,6 @@ struct IndexKeyword { bool operator>( const IndexKeyword &ik ) const { return keyword.lower() > ik.keyword.lower(); } - TQ_DUMMY_COMPARISON_OPERATOR( IndexKeyword ) TQString keyword; TQString link; }; diff --git a/tools/designer/designer/command.h b/tools/designer/designer/command.h index c27409311..6efc49492 100644 --- a/tools/designer/designer/command.h +++ b/tools/designer/designer/command.h @@ -781,7 +781,6 @@ public: { TQString text; TQPixmap pix; - TQ_DUMMY_COMPARISON_OPERATOR( Item ) }; PopulateListBoxCommand( const TQString &n, FormWindow *fw, @@ -805,7 +804,6 @@ public: { TQString text; TQPixmap pix; - TQ_DUMMY_COMPARISON_OPERATOR( Item ) }; PopulateIconViewCommand( const TQString &n, FormWindow *fw, @@ -863,7 +861,6 @@ public: { TQString text; TQPixmap pix; - TQ_DUMMY_COMPARISON_OPERATOR( Row ) }; struct Column @@ -871,7 +868,6 @@ public: TQString text; TQPixmap pix; TQString field; - TQ_DUMMY_COMPARISON_OPERATOR( Column ) }; PopulateTableCommand( const TQString &n, FormWindow *fw, TQTable *t, diff --git a/tools/designer/designer/editfunctionsimpl.h b/tools/designer/designer/editfunctionsimpl.h index 14e0a208e..6e05f5000 100644 --- a/tools/designer/designer/editfunctionsimpl.h +++ b/tools/designer/designer/editfunctionsimpl.h @@ -83,8 +83,6 @@ private: TQString oldAccess; TQString type; TQString oldType; - - TQ_DUMMY_COMPARISON_OPERATOR( FunctItem ) }; void changeItem( TQListViewItem *item, Attribute a, const TQString &nV ); diff --git a/tools/designer/designer/formwindow.h b/tools/designer/designer/formwindow.h index 425c7aace..7345023e0 100644 --- a/tools/designer/designer/formwindow.h +++ b/tools/designer/designer/formwindow.h @@ -62,12 +62,7 @@ class TQSizeGrip; class Project; struct DesignerFormWindow; class FormFile; - -#if defined(Q_CC_MSVC) || defined(TQ_FULL_TEMPLATE_INSTANTIATION) -#include "orderindicator.h" -#else class OrderIndicator; -#endif class FormWindow : public TQWidget { diff --git a/tools/designer/designer/hierarchyview.h b/tools/designer/designer/hierarchyview.h index 186f7f73b..6f4daaa65 100644 --- a/tools/designer/designer/hierarchyview.h +++ b/tools/designer/designer/hierarchyview.h @@ -235,8 +235,6 @@ private: ~ClassBrowser(); TQListView *lv; TQInterfacePtr iface; - - TQ_DUMMY_COMPARISON_OPERATOR( ClassBrowser ) }; FormWindow *formwindow; HierarchyList *listview; diff --git a/tools/designer/designer/layout.h b/tools/designer/designer/layout.h index 3f5c7dcbe..e63d721b4 100644 --- a/tools/designer/designer/layout.h +++ b/tools/designer/designer/layout.h @@ -185,7 +185,6 @@ public: int column; int rowspan; int colspan; - TQ_DUMMY_COMPARISON_OPERATOR( Item ) }; TQMap items; diff --git a/tools/designer/designer/listvieweditorimpl.h b/tools/designer/designer/listvieweditorimpl.h index cab52d646..2ea4860a6 100644 --- a/tools/designer/designer/listvieweditorimpl.h +++ b/tools/designer/designer/listvieweditorimpl.h @@ -87,7 +87,6 @@ private: TQString text; TQPixmap pixmap; bool clickable, resizable; - TQ_DUMMY_COMPARISON_OPERATOR( Column ) }; private: diff --git a/tools/designer/designer/mainwindow.h b/tools/designer/designer/mainwindow.h index a6ebaae22..286108266 100644 --- a/tools/designer/designer/mainwindow.h +++ b/tools/designer/designer/mainwindow.h @@ -73,12 +73,7 @@ class GotoLineDialog; class SourceFile; class FormFile; class TQAssistantClient; - -#if defined(TQ_FULL_TEMPLATE_INSTANTIATION) -#include -#else class TQToolBar; -#endif class Preferences; class MainWindow : public TQMainWindow @@ -373,7 +368,6 @@ private: TQString title; TQObject *receiver; const char *init_slot, *accept_slot; - TQ_DUMMY_COMPARISON_OPERATOR( Tab ) }; private: diff --git a/tools/designer/designer/pixmapcollection.h b/tools/designer/designer/pixmapcollection.h index 69f3f51a2..c169a32fc 100644 --- a/tools/designer/designer/pixmapcollection.h +++ b/tools/designer/designer/pixmapcollection.h @@ -50,7 +50,6 @@ public: TQPixmap pix; TQString name; TQString absname; - TQ_DUMMY_COMPARISON_OPERATOR( Pixmap ) }; PixmapCollection( Project *pro ); diff --git a/tools/designer/editor/conf.h b/tools/designer/editor/conf.h index 7869a7f46..bc6a4ecfa 100644 --- a/tools/designer/editor/conf.h +++ b/tools/designer/editor/conf.h @@ -42,8 +42,6 @@ struct ConfigStyle { TQFont font; TQColor color; - - TQ_DUMMY_COMPARISON_OPERATOR( ConfigStyle ) }; struct Config diff --git a/tools/designer/editor/parenmatcher.h b/tools/designer/editor/parenmatcher.h index 2aa843bf9..cc93f5afa 100644 --- a/tools/designer/editor/parenmatcher.h +++ b/tools/designer/editor/parenmatcher.h @@ -47,8 +47,6 @@ struct Paren Type type; TQChar chr; int pos; - - TQ_DUMMY_COMPARISON_OPERATOR( Paren ) }; typedef TQValueList ParenList; diff --git a/tools/designer/plugins/cppeditor/yyreg.h b/tools/designer/plugins/cppeditor/yyreg.h index 205d85ab6..580099220 100644 --- a/tools/designer/plugins/cppeditor/yyreg.h +++ b/tools/designer/plugins/cppeditor/yyreg.h @@ -66,10 +66,6 @@ public: int openingBraceLineNum() const { return lineno1; } int closingBraceLineNum() const { return lineno2; } -#if defined(TQ_FULL_TEMPLATE_INSTANTIATION) - bool operator==( const CppFunction& ) const { return false; } -#endif - private: TQString ret; TQString nam; diff --git a/tools/designer/plugins/dlg/dlg2ui.h b/tools/designer/plugins/dlg/dlg2ui.h index c7245c3c2..cd43081e7 100644 --- a/tools/designer/plugins/dlg/dlg2ui.h +++ b/tools/designer/plugins/dlg/dlg2ui.h @@ -47,12 +47,6 @@ struct DlgConnection TQString sender; TQString signal; TQString slot; - -#if defined(TQ_FULL_TEMPLATE_INSTANTIATION) - bool operator==( const DlgConnection& ) const { - return sender == sender && signal == signal && slot == slot; - } -#endif }; class Dlg2Ui diff --git a/tools/designer/tquic/tquic.h b/tools/designer/tquic/tquic.h index 72af22654..18e44c26e 100644 --- a/tools/designer/tquic/tquic.h +++ b/tools/designer/tquic/tquic.h @@ -128,7 +128,6 @@ private: { TQString header; TQString location; - TQ_DUMMY_COMPARISON_OPERATOR(CustomInclude) }; TQValueList buddies; diff --git a/tools/designer/uilib/tqwidgetfactory.h b/tools/designer/uilib/tqwidgetfactory.h index 8bc9762a7..25a514024 100644 --- a/tools/designer/uilib/tqwidgetfactory.h +++ b/tools/designer/uilib/tqwidgetfactory.h @@ -152,7 +152,6 @@ private: TQString name; TQPixmap pix; TQString field; - TQ_DUMMY_COMPARISON_OPERATOR( Field ) }; struct SqlWidgetConnection @@ -163,7 +162,6 @@ private: TQString conn; TQString table; TQMap *dbControls; - TQ_DUMMY_COMPARISON_OPERATOR( SqlWidgetConnection ) }; TQValueList images; -- cgit v1.2.3