From ddf896e8d22004797d141e221455cbdaa45b3f80 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 9 Aug 2023 15:34:41 +0900 Subject: [PATCH] Drop TQT_TQ*_CONST defines Signed-off-by: Michele Calgaro --- kmail/kmcomposewin.cpp | 2 +- kmail/rulewidgethandlermanager.cpp | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp index 86358906..3694e4af 100644 --- a/kmail/kmcomposewin.cpp +++ b/kmail/kmcomposewin.cpp @@ -887,7 +887,7 @@ void KMComposeWin::slotView(void) //This sucks awfully, but no, I cannot get an activated(int id) from // actionContainer() - if (!TQT_TQOBJECT_CONST(sender())->isA("TDEToggleAction")) + if (!sender()->isA("TDEToggleAction")) return; TDEToggleAction *act = (TDEToggleAction *) sender(); diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp index ae04af88..95c3e1ea 100644 --- a/kmail/rulewidgethandlermanager.cpp +++ b/kmail/rulewidgethandlermanager.cpp @@ -472,7 +472,7 @@ namespace { KMSearchRule::Function TextRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const { const TQComboBox *funcCombo = - dynamic_cast( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack), + dynamic_cast( TQObject_child_const( functionStack, "textRuleFuncCombo" ) ); // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast( functionStack->child( "textRuleFuncCombo", @@ -503,7 +503,7 @@ namespace { if ( func == KMSearchRule::FuncIsInCategory || func == KMSearchRule::FuncIsNotInCategory ) { const TQComboBox *combo= - dynamic_cast( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack), + dynamic_cast( TQObject_child_const( valueStack, "categoryCombo" ) ); // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast( valueStack->child( "categoryCombo", @@ -520,7 +520,7 @@ namespace { //in other cases of func it is a lineedit const RegExpLineEdit *lineEdit = - dynamic_cast( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack), + dynamic_cast( TQObject_child_const( valueStack, "regExpLineEdit" ) ); // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast( valueStack->child( "regExpLineEdit", @@ -794,7 +794,7 @@ namespace { KMSearchRule::Function MessageRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const { const TQComboBox *funcCombo = - dynamic_cast( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack), + dynamic_cast( TQObject_child_const( functionStack, "messageRuleFuncCombo" ) ); // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast( functionStack->child( "messageRuleFuncCombo", @@ -825,7 +825,7 @@ namespace { KMSearchRule::Function ) const { const RegExpLineEdit *lineEdit = - dynamic_cast( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack), + dynamic_cast( TQObject_child_const( valueStack, "regExpLineEdit" ) ); // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast( valueStack->child( "regExpLineEdit", @@ -1068,7 +1068,7 @@ namespace { KMSearchRule::Function StatusRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const { const TQComboBox *funcCombo = - dynamic_cast( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack), + dynamic_cast( TQObject_child_const( functionStack, "statusRuleFuncCombo" ) ); // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast( functionStack->child( "statusRuleFuncCombo", @@ -1098,7 +1098,7 @@ namespace { int StatusRuleWidgetHandler::currenStatusValue( const TQWidgetStack *valueStack ) const { const TQComboBox *statusCombo = - dynamic_cast( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack), + dynamic_cast( TQObject_child_const( valueStack, "statusRuleValueCombo" ) ); // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast( valueStack->child( "statusRuleValueCombo", @@ -1323,7 +1323,7 @@ namespace { KMSearchRule::Function NumericRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const { const TQComboBox *funcCombo = - dynamic_cast( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack), + dynamic_cast( TQObject_child_const( functionStack, "numericRuleFuncCombo" ) ); // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast( functionStack->child( "numericRuleFuncCombo", @@ -1353,7 +1353,7 @@ namespace { TQString NumericRuleWidgetHandler::currentValue( const TQWidgetStack *valueStack ) const { const KIntNumInput *numInput = - dynamic_cast( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack), + dynamic_cast( TQObject_child_const( valueStack, "KIntNumInput" ) ); // FIXME (TQt >= 4.0): Use the following when TQObject::child() is const. // dynamic_cast( valueStack->child( "KIntNumInput",