1 files changed, 18 insertions, 18 deletions

diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp
index 3639ab7b5..4721e1e12 100644
--- a/kmail/networkaccount.cpp
+++ b/kmail/networkaccount.cpp
@@ -47,9 +47,9 @@ namespace KMail {
 
     
  // for restricting number of concurrent connections to the same server
-  static QMap<QString, int> s_serverConnections;
+  static TQMap<TQString, int> s_serverConnections;
 
-  NetworkAccount::NetworkAccount( AccountManager * parent, const QString & name, uint id )
+  NetworkAccount::NetworkAccount( AccountManager * parent, const TQString & name, uint id )
     : KMAccount( parent, name, id ),
       mSlave( 0 ),
       mAuth( "*" ),
@@ -72,10 +72,10 @@ namespace KMail {
     KMAccount::init();
 
     mSieveConfig = SieveConfig();
-    mLogin = QString::null;
-    mPasswd = QString::null;
+    mLogin = TQString::null;
+    mPasswd = TQString::null;
     mAuth = "*";
-    mHost = QString::null;
+    mHost = TQString::null;
     mPort = defaultPort();
     mStorePasswd = false;
     mUseSSL = false;
@@ -89,17 +89,17 @@ namespace KMail {
   //
   //
 
-  void NetworkAccount::setLogin( const QString & login ) {
+  void NetworkAccount::setLogin( const TQString & login ) {
     mLogin = login;
   }
 
-  QString NetworkAccount::passwd() const {
+  TQString NetworkAccount::passwd() const {
     if ( storePasswd() && mPasswd.isEmpty() )
       mOwner->readPasswords();
     return decryptStr( mPasswd );
   }
 
-  void NetworkAccount::setPasswd( const QString & passwd, bool storeInConfig ) {
+  void NetworkAccount::setPasswd( const TQString & passwd, bool storeInConfig ) {
     if ( mPasswd != encryptStr( passwd ) ) {
       mPasswd = encryptStr( passwd );
       mPasswdDirty = true;
@@ -111,7 +111,7 @@ namespace KMail {
     setPasswd( "", false );
   }
 
-  void NetworkAccount::setAuth( const QString & auth ) {
+  void NetworkAccount::setAuth( const TQString & auth ) {
     mAuth = auth;
   }
 
@@ -121,7 +121,7 @@ namespace KMail {
     mStorePasswd = store;
   }
 
-  void NetworkAccount::setHost( const QString & host ) {
+  void NetworkAccount::setHost( const TQString & host ) {
     mHost = host;
   }
 
@@ -154,7 +154,7 @@ namespace KMail {
 
     if ( config.readNumEntry( "store-passwd", false ) ) { // ### s/Num/Bool/
       mStorePasswd = true;
-      QString encpasswd = config.readEntry( "pass" );
+      TQString encpasswd = config.readEntry( "pass" );
       if ( encpasswd.isEmpty() ) {
         encpasswd = config.readEntry( "passwd" );
         if ( !encpasswd.isEmpty() ) encpasswd = importPassword( encpasswd );
@@ -206,7 +206,7 @@ namespace KMail {
       bool passwdStored = false;
       if ( mPasswdDirty ) {
         Wallet *wallet = kmkernel->wallet();
-        if ( wallet && wallet->writePassword( "account-" + QString::number(mId), passwd() ) == 0 ) {
+        if ( wallet && wallet->writePassword( "account-" + TQString::number(mId), passwd() ) == 0 ) {
           passwdStored = true;
           mPasswdDirty = false;
           mStorePasswdInConfig = false;
@@ -236,10 +236,10 @@ namespace KMail {
 
     // delete password from the wallet if password storage is disabled
     if (!storePasswd() && !Wallet::keyDoesNotExist(
-        Wallet::NetworkWallet(), "kmail", "account-" + QString::number(mId))) {
+        Wallet::NetworkWallet(), "kmail", "account-" + TQString::number(mId))) {
       Wallet *wallet = kmkernel->wallet();
       if (wallet)
-        wallet->removeEntry( "account-" + QString::number(mId) );
+        wallet->removeEntry( "account-" + TQString::number(mId) );
     }
 
     config.writeEntry( "host", host() );
@@ -298,18 +298,18 @@ namespace KMail {
     if ( Wallet::isOpen( Wallet::NetworkWallet() ) )
     {
        Wallet *wallet = kmkernel->wallet();
-       if (!wallet || !wallet->hasEntry( "account-" + QString::number(mId) ) )
+       if (!wallet || !wallet->hasEntry( "account-" + TQString::number(mId) ) )
          return;
     }
     else
     {
-       if (Wallet::keyDoesNotExist( Wallet::NetworkWallet(), "kmail", "account-" + QString::number(mId) ) )
+       if (Wallet::keyDoesNotExist( Wallet::NetworkWallet(), "kmail", "account-" + TQString::number(mId) ) )
          return;
     }
 
     if ( kmkernel->wallet() ) {
-      QString passwd;
-      kmkernel->wallet()->readPassword( "account-" + QString::number(mId), passwd );
+      TQString passwd;
+      kmkernel->wallet()->readPassword( "account-" + TQString::number(mId), passwd );
       setPasswd( passwd, true );
       mPasswdDirty = false;
     }