1 files changed, 19 insertions, 19 deletions

diff --git a/kmail/imapaccountbase.cpp b/kmail/imapaccountbase.cpp
index f1dbaae1..73253dfe 100644
--- a/kmail/imapaccountbase.cpp
+++ b/kmail/imapaccountbase.cpp
@@ -67,7 +67,7 @@ using KIO::PasswordDialog;
 //using KIO::Scheduler; // use FQN below
 
 #include <tqregexp.h>
-#include <tqstylesheet.h>
+#include <stylesheet.h>
 
 namespace KMail {
 
@@ -318,7 +318,7 @@ namespace KMail {
     mSlave = KIO::Scheduler::getConnectedSlave( getUrl(), slaveConfig() );
     if ( !mSlave ) {
       KMessageBox::error(0, i18n("Could not start process for %1.")
-			 .tqarg( getUrl().protocol() ) );
+			 .arg( getUrl().protocol() ) );
       return Error;
     }
     if ( mSlave->isConnected() ) {
@@ -400,7 +400,7 @@ namespace KMail {
     if (job->error())
     {
       if ( !(*it).quiet )
-        handleJobError( job, i18n( "Error while trying to subscribe to %1:" ).tqarg( path ) + '\n' );
+        handleJobError( job, i18n( "Error while trying to subscribe to %1:" ).arg( path ) + '\n' );
       emit subscriptionChangeFailed( job->errorString() );
       // ## emit subscriptionChanged here in case anyone needs it to support continue/cancel
     }
@@ -735,7 +735,7 @@ namespace KMail {
       if ( !done ) {
         TQString msg = i18n("KMail has detected a prefix entry in the "
             "configuration of the account \"%1\" which is obsolete with the "
-            "support of IMAP namespaces.").tqarg( name() );
+            "support of IMAP namespaces.").arg( name() );
         if ( list.contains( "" ) ) {
           // replace empty entry with the old prefix
           list.remove( "" );
@@ -879,13 +879,13 @@ namespace KMail {
     KMMessage* msg = jd.msgList.first();
     // Use double-quotes around the subject to keep the sentence readable,
     // but don't use double quotes around the sender since from() might return a double-quoted name already
-    const TQString subject = msg->subject().isEmpty() ? i18n( "<unknown>" ) : TQString("\"%1\"").tqarg( msg->subject() );
+    const TQString subject = msg->subject().isEmpty() ? i18n( "<unknown>" ) : TQString("\"%1\"").arg( msg->subject() );
     const TQString from = msg->from().isEmpty() ? i18n( "<unknown>" ) : msg->from();
     TQString myError = "<p><b>" + i18n("Error while uploading message")
       + "</b></p><p>"
-      + i18n("Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> to the server.").tqarg( msg->dateStr(), TQStyleSheet::escape( from ), TQStyleSheet::escape( subject ) )
+      + i18n("Could not upload the message dated %1 from <i>%2</i> with subject <i>%3</i> to the server.").arg( msg->dateStr(), TQStyleSheet::escape( from ), TQStyleSheet::escape( subject ) )
       + "</p><p>"
-      + i18n("The destination folder was: <b>%1</b>.").tqarg( TQStyleSheet::escape( folder->prettyURL() ) )
+      + i18n("The destination folder was: <b>%1</b>.").arg( TQStyleSheet::escape( folder->prettyURL() ) )
       + "</p><p>"
       + i18n("The server reported:") + "</p>";
     return handleJobError( job, myError );
@@ -908,7 +908,7 @@ namespace KMail {
           }
           readOnly = folder->isReadOnly();
       }
-      error = i18n("The folder is too close to its quota limit. (%1)").tqarg( quotaAsString );
+      error = i18n("The folder is too close to its quota limit. (%1)").arg( quotaAsString );
       if ( readOnly ) {
           error += i18n("\nSince you do not have write privileges on this folder, "
                         "please ask the owner of the folder to free up some space in it.");
@@ -962,10 +962,10 @@ namespace KMail {
           // Show it in the status bar, in case the user has ticked "don't show again"
           if ( errorCode == KIO::ERR_CONNECTION_BROKEN )
             KPIM::BroadcastStatus::instance()->seStatusMsg(
-                i18n(  "The connection to account %1 was broken." ).tqarg( name() ) );
+                i18n(  "The connection to account %1 was broken." ).arg( name() ) );
           else if ( errorCode == KIO::ERR_SERVER_TIMEOUT )
             KPIM::BroadcastStatus::instance()->seStatusMsg(
-                i18n(  "The connection to account %1 timed out." ).tqarg( name() ) );
+                i18n(  "The connection to account %1 timed out." ).arg( name() ) );
         } else {
           if ( !errors.isEmpty() )
               KMessageBox::detailedError( TQT_TQWIDGET(kapp->activeWindow()), msg, errors.join("\n").prepend("<qt>"), caption );
@@ -1031,9 +1031,9 @@ namespace KMail {
     mCheckingSingleFolder = ( type == Single );
     if ( checkingMail() )
     {
-      disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
+      disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
                   this, TQT_SLOT( slotCheckQueuedFolders() ) );
-      connect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
+      connect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
                this, TQT_SLOT( slotCheckQueuedFolders() ) );
     } else {
       slotCheckQueuedFolders();
@@ -1043,7 +1043,7 @@ namespace KMail {
   //-----------------------------------------------------------------------------
   void ImapAccountBase::slotCheckQueuedFolders()
   {
-    disconnect( this, TQT_SIGNAL( finishedCheck( bool, ChecktqStatus ) ),
+    disconnect( this, TQT_SIGNAL( finishedCheck( bool, CheckStatus ) ),
                 this, TQT_SLOT( slotCheckQueuedFolders() ) );
 
     TQValueList<TQGuardedPtr<KMFolder> > mSaveList = mMailCheckFolders;
@@ -1141,10 +1141,10 @@ namespace KMail {
   void ImapAccountBase::constructParts( TQDataStream & stream, int count, KMMessagePart* parentKMPart,
                                         DwBodyPart * parent, const DwMessage * dwmsg )
   {
-    int tqchildren;
+    int children;
     for (int i = 0; i < count; i++)
     {
-      stream >> tqchildren;
+      stream >> children;
       KMMessagePart* part = new KMMessagePart( stream );
       part->setParent( parentKMPart );
       mBodyPartList.append( part );
@@ -1173,7 +1173,7 @@ namespace KMail {
       if ( !parentKMPart )
         parentKMPart = part;
 
-      if (tqchildren > 0)
+      if (children > 0)
       {
         DwBodyPart* newparent = dwpart;
         const DwMessage* newmsg = dwmsg;
@@ -1188,13 +1188,13 @@ namespace KMail {
         if ( part->partSpecifier().endsWith(".HEADER") ) // we don't want headers as parent
           newParentKMPart = parentKMPart;
 
-        constructParts( stream, tqchildren, newParentKMPart, newparent, newmsg );
+        constructParts( stream, children, newParentKMPart, newparent, newmsg );
       }
     }
   }
 
   //-----------------------------------------------------------------------------
-  void ImapAccountBase::setImaptqStatus( KMFolder* folder, const TQString& path, const TQCString& flags )
+  void ImapAccountBase::setImapStatus( KMFolder* folder, const TQString& path, const TQCString& flags )
   {
      // set the status on the server, the uids are integrated in the path
      kdDebug(5006) << "setImapStatus path=" << path << " to: " << flags << endl;
@@ -1218,7 +1218,7 @@ namespace KMail {
            TQT_SLOT(slotSeStatusResult(KIO::Job *)));
   }
 
-  void ImapAccountBase::setImapSeentqStatus(KMFolder * folder, const TQString & path, bool seen)
+  void ImapAccountBase::setImapSeenStatus(KMFolder * folder, const TQString & path, bool seen)
   {
      KURL url = getUrl();
      url.setPath(path);