3 files changed, 21 insertions, 21 deletions

diff --git a/kabc/kabc2mutt/kabc2mutt.cpp b/kabc/kabc2mutt/kabc2mutt.cpp
index 84f4626b..96cf7923 100644
--- a/kabc/kabc2mutt/kabc2mutt.cpp
+++ b/kabc/kabc2mutt/kabc2mutt.cpp
@@ -21,16 +21,16 @@
 #include <kapplication.h>
 #include <klocale.h>
 
-#include <qregexp.h>
+#include <tqregexp.h>
 
 #include <iostream>
 
 #include "kabc2mutt.h"
 
-static std::ostream & operator<< ( std::ostream &os, const QString &s );
+static std::ostream & operator<< ( std::ostream &os, const TQString &s );
 
-KABC2Mutt::KABC2Mutt( QObject *parent, const char *name )
-  : QObject( parent, name ), mFormat( Aliases ),
+KABC2Mutt::KABC2Mutt( TQObject *parent, const char *name )
+  : TQObject( parent, name ), mFormat( Aliases ),
     mIgnoreCase( false ), mAllAddresses( false ),
     mAlternateKeyFormat( false ),
     mAddressBook( 0 )
@@ -42,8 +42,8 @@ void KABC2Mutt::run()
   mAddressBook = KABC::StdAddressBook::self( true );
   KABC::StdAddressBook::setAutomaticSave( false );
 
-  connect( mAddressBook, SIGNAL( addressBookChanged( AddressBook* ) ),
-           this, SLOT( loadingFinished() ) );
+  connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ),
+           this, TQT_SLOT( loadingFinished() ) );
 }
 
 void KABC2Mutt::loadingFinished()
@@ -51,7 +51,7 @@ void KABC2Mutt::loadingFinished()
   // print addressees
   KABC::AddressBook::ConstIterator iaddr;
   for ( iaddr = mAddressBook->begin(); iaddr != mAddressBook->end(); ++iaddr ) {
-    const QString name = (*iaddr).givenName() + ' ' + (*iaddr).familyName();
+    const TQString name = (*iaddr).givenName() + ' ' + (*iaddr).familyName();
     if ( !mQuery.isEmpty() ) {
       bool match = (name.find(mQuery, 0, mIgnoreCase) > -1) ||
                    ((*iaddr).preferredEmail().find( mQuery, 0, mIgnoreCase ) > -1 );
@@ -59,8 +59,8 @@ void KABC2Mutt::loadingFinished()
         continue;
     }
 
-    const QStringList &allAddresses = (*iaddr).emails();
-    QStringList::const_iterator from, to;
+    const TQStringList &allAddresses = (*iaddr).emails();
+    TQStringList::const_iterator from, to;
     bool multiple = false;
 
     if ( mAllAddresses ) {
@@ -77,10 +77,10 @@ void KABC2Mutt::loadingFinished()
 
     size_t index = 0;
     if ( mFormat == Aliases ) {
-      static const QChar space = QChar( ' ' );
-      static const QChar underscore = QChar( '_' );
+      static const TQChar space = TQChar( ' ' );
+      static const TQChar underscore = TQChar( '_' );
 
-      QString key;
+      TQString key;
       if ( !mAlternateKeyFormat )
         key = (*iaddr).givenName().left( 3 ) + (*iaddr).familyName().left( 3 );
       else
@@ -125,8 +125,8 @@ void KABC2Mutt::loadingFinished()
   KABC::DistributionListManager manager( mAddressBook );
   manager.load();
 
-  QStringList dists = manager.listNames();
-  for ( QStringList::Iterator iaddr = dists.begin(); iaddr != dists.end(); ++iaddr ) {
+  TQStringList dists = manager.listNames();
+  for ( TQStringList::Iterator iaddr = dists.begin(); iaddr != dists.end(); ++iaddr ) {
     KABC::DistributionList *list = manager.list( *iaddr );
     if ( list ) {
       if ( !mQuery.isEmpty() ) {
@@ -135,12 +135,12 @@ void KABC2Mutt::loadingFinished()
           continue;
       }
 
-      QStringList emails = list->emails();
+      TQStringList emails = list->emails();
       if ( emails.isEmpty() )
         continue;
 
       if ( mFormat == Aliases ) {
-        std::cout << "alias " << (*iaddr).replace( QRegExp( " " ), "_" )
+        std::cout << "alias " << (*iaddr).replace( TQRegExp( " " ), "_" )
                   << '\t' << emails.join( "," ) << std::endl;
       } else {
         std::cout << emails.join( "," ) << '\t' << (*iaddr) << '\t' << std::endl;
@@ -151,7 +151,7 @@ void KABC2Mutt::loadingFinished()
   kapp->quit();
 }
 
-static std::ostream & operator<< ( std::ostream &os, const QString &s )
+static std::ostream & operator<< ( std::ostream &os, const TQString &s )
 {
   os << s.local8Bit().data();
   return os;
diff --git a/kabc/kabc2mutt/kabc2mutt.h b/kabc/kabc2mutt/kabc2mutt.h
index 65f4d06f..ebe4f53f 100644
--- a/kabc/kabc2mutt/kabc2mutt.h
+++ b/kabc/kabc2mutt/kabc2mutt.h
@@ -30,9 +30,9 @@ class KABC2Mutt : public QObject
 
     enum Format { Aliases, Query };
 
-    KABC2Mutt( QObject *parent, const char *name = 0 );
+    KABC2Mutt( TQObject *parent, const char *name = 0 );
 
-    void setQuery( const QString &query ) { mQuery = query; }
+    void setQuery( const TQString &query ) { mQuery = query; }
     void setFormat( Format format ) { mFormat = format; }
     void setIgnoreCase( bool ignoreCase ) { mIgnoreCase = ignoreCase; }
     void setAllAddresses( bool allAddresses ) { mAllAddresses = allAddresses; }
@@ -44,7 +44,7 @@ class KABC2Mutt : public QObject
     void loadingFinished();
 
   private:
-    QString mQuery;
+    TQString mQuery;
     Format mFormat;
     bool mIgnoreCase;
     bool mAllAddresses;
diff --git a/kabc/kabc2mutt/main.cpp b/kabc/kabc2mutt/main.cpp
index 8da8f549..9ca34586 100644
--- a/kabc/kabc2mutt/main.cpp
+++ b/kabc/kabc2mutt/main.cpp
@@ -63,7 +63,7 @@ int main( int argc, char **argv )
   object->setAllAddresses( args->isSet( "all-addresses" ) );
 
   // Handle --query option
-  const QString subString = QString::fromLocal8Bit( args->getOption( "query" ) );
+  const TQString subString = TQString::fromLocal8Bit( args->getOption( "query" ) );
   if ( !subString.isEmpty() ) {
     // Mutt wants a first line with some status message on it
     // See http://mutt.org/doc/manual/manual-4.html#ss4.5