1 files changed, 21 insertions, 21 deletions

diff --git a/kmail/kmfilter.cpp b/kmail/kmfilter.cpp
index d4456234..28a64633 100644
--- a/kmail/kmfilter.cpp
+++ b/kmail/kmfilter.cpp
@@ -84,7 +84,7 @@ KMFilter::KMFilter( const KMFilter & aFilter )
     mIcon = aFilter.icon();
     mShortcut = aFilter.shortcut();
 
-    QPtrListIterator<KMFilterAction> it( aFilter.mActions );
+    TQPtrListIterator<KMFilterAction> it( aFilter.mActions );
     for ( it.toFirst() ; it.current() ; ++it ) {
       KMFilterActionDesc *desc = (*kmkernel->filterActionDict())[ (*it)->name() ];
       if ( desc ) {
@@ -97,7 +97,7 @@ KMFilter::KMFilter( const KMFilter & aFilter )
     }
 
     mAccounts.clear();
-    QValueListConstIterator<int> it2;
+    TQValueListConstIterator<int> it2;
     for ( it2 = aFilter.mAccounts.begin() ; it2 != aFilter.mAccounts.end() ; ++it2 )
       mAccounts.append( *it2 );
   }
@@ -108,11 +108,11 @@ KMFilter::ReturnCode KMFilter::execActions( KMMessage* msg, bool& stopIt ) const
 {
   ReturnCode status = NoResult;
 
-  QPtrListIterator<KMFilterAction> it( mActions );
+  TQPtrListIterator<KMFilterAction> it( mActions );
   for ( it.toFirst() ; it.current() ; ++it ) {
 
     if ( FilterLog::instance()->isLogging() ) {
-      QString logText( i18n( "<b>Applying filter action:</b> %1" )
+      TQString logText( i18n( "<b>Applying filter action:</b> %1" )
                        .arg( (*it)->displayString() ) );
       FilterLog::instance()->add( logText, FilterLog::appliedAction );
     }
@@ -122,7 +122,7 @@ KMFilter::ReturnCode KMFilter::execActions( KMMessage* msg, bool& stopIt ) const
     switch ( result ) {
     case KMFilterAction::CriticalError:
       if ( FilterLog::instance()->isLogging() ) {
-        QString logText = QString( "<font color=#FF0000>%1</font>" )
+        TQString logText = TQString( "<font color=#FF0000>%1</font>" )
           .arg( i18n( "A critical error occurred. Processing stops here." ) );
         FilterLog::instance()->add( logText, FilterLog::appliedAction );
       }
@@ -130,7 +130,7 @@ KMFilter::ReturnCode KMFilter::execActions( KMMessage* msg, bool& stopIt ) const
       return CriticalError;
     case KMFilterAction::ErrorButGoOn:
       if ( FilterLog::instance()->isLogging() ) {
-        QString logText = QString( "<font color=#FF0000>%1</font>" )
+        TQString logText = TQString( "<font color=#FF0000>%1</font>" )
           .arg( i18n( "A problem was found while applying this action." ) );
         FilterLog::instance()->add( logText, FilterLog::appliedAction );
       }
@@ -151,7 +151,7 @@ bool KMFilter::requiresBody( KMMsgBase* msg )
 {
   if (pattern() && pattern()->requiresBody())
     return true; // no pattern means always matches?
-  QPtrListIterator<KMFilterAction> it( *actions() );
+  TQPtrListIterator<KMFilterAction> it( *actions() );
   for ( it.toFirst() ; it.current() ; ++it )
     if ((*it)->requiresBody( msg ))
       return true;
@@ -176,7 +176,7 @@ bool KMFilter::folderRemoved( KMFolder* aFolder, KMFolder* aNewFolder )
 {
   bool rem = false;
 
-  QPtrListIterator<KMFilterAction> it( mActions );
+  TQPtrListIterator<KMFilterAction> it( mActions );
   for ( it.toFirst() ; it.current() ; ++it )
     if ( (*it)->folderRemoved( aFolder, aNewFolder ) )
       rem = true;
@@ -218,7 +218,7 @@ void KMFilter::readConfig(KConfig* config)
 
   if (bPopFilter) {
     // get the action description...
-    QString action = config->readEntry( "action" );
+    TQString action = config->readEntry( "action" );
     if ( action == "down" )
       mAction = Down;
     else if ( action == "later" )
@@ -229,7 +229,7 @@ void KMFilter::readConfig(KConfig* config)
       mAction = NoAction;
   }
   else {
-    QStringList sets = config->readListEntry("apply-on");
+    TQStringList sets = config->readListEntry("apply-on");
     if ( sets.isEmpty() && !config->hasKey("apply-on") ) {
       bApplyOnOutbound = false;
       bApplyOnInbound = true;
@@ -244,7 +244,7 @@ void KMFilter::readConfig(KConfig* config)
 
     bStopProcessingHere = config->readBoolEntry("StopProcessingHere", true);
     bConfigureShortcut = config->readBoolEntry("ConfigureShortcut", false);
-    QString shortcut( config->readEntry( "Shortcut" ) );
+    TQString shortcut( config->readEntry( "Shortcut" ) );
     if ( !shortcut.isEmpty() ) {
       KShortcut sc( shortcut );
       setShortcut( sc );
@@ -255,7 +255,7 @@ void KMFilter::readConfig(KConfig* config)
     bAutoNaming = config->readBoolEntry("AutomaticName", false);
 
     int i, numActions;
-    QString actName, argsName;
+    TQString actName, argsName;
 
     mActions.clear();
 
@@ -314,7 +314,7 @@ void KMFilter::writeConfig(KConfig* config) const
       config->writeEntry( "action", "" );
     }
   } else {
-    QStringList sets;
+    TQStringList sets;
     if ( bApplyOnInbound )
       sets.append( "check-mail" );
     if ( bApplyOnOutbound )
@@ -332,10 +332,10 @@ void KMFilter::writeConfig(KConfig* config) const
     config->writeEntry( "AutomaticName", bAutoNaming );
     config->writeEntry( "Applicability", mApplicability );
 
-    QString key;
+    TQString key;
     int i;
 
-    QPtrListIterator<KMFilterAction> it( mActions );
+    TQPtrListIterator<KMFilterAction> it( mActions );
     for ( i=0, it.toFirst() ; it.current() ; ++it, ++i ) {
       config->writeEntry( key.sprintf("action-name-%d", i),
                           (*it)->name() );
@@ -352,7 +352,7 @@ void KMFilter::purify()
   mPattern.purify();
 
   if (!bPopFilter) {
-    QPtrListIterator<KMFilterAction> it( mActions );
+    TQPtrListIterator<KMFilterAction> it( mActions );
     it.toLast();
     while ( it.current() )
       if ( (*it)->isEmpty() )
@@ -361,7 +361,7 @@ void KMFilter::purify()
         --it;
 
     // Remove invalid accounts from mAccounts - just to be tidy
-    QValueListIterator<int> it2 = mAccounts.begin();
+    TQValueListIterator<int> it2 = mAccounts.begin();
     while ( it2 != mAccounts.end() ) {
       if ( !kmkernel->acctMgr()->find( *it2 ) )
          it2 = mAccounts.remove( it2 );
@@ -380,9 +380,9 @@ bool KMFilter::isEmpty() const
 }
 
 #ifndef NDEBUG
-const QString KMFilter::asString() const
+const TQString KMFilter::asString() const
 {
-  QString result;
+  TQString result;
 
   result += mPattern.asString();
 
@@ -392,7 +392,7 @@ const QString KMFilter::asString() const
     result += "\n";
   }
   else {
-    QPtrListIterator<KMFilterAction> it( mActions );
+    TQPtrListIterator<KMFilterAction> it( mActions );
     for ( it.toFirst() ; it.current() ; ++it ) {
       result += "    action: ";
       result += (*it)->label();
@@ -413,7 +413,7 @@ const QString KMFilter::asString() const
     } else if ( bApplyOnInbound && mApplicability == ButImap ) {
       result += "This filter applies to all but online IMAP accounts.\n";
     } else if ( bApplyOnInbound ) {
-      QValueListConstIterator<int> it2;
+      TQValueListConstIterator<int> it2;
       result += "This filter applies to the following accounts:";
       if ( mAccounts.isEmpty() )
         result += " None";