1 files changed, 18 insertions, 18 deletions

diff --git a/kmail/kmaddrbook.cpp b/kmail/kmaddrbook.cpp
index 288784db..b115f54e 100644
--- a/kmail/kmaddrbook.cpp
+++ b/kmail/kmaddrbook.cpp
@@ -32,33 +32,33 @@
 #include <kabc/vcardconverter.h>
 #include <dcopref.h>
 
-#include <qregexp.h>
+#include <tqregexp.h>
 
-void KabcBridge::addresses(QStringList& result) // includes lists
+void KabcBridge::addresses(TQStringList& result) // includes lists
 {
   KCursorSaver busy(KBusyPtr::busy()); // loading might take a while
 
   KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
   KABC::AddressBook::ConstIterator it;
   for( it = addressBook->begin(); it != addressBook->end(); ++it ) {
-    const QStringList emails = (*it).emails();
-    QString n = (*it).prefix() + " " +
+    const TQStringList emails = (*it).emails();
+    TQString n = (*it).prefix() + " " +
 		(*it).givenName() + " " +
 		(*it).additionalName() + " " +
 	        (*it).familyName() + " " +
 		(*it).suffix();
     n = n.simplifyWhiteSpace();
 
-    QRegExp needQuotes("[^ 0-9A-Za-z\\x0080-\\xFFFF]");
-    QString endQuote = "\" ";
-    QStringList::ConstIterator mit;
-    QString addr, email;
+    TQRegExp needQuotes("[^ 0-9A-Za-z\\x0080-\\xFFFF]");
+    TQString endQuote = "\" ";
+    TQStringList::ConstIterator mit;
+    TQString addr, email;
 
     for ( mit = emails.begin(); mit != emails.end(); ++mit ) {
       email = *mit;
       if (!email.isEmpty()) {
 	if (n.isEmpty() || (email.find( '<' ) != -1))
-	  addr = QString::null;
+	  addr = TQString::null;
 	else { // do we really need quotes around this name ?
           if (n.find(needQuotes) != -1)
 	    addr = '"' + n + endQuote;
@@ -84,9 +84,9 @@ void KabcBridge::addresses(QStringList& result) // includes lists
   result.sort();
 }
 
-QStringList KabcBridge::addresses()
+TQStringList KabcBridge::addresses()
 {
-    QStringList entries;
+    TQStringList entries;
     KABC::AddressBook::ConstIterator it;
 
     const KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
@@ -97,34 +97,34 @@ QStringList KabcBridge::addresses()
 }
 
 //-----------------------------------------------------------------------------
-QString KabcBridge::expandNickName( const QString& nickName )
+TQString KabcBridge::expandNickName( const TQString& nickName )
 {
   if ( nickName.isEmpty() )
-    return QString::null;
+    return TQString::null;
 
-  const QString lowerNickName = nickName.lower();
+  const TQString lowerNickName = nickName.lower();
   const KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
   for( KABC::AddressBook::ConstIterator it = addressBook->begin();
        it != addressBook->end(); ++it ) {
     if ( (*it).nickName().lower() == lowerNickName )
       return (*it).fullEmail();
   }
-  return QString::null;
+  return TQString::null;
 }
 
 
 //-----------------------------------------------------------------------------
 
-QStringList KabcBridge::categories()
+TQStringList KabcBridge::categories()
 {
   KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
   KABC::Addressee::List addresses = addressBook->allAddressees();
-  QStringList allcategories, aux;
+  TQStringList allcategories, aux;
 
   for ( KABC::Addressee::List::Iterator it = addresses.begin();
         it != addresses.end(); ++it ) {
     aux = ( *it ).categories();
-    for ( QStringList::ConstIterator itAux = aux.begin();
+    for ( TQStringList::ConstIterator itAux = aux.begin();
           itAux != aux.end(); ++itAux ) {
       // don't have duplicates in allcategories
       if ( allcategories.find( *itAux ) == allcategories.end() )