From 98195ec8218519737d5f6e88ee9598d71fcbf8fa Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Tue, 30 Dec 2025 22:58:02 +0900 Subject: Remove use 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 --- kdevdesigner/designer/command.h | 4 ---- kdevdesigner/designer/editfunctionsimpl.h | 2 -- kdevdesigner/designer/formwindow.h | 5 ----- kdevdesigner/designer/hierarchyview.h | 2 -- kdevdesigner/designer/layout.h | 1 - kdevdesigner/designer/listvieweditorimpl.h | 1 - kdevdesigner/designer/mainwindow.h | 6 ------ kdevdesigner/designer/pixmapcollection.h | 1 - kdevdesigner/uilib/qwidgetfactory.h | 2 -- lib/cppparser/driver.cpp | 1 - 10 files changed, 25 deletions(-) diff --git a/kdevdesigner/designer/command.h b/kdevdesigner/designer/command.h index eb34952d..6eb21b5f 100644 --- a/kdevdesigner/designer/command.h +++ b/kdevdesigner/designer/command.h @@ -775,7 +775,6 @@ public: { TQString text; TQPixmap pix; - TQ_DUMMY_COMPARISON_OPERATOR( Item ) }; PopulateListBoxCommand( const TQString &n, FormWindow *fw, @@ -799,7 +798,6 @@ public: { TQString text; TQPixmap pix; - TQ_DUMMY_COMPARISON_OPERATOR( Item ) }; PopulateIconViewCommand( const TQString &n, FormWindow *fw, @@ -857,7 +855,6 @@ public: { TQString text; TQPixmap pix; - TQ_DUMMY_COMPARISON_OPERATOR( Row ) }; struct Column @@ -865,7 +862,6 @@ public: TQString text; TQPixmap pix; TQString field; - TQ_DUMMY_COMPARISON_OPERATOR( Column ) }; PopulateTableCommand( const TQString &n, FormWindow *fw, TQTable *t, diff --git a/kdevdesigner/designer/editfunctionsimpl.h b/kdevdesigner/designer/editfunctionsimpl.h index a0c8fc66..2055958e 100644 --- a/kdevdesigner/designer/editfunctionsimpl.h +++ b/kdevdesigner/designer/editfunctionsimpl.h @@ -77,8 +77,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/kdevdesigner/designer/formwindow.h b/kdevdesigner/designer/formwindow.h index 52546f79..ce022828 100644 --- a/kdevdesigner/designer/formwindow.h +++ b/kdevdesigner/designer/formwindow.h @@ -55,12 +55,7 @@ class TQSizeGrip; class Project; struct DesignerFormWindow; class FormFile; - -#if defined(TQ_CC_MSVC) || defined(TQ_FULL_TEMPLATE_INSTANTIATION) -#include "orderindicator.h" -#else class OrderIndicator; -#endif class FormWindow : public TQWidget { diff --git a/kdevdesigner/designer/hierarchyview.h b/kdevdesigner/designer/hierarchyview.h index e47754b9..d9b1fb69 100644 --- a/kdevdesigner/designer/hierarchyview.h +++ b/kdevdesigner/designer/hierarchyview.h @@ -236,8 +236,6 @@ private: ~ClassBrowser(); TQListView *lv; TQInterfacePtr iface; - - TQ_DUMMY_COMPARISON_OPERATOR( ClassBrowser ) }; FormWindow *formwindow; HierarchyList *listview; diff --git a/kdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h index e870aca0..0331efd8 100644 --- a/kdevdesigner/designer/layout.h +++ b/kdevdesigner/designer/layout.h @@ -181,7 +181,6 @@ public: int column; int rowspan; int colspan; - TQ_DUMMY_COMPARISON_OPERATOR( Item ) }; TQMap items; diff --git a/kdevdesigner/designer/listvieweditorimpl.h b/kdevdesigner/designer/listvieweditorimpl.h index 2644d4d8..b740f7d9 100644 --- a/kdevdesigner/designer/listvieweditorimpl.h +++ b/kdevdesigner/designer/listvieweditorimpl.h @@ -81,7 +81,6 @@ private: TQString text; TQPixmap pixmap; bool clickable, resizable; - TQ_DUMMY_COMPARISON_OPERATOR( Column ) }; private: diff --git a/kdevdesigner/designer/mainwindow.h b/kdevdesigner/designer/mainwindow.h index 47c4d710..fa636eda 100644 --- a/kdevdesigner/designer/mainwindow.h +++ b/kdevdesigner/designer/mainwindow.h @@ -67,12 +67,7 @@ class SourceFile; class FormFile; class TQAssistantClient; class DesignerAction; - -#if defined(TQ_FULL_TEMPLATE_INSTANTIATION) -#include -#else class TQToolBar; -#endif class Preferences; class KDevDesignerPart; @@ -375,7 +370,6 @@ private: TQString title; TQObject *receiver; const char *init_slot, *accept_slot; - TQ_DUMMY_COMPARISON_OPERATOR( Tab ) }; private: diff --git a/kdevdesigner/designer/pixmapcollection.h b/kdevdesigner/designer/pixmapcollection.h index 87e68bad..e4dab19b 100644 --- a/kdevdesigner/designer/pixmapcollection.h +++ b/kdevdesigner/designer/pixmapcollection.h @@ -43,7 +43,6 @@ public: TQPixmap pix; TQString name; TQString absname; - TQ_DUMMY_COMPARISON_OPERATOR( Pixmap ) }; PixmapCollection( Project *pro ); diff --git a/kdevdesigner/uilib/qwidgetfactory.h b/kdevdesigner/uilib/qwidgetfactory.h index c7045cd3..ed7ca03b 100644 --- a/kdevdesigner/uilib/qwidgetfactory.h +++ b/kdevdesigner/uilib/qwidgetfactory.h @@ -143,7 +143,6 @@ private: TQString name; TQPixmap pix; TQString field; - TQ_DUMMY_COMPARISON_OPERATOR( Field ) }; struct SqlWidgetConnection @@ -154,7 +153,6 @@ private: TQString conn; TQString table; TQMap *dbControls; - TQ_DUMMY_COMPARISON_OPERATOR( SqlWidgetConnection ) }; TQValueList images; diff --git a/lib/cppparser/driver.cpp b/lib/cppparser/driver.cpp index 1c50ad9c..26a4d47e 100644 --- a/lib/cppparser/driver.cpp +++ b/lib/cppparser/driver.cpp @@ -605,7 +605,6 @@ void Driver::setupLexer( Lexer * lexer ) { lexer->addSkipWord( "TQ_SETS", SkipWordAndArguments ); lexer->addSkipWord( "Q_UNUSED", SkipWordAndArguments ); lexer->addSkipWord( "TQ_CREATE_INSTANCE", SkipWordAndArguments ); - lexer->addSkipWord( "TQ_DUMMY_COMPARISON_OPERATOR", SkipWordAndArguments ); lexer->addSkipWord( "ACTIVATE_SIGNAL_WITH_PARAM", SkipWordAndArguments ); lexer->addSkipWord( "TQ_INLINE_TEMPLATES" ); lexer->addSkipWord( "TQ_TEMPLATE_EXTERN" ); -- cgit v1.2.3