summaryrefslogtreecommitdiffstats
path: root/kmail/rulewidgethandlermanager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/rulewidgethandlermanager.cpp')
-rw-r--r--kmail/rulewidgethandlermanager.cpp82
1 files changed, 41 insertions, 41 deletions
diff --git a/kmail/rulewidgethandlermanager.cpp b/kmail/rulewidgethandlermanager.cpp
index ae04af88..27aa68bc 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 );
}
@@ -368,7 +368,7 @@ namespace {
TQObject *obj;
while ( ( obj = it.current() ) ) {
++it;
- if ( !objName || tqstrcmp( objName, obj->name() ) == 0 )
+ if ( !objName || qstrcmp( objName, obj->name() ) == 0 )
break;
}
return obj;
@@ -431,8 +431,8 @@ namespace {
funcCombo->insertItem( i18n( TextFunctions[i].displayName ) );
}
funcCombo->adjustSize();
- TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ),
- receiver, TQT_SLOT( slotFunctionChanged() ) );
+ TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ),
+ receiver, TQ_SLOT( slotFunctionChanged() ) );
return funcCombo;
}
@@ -445,8 +445,8 @@ namespace {
if ( number == 0 ) {
RegExpLineEdit *lineEdit =
new RegExpLineEdit( valueStack, "regExpLineEdit" );
- TQObject::connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- receiver, TQT_SLOT( slotValueChanged() ) );
+ TQObject::connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ receiver, TQ_SLOT( slotValueChanged() ) );
return lineEdit;
}
@@ -459,8 +459,8 @@ namespace {
TQComboBox *combo = new TQComboBox( valueStack, "categoryCombo" );
TQStringList categories = KabcBridge::categories();
combo->insertStringList( categories );
- TQObject::connect( combo, TQT_SIGNAL( activated( int ) ),
- receiver, TQT_SLOT( slotValueChanged() ) );
+ TQObject::connect( combo, TQ_SIGNAL( activated( int ) ),
+ receiver, TQ_SLOT( slotValueChanged() ) );
return combo;
}
@@ -472,7 +472,7 @@ namespace {
KMSearchRule::Function TextRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const
{
const TQComboBox *funcCombo =
- dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack),
+ dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack,
"textRuleFuncCombo" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<TQComboBox*>( functionStack->child( "textRuleFuncCombo",
@@ -503,7 +503,7 @@ namespace {
if ( func == KMSearchRule::FuncIsInCategory ||
func == KMSearchRule::FuncIsNotInCategory ) {
const TQComboBox *combo=
- dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack),
+ dynamic_cast<TQComboBox*>( TQObject_child_const( valueStack,
"categoryCombo" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<TQComboBox*>( valueStack->child( "categoryCombo",
@@ -520,7 +520,7 @@ namespace {
//in other cases of func it is a lineedit
const RegExpLineEdit *lineEdit =
- dynamic_cast<RegExpLineEdit*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack),
+ dynamic_cast<RegExpLineEdit*>( TQObject_child_const( valueStack,
"regExpLineEdit" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<RegExpLineEdit*>( valueStack->child( "regExpLineEdit",
@@ -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 {
@@ -762,8 +762,8 @@ namespace {
funcCombo->insertItem( i18n( MessageFunctions[i].displayName ) );
}
funcCombo->adjustSize();
- TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ),
- receiver, TQT_SLOT( slotFunctionChanged() ) );
+ TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ),
+ receiver, TQ_SLOT( slotFunctionChanged() ) );
return funcCombo;
}
@@ -776,8 +776,8 @@ namespace {
if ( number == 0 ) {
RegExpLineEdit *lineEdit =
new RegExpLineEdit( valueStack, "regExpLineEdit" );
- TQObject::connect( lineEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
- receiver, TQT_SLOT( slotValueChanged() ) );
+ TQObject::connect( lineEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+ receiver, TQ_SLOT( slotValueChanged() ) );
return lineEdit;
}
@@ -794,7 +794,7 @@ namespace {
KMSearchRule::Function MessageRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const
{
const TQComboBox *funcCombo =
- dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack),
+ dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack,
"messageRuleFuncCombo" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<TQComboBox*>( functionStack->child( "messageRuleFuncCombo",
@@ -825,7 +825,7 @@ namespace {
KMSearchRule::Function ) const
{
const RegExpLineEdit *lineEdit =
- dynamic_cast<RegExpLineEdit*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack),
+ dynamic_cast<RegExpLineEdit*>( TQObject_child_const( valueStack,
"regExpLineEdit" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<RegExpLineEdit*>( valueStack->child( "regExpLineEdit",
@@ -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 );
}
@@ -1038,8 +1038,8 @@ namespace {
funcCombo->insertItem( i18n( StatusFunctions[i].displayName ) );
}
funcCombo->adjustSize();
- TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ),
- receiver, TQT_SLOT( slotFunctionChanged() ) );
+ TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ),
+ receiver, TQ_SLOT( slotFunctionChanged() ) );
return funcCombo;
}
@@ -1058,8 +1058,8 @@ namespace {
statusCombo->insertItem( UserIcon( KMail::StatusValues[ i ].icon ), i18n( KMail::StatusValues[ i ].text ) );
}
statusCombo->adjustSize();
- TQObject::connect( statusCombo, TQT_SIGNAL( activated( int ) ),
- receiver, TQT_SLOT( slotValueChanged() ) );
+ TQObject::connect( statusCombo, TQ_SIGNAL( activated( int ) ),
+ receiver, TQ_SLOT( slotValueChanged() ) );
return statusCombo;
}
@@ -1068,7 +1068,7 @@ namespace {
KMSearchRule::Function StatusRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const
{
const TQComboBox *funcCombo =
- dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack),
+ dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack,
"statusRuleFuncCombo" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<TQComboBox*>( functionStack->child( "statusRuleFuncCombo",
@@ -1098,7 +1098,7 @@ namespace {
int StatusRuleWidgetHandler::currenStatusValue( const TQWidgetStack *valueStack ) const
{
const TQComboBox *statusCombo =
- dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack),
+ dynamic_cast<TQComboBox*>( TQObject_child_const( valueStack,
"statusRuleValueCombo" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<TQComboBox*>( valueStack->child( "statusRuleValueCombo",
@@ -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;
}
@@ -1298,8 +1298,8 @@ namespace {
funcCombo->insertItem( i18n( NumericFunctions[i].displayName ) );
}
funcCombo->adjustSize();
- TQObject::connect( funcCombo, TQT_SIGNAL( activated( int ) ),
- receiver, TQT_SLOT( slotFunctionChanged() ) );
+ TQObject::connect( funcCombo, TQ_SIGNAL( activated( int ) ),
+ receiver, TQ_SLOT( slotFunctionChanged() ) );
return funcCombo;
}
@@ -1313,8 +1313,8 @@ namespace {
return 0;
KIntNumInput *numInput = new KIntNumInput( valueStack, "KIntNumInput" );
- TQObject::connect( numInput, TQT_SIGNAL( valueChanged( int ) ),
- receiver, TQT_SLOT( slotValueChanged() ) );
+ TQObject::connect( numInput, TQ_SIGNAL( valueChanged( int ) ),
+ receiver, TQ_SLOT( slotValueChanged() ) );
return numInput;
}
@@ -1323,7 +1323,7 @@ namespace {
KMSearchRule::Function NumericRuleWidgetHandler::currentFunction( const TQWidgetStack *functionStack ) const
{
const TQComboBox *funcCombo =
- dynamic_cast<TQComboBox*>( TQObject_child_const( TQT_TQOBJECT_CONST(functionStack),
+ dynamic_cast<TQComboBox*>( TQObject_child_const( functionStack,
"numericRuleFuncCombo" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<TQComboBox*>( functionStack->child( "numericRuleFuncCombo",
@@ -1353,7 +1353,7 @@ namespace {
TQString NumericRuleWidgetHandler::currentValue( const TQWidgetStack *valueStack ) const
{
const KIntNumInput *numInput =
- dynamic_cast<KIntNumInput*>( TQObject_child_const( TQT_TQOBJECT_CONST(valueStack),
+ dynamic_cast<KIntNumInput*>( TQObject_child_const( valueStack,
"KIntNumInput" ) );
// FIXME (TQt >= 4.0): Use the following when TQObject::child() is const.
// dynamic_cast<KIntNumInput*>( valueStack->child( "KIntNumInput",
@@ -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