1 files changed, 13 insertions, 13 deletions

diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp
index 2f64abbf..05844963 100644
--- a/kmail/rulewidgethandlermanager.cpp
+++ b/kmail/rulewidgethandlermanager.cpp
@@ -251,7 +251,7 @@ void KMail::RuleWidgetHandlerManager::createWidgets( TQWidgetStack *functionStac
     for ( int i = 0;
           ( w = (*it)->createFunctionWidget( i, functionStack, receiver ) );
           ++i ) {
-      if ( childCount( TQT_TQOBJECT(functionStack), w->name() ) < 2 ) {
+      if ( childCount( functionStack, w->name() ) < 2 ) {
         // there wasn't already a widget with this name, so add this widget
         functionStack->addWidget( w );
       }
@@ -266,7 +266,7 @@ void KMail::RuleWidgetHandlerManager::createWidgets( TQWidgetStack *functionStac
     for ( int i = 0;
           ( w = (*it)->createValueWidget( i, valueStack, receiver ) );
           ++i ) {
-      if ( childCount( TQT_TQOBJECT(valueStack), w->name() ) < 2 ) {
+      if ( childCount( valueStack, w->name() ) < 2 ) {
         // there wasn't already a widget with this name, so add this widget
         valueStack->addWidget( w );
       }
@@ -646,14 +646,14 @@ namespace {
     if ( func == KMSearchRule::FuncIsInAddressbook ||
          func == KMSearchRule::FuncIsNotInAddressbook ) {
       TQWidget *w =
-        TQT_TQWIDGET( valueStack->child( "textRuleValueHider",
+        static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
                                                   0, false ) );
       valueStack->raiseWidget( w );
     }
     else if ( func == KMSearchRule::FuncIsInCategory ||
               func == KMSearchRule::FuncIsNotInCategory) {
       TQComboBox *combo =
-        static_cast<TQComboBox*>( TQT_TQWIDGET(valueStack->child( "categoryCombo",
+        static_cast<TQComboBox*>( static_cast<TQWidget*>(valueStack->child( "categoryCombo",
                                                     0, false )) );
       combo->blockSignals( true );
       for ( i = 0; i < combo->count(); ++i )
@@ -692,7 +692,7 @@ namespace {
   {
     // raise the correct function widget
     functionStack->raiseWidget(
-      TQT_TQWIDGET( functionStack->child( "textRuleFuncCombo",
+      static_cast<TQWidget*>( functionStack->child( "textRuleFuncCombo",
                                                    0, false ) ) );
 
     // raise the correct value widget
@@ -700,13 +700,13 @@ namespace {
     if ( func == KMSearchRule::FuncIsInAddressbook ||
          func == KMSearchRule::FuncIsNotInAddressbook ) {
       valueStack->raiseWidget(
-        TQT_TQWIDGET( valueStack->child( "textRuleValueHider",
+        static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
                                                   0, false ) ) );
     }
     else if ( func == KMSearchRule::FuncIsInCategory ||
               func == KMSearchRule::FuncIsNotInCategory) {
       valueStack->raiseWidget(
-        TQT_TQWIDGET( valueStack->child( "categoryCombo",
+        static_cast<TQWidget*>( valueStack->child( "categoryCombo",
                                                   0, false ) ) );
     }
     else {
@@ -947,7 +947,7 @@ namespace {
     if ( func == KMSearchRule::FuncHasAttachment  ||
          func == KMSearchRule::FuncHasNoAttachment ) {
       TQWidget *w =
-        TQT_TQWIDGET( valueStack->child( "textRuleValueHider",
+        static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
                                                   0, false ) );
       valueStack->raiseWidget( w );
     }
@@ -978,7 +978,7 @@ namespace {
       return false;
     // raise the correct function widget
     functionStack->raiseWidget(
-      TQT_TQWIDGET( functionStack->child( "messageRuleFuncCombo",
+      static_cast<TQWidget*>( functionStack->child( "messageRuleFuncCombo",
                                                    0, false ) ) );
 
     // raise the correct value widget
@@ -986,7 +986,7 @@ namespace {
     if ( func == KMSearchRule::FuncHasAttachment  ||
          func == KMSearchRule::FuncHasNoAttachment ) {
       TQWidget *w =
-        TQT_TQWIDGET( valueStack->child( "textRuleValueHider",
+        static_cast<TQWidget*>( valueStack->child( "textRuleValueHider",
                                                   0, false ) );
       valueStack->raiseWidget( w );
     }
@@ -1249,12 +1249,12 @@ namespace {
 
     // raise the correct function widget
     functionStack->raiseWidget(
-      TQT_TQWIDGET( functionStack->child( "statusRuleFuncCombo",
+      static_cast<TQWidget*>( functionStack->child( "statusRuleFuncCombo",
                                                    0, false ) ) );
 
     // raise the correct value widget
     valueStack->raiseWidget(
-      TQT_TQWIDGET( valueStack->child( "statusRuleValueCombo",
+      static_cast<TQWidget*>( valueStack->child( "statusRuleValueCombo",
                                                 0, false ) ) );
     return true;
   }
@@ -1502,7 +1502,7 @@ namespace {
 
     // raise the correct function widget
     functionStack->raiseWidget(
-      TQT_TQWIDGET( functionStack->child( "numericRuleFuncCombo",
+      static_cast<TQWidget*>( functionStack->child( "numericRuleFuncCombo",
                                                    0, false ) ) );
 
     // raise the correct value widget