1 files changed, 9 insertions, 9 deletions

diff --git a/kmail/networkaccount.cpp b/kmail/networkaccount.cpp
index 4721e1e12..b0d56a509 100644
--- a/kmail/networkaccount.cpp
+++ b/kmail/networkaccount.cpp
@@ -49,8 +49,8 @@ namespace KMail {
  // for restricting number of concurrent connections to the same server
   static TQMap<TQString, int> s_serverConnections;
 
-  NetworkAccount::NetworkAccount( AccountManager * parent, const TQString & name, uint id )
-    : KMAccount( parent, name, id ),
+  NetworkAccount::NetworkAccount( AccountManager * tqparent, const TQString & name, uint id )
+    : KMAccount( tqparent, name, id ),
       mSlave( 0 ),
       mAuth( "*" ),
       mPort( 0 ),
@@ -72,10 +72,10 @@ namespace KMail {
     KMAccount::init();
 
     mSieveConfig = SieveConfig();
-    mLogin = TQString::null;
-    mPasswd = TQString::null;
+    mLogin = TQString();
+    mPasswd = TQString();
     mAuth = "*";
-    mHost = TQString::null;
+    mHost = TQString();
     mPort = defaultPort();
     mStorePasswd = false;
     mUseSSL = false;
@@ -321,7 +321,7 @@ namespace KMail {
       if ( host().isEmpty() )
           return;
     if ( checking ) {
-        if ( s_serverConnections.find( host() ) != s_serverConnections.end() )
+        if ( s_serverConnections.tqfind( host() ) != s_serverConnections.end() )
             s_serverConnections[host()] += 1;
         else
             s_serverConnections[host()] = 1;
@@ -329,7 +329,7 @@ namespace KMail {
                 << host() << " now is "
                 << s_serverConnections[host()] << endl;
     } else {
-            if ( s_serverConnections.find( host() ) != s_serverConnections.end() &&
+            if ( s_serverConnections.tqfind( host() ) != s_serverConnections.end() &&
                 s_serverConnections[host()] > 0 ) {
                 s_serverConnections[host()] -= 1;
                 kdDebug(5006) << "connections to server " << host()
@@ -344,12 +344,12 @@ namespace KMail {
 
       kdDebug(5006) << "for host " << host()
               << " current connections="
-              << (s_serverConnections.find(host())==s_serverConnections.end() ? 0 : s_serverConnections[host()])
+              << (s_serverConnections.tqfind(host())==s_serverConnections.end() ? 0 : s_serverConnections[host()])
               << " and limit is " << GlobalSettings::self()->maxConnectionsPerHost()
               << endl;
       bool connectionLimitForHostReached = !host().isEmpty()
               && GlobalSettings::self()->maxConnectionsPerHost() > 0
-              && s_serverConnections.find( host() ) != s_serverConnections.end()
+              && s_serverConnections.tqfind( host() ) != s_serverConnections.end()
               && s_serverConnections[host()] >= GlobalSettings::self()->maxConnectionsPerHost();
       kdDebug(5006) << "connection limit reached: "
               << connectionLimitForHostReached << endl;