diff options
Diffstat (limited to 'kmail/kmfilteraction.cpp')
-rw-r--r-- | kmail/kmfilteraction.cpp | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/kmail/kmfilteraction.cpp b/kmail/kmfilteraction.cpp index ceef636e6..49378e9d5 100644 --- a/kmail/kmfilteraction.cpp +++ b/kmail/kmfilteraction.cpp @@ -266,7 +266,7 @@ void KMFilterActionWithStringList::applyParamWidgetValue( TQWidget* paramWidget void KMFilterActionWithStringList::setParamWidgetValue( TQWidget* paramWidget ) const { - int idx = mParameterList.tqfindIndex( mParameter ); + int idx = mParameterList.findIndex( mParameter ); ((TQComboBox*)paramWidget)->setCurrentItem( idx >= 0 ? idx : 0 ); } @@ -277,7 +277,7 @@ void KMFilterActionWithStringList::clearParamWidget( TQWidget* paramWidget ) con void KMFilterActionWithStringList::argsFromString( const TQString argsStr ) { - int idx = mParameterList.tqfindIndex( argsStr ); + int idx = mParameterList.findIndex( argsStr ); if ( idx < 0 ) { mParameterList.append( argsStr ); idx = mParameterList.count() - 1; @@ -486,7 +486,7 @@ TQString KMFilterActionWithCommand::substituteCommandLineArgsFor( KMMessage *aMs // TQString( "%0 and %1 and %1" ).tqarg( 0 ).tqarg( 1 ) // returns "0 and 1 and %1", so we must call .arg as // many times as there are %n's, regardless of their multiplicity. - if ((*it) == -1) result.tqreplace( "%-1", tempFileName ); + if ((*it) == -1) result.replace( "%-1", tempFileName ); else result = result.tqarg( tempFileName ); } @@ -496,7 +496,7 @@ TQString KMFilterActionWithCommand::substituteCommandLineArgsFor( KMMessage *aMs int idx = 0; while ( ( idx = header_rx.search( result, idx ) ) != -1 ) { TQString replacement = KProcess::quote( aMsg->headerField( TQString(header_rx.cap(1)).latin1() ) ); - result.tqreplace( idx, header_rx.matchedLength(), replacement ); + result.replace( idx, header_rx.matchedLength(), replacement ); idx += replacement.length(); } @@ -806,7 +806,7 @@ KMFilterActionSetqStatus::KMFilterActionSetqStatus() KMFilterAction::ReturnCode KMFilterActionSetqStatus::process(KMMessage* msg) const { - int idx = mParameterList.tqfindIndex( mParameter ); + int idx = mParameterList.findIndex( mParameter ); if ( idx < 1 ) return ErrorButGoOn; KMMsgtqStatus status = stati[idx-1] ; @@ -833,7 +833,7 @@ void KMFilterActionSetqStatus::argsFromString( const TQString argsStr ) const TQString KMFilterActionSetqStatus::argsAsString() const { - int idx = mParameterList.tqfindIndex( mParameter ); + int idx = mParameterList.findIndex( mParameter ); if ( idx < 1 ) return TQString(); KMMsgtqStatus status = stati[idx-1]; @@ -901,7 +901,7 @@ KMFilterActionFakeDisposition::KMFilterActionFakeDisposition() KMFilterAction::ReturnCode KMFilterActionFakeDisposition::process(KMMessage* msg) const { - int idx = mParameterList.tqfindIndex( mParameter ); + int idx = mParameterList.findIndex( mParameter ); if ( idx < 1 ) return ErrorButGoOn; if ( idx == 1 ) // ignore @@ -929,7 +929,7 @@ void KMFilterActionFakeDisposition::argsFromString( const TQString argsStr ) const TQString KMFilterActionFakeDisposition::argsAsString() const { - int idx = mParameterList.tqfindIndex( mParameter ); + int idx = mParameterList.findIndex( mParameter ); if ( idx < 1 ) return TQString(); return TQString( TQChar( idx < 2 ? 'I' : char(mdns[idx-2]) ) ); @@ -996,7 +996,7 @@ void KMFilterActionRemoveHeader::setParamWidgetValue( TQWidget* paramWidget ) co TQComboBox * cb = dynamic_cast<TQComboBox*>(paramWidget); Q_ASSERT( cb ); - int idx = mParameterList.tqfindIndex( mParameter ); + int idx = mParameterList.findIndex( mParameter ); cb->clear(); cb->insertStringList( mParameterList ); if ( idx < 0 ) { @@ -1074,7 +1074,7 @@ TQWidget* KMFilterActionAddHeader::createParamWidget( TQWidget* tqparent ) const void KMFilterActionAddHeader::setParamWidgetValue( TQWidget* paramWidget ) const { - int idx = mParameterList.tqfindIndex( mParameter ); + int idx = mParameterList.findIndex( mParameter ); TQComboBox *cb = (TQComboBox*)paramWidget->child("combo"); Q_ASSERT( cb ); cb->clear(); @@ -1139,7 +1139,7 @@ void KMFilterActionAddHeader::argsFromString( const TQString argsStr ) mValue = l[1]; } - int idx = mParameterList.tqfindIndex( s ); + int idx = mParameterList.findIndex( s ); if ( idx < 0 ) { mParameterList.append( s ); idx = mParameterList.count() - 1; @@ -1196,7 +1196,7 @@ KMFilterAction::ReturnCode KMFilterActionRewriteHeader::process(KMMessage* msg) KRegExp3 rx = mRegExp; // KRegExp3::replace is not const. - TQString newValue = rx.tqreplace( msg->headerField( mParameter.latin1() ), + TQString newValue = rx.replace( msg->headerField( mParameter.latin1() ), mReplacementString ); msg->setHeaderField( mParameter.latin1(), newValue ); @@ -1224,7 +1224,7 @@ TQWidget* KMFilterActionRewriteHeader::createParamWidget( TQWidget* tqparent ) c l->setFixedWidth( l->tqsizeHint().width() ); hbl->addWidget( l, 0 ); - TQLineEdit *le = new KLineEdit( w, "tqreplace" ); + TQLineEdit *le = new KLineEdit( w, "replace" ); hbl->addWidget( le, 1 ); setParamWidgetValue( w ); @@ -1233,7 +1233,7 @@ TQWidget* KMFilterActionRewriteHeader::createParamWidget( TQWidget* tqparent ) c void KMFilterActionRewriteHeader::setParamWidgetValue( TQWidget* paramWidget ) const { - int idx = mParameterList.tqfindIndex( mParameter ); + int idx = mParameterList.findIndex( mParameter ); TQComboBox *cb = (TQComboBox*)paramWidget->child("combo"); Q_ASSERT( cb ); @@ -1250,7 +1250,7 @@ void KMFilterActionRewriteHeader::setParamWidgetValue( TQWidget* paramWidget ) c Q_ASSERT( rele ); rele->setText( mRegExp.pattern() ); - TQLineEdit *le = (TQLineEdit*)paramWidget->child("tqreplace"); + TQLineEdit *le = (TQLineEdit*)paramWidget->child("replace"); Q_ASSERT( le ); le->setText( mReplacementString ); } @@ -1265,7 +1265,7 @@ void KMFilterActionRewriteHeader::applyParamWidgetValue( TQWidget* paramWidget ) Q_ASSERT( rele ); mRegExp.setPattern( rele->text() ); - TQLineEdit *le = (TQLineEdit*)paramWidget->child("tqreplace"); + TQLineEdit *le = (TQLineEdit*)paramWidget->child("replace"); Q_ASSERT( le ); mReplacementString = le->text(); } @@ -1280,7 +1280,7 @@ void KMFilterActionRewriteHeader::clearParamWidget( TQWidget* paramWidget ) cons Q_ASSERT( rele ); rele->clear(); - TQLineEdit *le = (TQLineEdit*)paramWidget->child("tqreplace"); + TQLineEdit *le = (TQLineEdit*)paramWidget->child("replace"); Q_ASSERT( le ); le->clear(); } @@ -1312,7 +1312,7 @@ void KMFilterActionRewriteHeader::argsFromString( const TQString argsStr ) mRegExp.setPattern( l[1] ); mReplacementString = l[2]; - int idx = mParameterList.tqfindIndex( s ); + int idx = mParameterList.findIndex( s ); if ( idx < 0 ) { mParameterList.append( s ); idx = mParameterList.count() - 1; @@ -1596,7 +1596,7 @@ static const TQString forwardFilterArgsSeperator = "@$$@"; void KMFilterActionForward::argsFromString( const TQString argsStr ) { - int seperatorPos = argsStr.tqfind( forwardFilterArgsSeperator ); + int seperatorPos = argsStr.find( forwardFilterArgsSeperator ); if ( seperatorPos == - 1 ) { // Old config, assume that the whole string is the addressee @@ -1745,7 +1745,7 @@ class PipeJob : public KPIM::ThreadWeaver::Job mMsg->setHeaderField( "X-KMail-Filtered", origSerNum ); if ( filterFolder && handler ) { bool oldtqStatus = handler->ignoreChanges( true ); - filterFolder->take( filterFolder->tqfind( mMsg ) ); + filterFolder->take( filterFolder->find( mMsg ) ); filterFolder->addMsg( mMsg ); handler->ignoreChanges( oldtqStatus ); } else { |