1 files changed, 68 insertions, 68 deletions

diff --git a/kmail/kmailicalifaceimpl.cpp b/kmail/kmailicalifaceimpl.cpp
index 05524e027..41e9f96d7 100644
--- a/kmail/kmailicalifaceimpl.cpp
+++ b/kmail/kmailicalifaceimpl.cpp
@@ -236,7 +236,7 @@ inline static void debugBodyParts( const char*, const KMMessage& ) {}
 
 // Add (or overwrite, resp.) an attachment in an existing mail,
 // attachments must be local files, they are identified by their names.
-// If lookupByName if false the attachment to replace is looked up by mimetype.
+// If lookupByName if false the attachment to tqreplace is looked up by mimetype.
 // return value: wrong if attachment could not be added/updated
 bool KMailICalIfaceImpl::updateAttachment( KMMessage& msg,
                                            const TQString& attachmentURL,
@@ -325,7 +325,7 @@ bool KMailICalIfaceImpl::kolabXMLFoundAndDecoded( const KMMessage& msg, const TQ
 // Delete an attachment in an existing mail.
 // return value: wrong if attachment could not be deleted
 //
-// This code could be optimized: for now we just replace
+// This code could be optimized: for now we just tqreplace
 // the attachment by an empty dummy attachment since Mimelib
 // does not provide an option for deleting attachments yet.
 bool KMailICalIfaceImpl::deleteAttachment( KMMessage& msg,
@@ -402,7 +402,7 @@ static void setXMLContentTypeHeader( KMMessage *msg, const TQString plainTextBod
 }
 
 // Store a new entry that was received from the resource
-Q_UINT32 KMailICalIfaceImpl::addIncidenceKolab( KMFolder& folder,
+TQ_UINT32 KMailICalIfaceImpl::addIncidenceKolab( KMFolder& folder,
                                                 const TQString& subject,
                                                 const TQString& plainTextBody,
                                                 const TQMap<TQCString, TQString>& customHeaders,
@@ -412,7 +412,7 @@ Q_UINT32 KMailICalIfaceImpl::addIncidenceKolab( KMFolder& folder,
 {
   kdDebug(5006) << "KMailICalIfaceImpl::addIncidenceKolab( " << attachmentNames << " )" << endl;
 
-  Q_UINT32 sernum = 0;
+  TQ_UINT32 sernum = 0;
   bool bAttachOK = true;
 
   // Make a new message for the incidence
@@ -477,7 +477,7 @@ Q_UINT32 KMailICalIfaceImpl::addIncidenceKolab( KMFolder& folder,
 }
 
 bool KMailICalIfaceImpl::deleteIncidenceKolab( const TQString& resource,
-                                               Q_UINT32 sernum )
+                                               TQ_UINT32 sernum )
 {
   // Find the message from the serial number and delete it.
   if( !mUseResourceIMAP )
@@ -530,7 +530,7 @@ int KMailICalIfaceImpl::incidencesKolabCount( const TQString& mimetype,
   return n;
 }
 
-TQMap<Q_UINT32, TQString> KMailICalIfaceImpl::incidencesKolab( const TQString& mimetype,
+TQMap<TQ_UINT32, TQString> KMailICalIfaceImpl::incidencesKolab( const TQString& mimetype,
                                                              const TQString& resource,
                                                              int startIndex,
                                                              int nbMessages )
@@ -539,7 +539,7 @@ TQMap<Q_UINT32, TQString> KMailICalIfaceImpl::incidencesKolab( const TQString& m
   /// TQMap with serialNumber/attachment pairs.
   /// (serial numbers of the mail are provided for easier later update)
 
-  TQMap<Q_UINT32, TQString> aMap;
+  TQMap<TQ_UINT32, TQString> aMap;
   if( !mUseResourceIMAP )
     return aMap;
 
@@ -613,7 +613,7 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
 
   KMFolder *parent = msg->parent();
   Q_ASSERT( parent );
-  Q_UINT32 sernum = msg->getMsgSerNum();
+  TQ_UINT32 sernum = msg->getMsgSerNum();
 
   // do we have an accumulator for this folder?
   Accumulator *ac = mAccumulators.find( parent->location() );
@@ -622,7 +622,7 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
     if ( !vPartFoundAndDecoded( msg, s ) ) return;
     TQString uid( "UID" );
     vPartMicroParser( s, uid );
-    const Q_UINT32 sernum = msg->getMsgSerNum();
+    const TQ_UINT32 sernum = msg->getMsgSerNum();
     mUIDToSerNum.insert( uid, sernum );
     ac->add( s );
     if( ac->isFull() ) {
@@ -637,7 +637,7 @@ void KMailICalIfaceImpl::slotMessageRetrieved( KMMessage* msg )
      slotIncidenceAdded( msg->parent(), msg->getMsgSerNum() );
   }
 
-  if ( mTheUnGetMes.contains( sernum ) ) {
+  if ( mTheUnGetMes.tqcontains( sernum ) ) {
     mTheUnGetMes.remove( sernum );
     int i = 0;
     KMFolder* folder = 0;
@@ -666,24 +666,24 @@ int KMailICalIfaceImpl::dimapAccounts()
 
 static TQString subresourceLabelForPresentation( const KMFolder * folder )
 {
-    if( KMailICalIfaceImpl::getResourceMap()->contains( folder->location() ) ) {
+    if( KMailICalIfaceImpl::getResourceMap()->tqcontains( folder->location() ) ) {
         return folder->label();
     }
 
     TQString label = folder->prettyURL();
-    TQStringList parts = TQStringList::split( TQString::fromLatin1("/"), label );
+    TQStringList parts = TQStringList::split( TQString::tqfromLatin1("/"), label );
 
     // In the common special case of some other user's folder shared with us
     // the url looks like "Server Name/user/$USERNAME/Folder/Name". Make
     // those a bit nicer.
-    if ( parts[1] == TQString::fromLatin1("user") ) {
+    if ( parts[1] == TQString::tqfromLatin1("user") ) {
         TQStringList remainder(parts);
         remainder.pop_front();
         remainder.pop_front();
         remainder.pop_front();
         label = i18n("%1's %2")
             .arg( parts[2] )
-            .arg( remainder.join( TQString::fromLatin1("/") ) );
+            .arg( remainder.join( TQString::tqfromLatin1("/") ) );
     }
     // Another special case is our own folders, under the imap INBOX, make
     // those prettier too
@@ -698,15 +698,15 @@ static TQString subresourceLabelForPresentation( const KMFolder * folder )
           // Fix kolab issue 2531 folder->storage() )->account() can be null
           if( folder->storage() && static_cast<const KMFolderCachedImap*>( folder->storage() )->account() ) {
           label = i18n( "My %1 (%2)")
-              .arg( remainder.join( TQString::fromLatin1("/") ),
+              .arg( remainder.join( TQString::tqfromLatin1("/") ),
                     static_cast<const KMFolderCachedImap*>( folder->storage() )->account()->name() );
           } else {
             label = i18n("My %1")
-              .arg( remainder.join( TQString::fromLatin1("/") ) );
+              .arg( remainder.join( TQString::tqfromLatin1("/") ) );
           }
         } else {
           label = i18n("My %1")
-              .arg( remainder.join( TQString::fromLatin1("/") ) );
+              .arg( remainder.join( TQString::tqfromLatin1("/") ) );
         }
         break;
       }
@@ -812,8 +812,8 @@ KMailICalIfaceImpl::StorageFormat KMailICalIfaceImpl::storageFormat( const TQStr
   // number, and the mail is just added instead. In this case
   // the deletedAttachments can be forgotten.
 */
-Q_UINT32 KMailICalIfaceImpl::update( const TQString& resource,
-                                     Q_UINT32 sernum,
+TQ_UINT32 KMailICalIfaceImpl::update( const TQString& resource,
+                                     TQ_UINT32 sernum,
                                      const TQString& subject,
                                      const TQString& plainTextBody,
                                      const TQMap<TQCString, TQString>& customHeaders,
@@ -822,7 +822,7 @@ Q_UINT32 KMailICalIfaceImpl::update( const TQString& resource,
                                      const TQStringList& attachmentNames,
                                      const TQStringList& deletedAttachments )
 {
-  Q_UINT32 rc = 0;
+  TQ_UINT32 rc = 0;
 
    if( !mUseResourceIMAP )
     return rc;
@@ -931,7 +931,7 @@ Q_UINT32 KMailICalIfaceImpl::update( const TQString& resource,
 }
 
 KURL KMailICalIfaceImpl::getAttachment( const TQString& resource,
-                                        Q_UINT32 sernum,
+                                        TQ_UINT32 sernum,
                                         const TQString& filename )
 {
   // This finds the attachment with the filename, saves it to a
@@ -991,7 +991,7 @@ KURL KMailICalIfaceImpl::getAttachment( const TQString& resource,
 }
 
 TQString KMailICalIfaceImpl::attachmentMimetype( const TQString & resource,
-                                                Q_UINT32 sernum,
+                                                TQ_UINT32 sernum,
                                                 const TQString & filename )
 {
   if( !mUseResourceIMAP )
@@ -1020,7 +1020,7 @@ TQString KMailICalIfaceImpl::attachmentMimetype( const TQString & resource,
   return TQString();
 }
 
-TQStringList KMailICalIfaceImpl::listAttachments(const TQString & resource, Q_UINT32 sernum)
+TQStringList KMailICalIfaceImpl::listAttachments(const TQString & resource, TQ_UINT32 sernum)
 {
   TQStringList rv;
   if( !mUseResourceIMAP )
@@ -1044,7 +1044,7 @@ TQStringList KMailICalIfaceImpl::listAttachments(const TQString & resource, Q_UI
         TQString name;
         DwMediaType& contentType = part->Headers().ContentType();
         if ( TQString( contentType.SubtypeStr().c_str() ).startsWith( "x-vnd.kolab." )
-           || TQString( contentType.SubtypeStr().c_str() ).contains( "tnef" ) )
+           || TQString( contentType.SubtypeStr().c_str() ).tqcontains( "tnef" ) )
           continue;
         if ( !part->Headers().ContentDisposition().Filename().empty() )
           name = part->Headers().ContentDisposition().Filename().c_str();
@@ -1080,7 +1080,7 @@ void KMailICalIfaceImpl::slotFolderRemoved( KMFolder* folder )
 
 // KMail added a file to one of the groupware folders
 void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
-                                             Q_UINT32 sernum )
+                                             TQ_UINT32 sernum )
 {
   if( mResourceQuiet || !mUseResourceIMAP )
     return;
@@ -1127,11 +1127,11 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
         folder->unGetMsg( i );
       return;
     }
-    const Q_UINT32 sernum = msg->getMsgSerNum();
+    const TQ_UINT32 sernum = msg->getMsgSerNum();
     mUIDToSerNum.insert( uid, sernum );
 
     // tell the resource if we didn't trigger this ourselves
-    if ( mInTransit.contains( uid ) ) {
+    if ( mInTransit.tqcontains( uid ) ) {
       mInTransit.remove( uid );
     }
     incidenceAdded( type, folder->location(), sernum, format, s );
@@ -1150,7 +1150,7 @@ void KMailICalIfaceImpl::slotIncidenceAdded( KMFolder* folder,
 
 // KMail deleted a file
 void KMailICalIfaceImpl::slotIncidenceDeleted( KMFolder* folder,
-                                               Q_UINT32 sernum )
+                                               TQ_UINT32 sernum )
 {
   if( mResourceQuiet || !mUseResourceIMAP )
     return;
@@ -1311,33 +1311,33 @@ TQString KMailICalIfaceImpl::folderName( KFolderTreeItem::Type type, int languag
        GroupwarePage in configuredialog.cpp */
 
     // English
-    folderNames[0][KFolderTreeItem::Calendar] = TQString::fromLatin1("Calendar");
-    folderNames[0][KFolderTreeItem::Tasks] = TQString::fromLatin1("Tasks");
-    folderNames[0][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal");
-    folderNames[0][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contacts");
-    folderNames[0][KFolderTreeItem::Notes] = TQString::fromLatin1("Notes");
+    folderNames[0][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Calendar");
+    folderNames[0][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Tasks");
+    folderNames[0][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal");
+    folderNames[0][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contacts");
+    folderNames[0][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notes");
 
     // German
-    folderNames[1][KFolderTreeItem::Calendar] = TQString::fromLatin1("Kalender");
-    folderNames[1][KFolderTreeItem::Tasks] = TQString::fromLatin1("Aufgaben");
-    folderNames[1][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal");
-    folderNames[1][KFolderTreeItem::Contacts] = TQString::fromLatin1("Kontakte");
-    folderNames[1][KFolderTreeItem::Notes] = TQString::fromLatin1("Notizen");
+    folderNames[1][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Kalender");
+    folderNames[1][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Aufgaben");
+    folderNames[1][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal");
+    folderNames[1][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Kontakte");
+    folderNames[1][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notizen");
 
     // French
-    folderNames[2][KFolderTreeItem::Calendar] = TQString::fromLatin1("Calendrier");
+    folderNames[2][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Calendrier");
     // Tasks = Tâches (â == 0xE2 in latin1)
-    folderNames[2][KFolderTreeItem::Tasks] = TQString::fromLatin1("T\342ches");
-    folderNames[2][KFolderTreeItem::Journals] = TQString::fromLatin1("Journal");
-    folderNames[2][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contacts");
-    folderNames[2][KFolderTreeItem::Notes] = TQString::fromLatin1("Notes");
+    folderNames[2][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("T\342ches");
+    folderNames[2][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Journal");
+    folderNames[2][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contacts");
+    folderNames[2][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notes");
 
     // Dutch
-    folderNames[3][KFolderTreeItem::Calendar] = TQString::fromLatin1("Agenda");
-    folderNames[3][KFolderTreeItem::Tasks] = TQString::fromLatin1("Taken");
-    folderNames[3][KFolderTreeItem::Journals] = TQString::fromLatin1("Logboek");
-    folderNames[3][KFolderTreeItem::Contacts] = TQString::fromLatin1("Contactpersonen");
-    folderNames[3][KFolderTreeItem::Notes] = TQString::fromLatin1("Notities");
+    folderNames[3][KFolderTreeItem::Calendar] = TQString::tqfromLatin1("Agenda");
+    folderNames[3][KFolderTreeItem::Tasks] = TQString::tqfromLatin1("Taken");
+    folderNames[3][KFolderTreeItem::Journals] = TQString::tqfromLatin1("Logboek");
+    folderNames[3][KFolderTreeItem::Contacts] = TQString::tqfromLatin1("Contactpersonen");
+    folderNames[3][KFolderTreeItem::Notes] = TQString::tqfromLatin1("Notities");
   }
 
   if( language < 0 || language > 3 ) {
@@ -1352,7 +1352,7 @@ TQString KMailICalIfaceImpl::folderName( KFolderTreeItem::Type type, int languag
 // Find message matching a given UID
 KMMessage *KMailICalIfaceImpl::findMessageByUID( const TQString& uid, KMFolder* folder )
 {
-  if( !folder || !mUIDToSerNum.contains( uid ) ) return 0;
+  if( !folder || !mUIDToSerNum.tqcontains( uid ) ) return 0;
   int i;
   KMFolder *aFolder;
   KMMsgDict::instance()->getLocation( mUIDToSerNum[uid], &aFolder, &i );
@@ -1361,7 +1361,7 @@ KMMessage *KMailICalIfaceImpl::findMessageByUID( const TQString& uid, KMFolder*
 }
 
 // Find message matching a given serial number
-KMMessage *KMailICalIfaceImpl::findMessageBySerNum( Q_UINT32 serNum, KMFolder* folder )
+KMMessage *KMailICalIfaceImpl::findMessageBySerNum( TQ_UINT32 serNum, KMFolder* folder )
 {
   if( !folder ) return 0;
 
@@ -1560,7 +1560,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL )
 {
   /* Steffen said: you must issue an authenticated HTTP GET request to
      https://kolabserver/freebusy/trigger/user@domain/Folder/NestedFolder.pfb
-     (replace .pfb with .xpfb for extended fb lists). */
+     (tqreplace .pfb with .xpfb for extended fb lists). */
   KURL httpURL( folderURL );
   // Keep username ("user@domain"), pass, and host from the imap url
   httpURL.setProtocol( "https" );
@@ -1575,7 +1575,7 @@ void KMailICalIfaceImpl::triggerKolabFreeBusy( const KURL& folderURL )
     return;
   }
   if ( path.startsWith( "/INBOX/", false ) ) {
-    // If INBOX, replace it with the username (which is user@domain)
+    // If INBOX, tqreplace it with the username (which is user@domain)
     path = path.mid( secondSlash );
     path.prepend( folderURL.user() );
   } else {
@@ -1922,8 +1922,8 @@ void KMailICalIfaceImpl::readConfig()
         KMFolderCachedImap *imapFolder = static_cast<KMFolderCachedImap*>( storage );
 
         const TQString attributes = imapFolder->folderAttributes();
-        if ( attributes.contains( "X-FolderClass" ) ) {
-          if ( !attributes.contains( "X-SpecialFolder" ) || (*it)->location().contains( "@" ) ) {
+        if ( attributes.tqcontains( "X-FolderClass" ) ) {
+          if ( !attributes.tqcontains( "X-SpecialFolder" ) || (*it)->location().tqcontains( "@" ) ) {
             const Scalix::FolderAttributeParser parser( attributes );
             if ( !parser.folderClass().isEmpty() ) {
               FolderContentsType type = Scalix::Utils::scalixIdToContentsType( parser.folderClass() );
@@ -2051,7 +2051,7 @@ KMFolder* KMailICalIfaceImpl::initScalixFolder( KMail::FolderContentsType conten
       KMFolderCachedImap *imapFolder = static_cast<KMFolderCachedImap*>( storage );
 
       const TQString attributes = imapFolder->folderAttributes();
-      if ( attributes.contains( "X-SpecialFolder" ) ) {
+      if ( attributes.tqcontains( "X-SpecialFolder" ) ) {
         const Scalix::FolderAttributeParser parser( attributes );
         if ( contentsType == Scalix::Utils::scalixIdToContentsType( parser.folderClass() ) ) {
           folder = *it;
@@ -2084,10 +2084,10 @@ KMFolder* KMailICalIfaceImpl::initScalixFolder( KMail::FolderContentsType conten
 void KMailICalIfaceImpl::connectFolder( KMFolder* folder )
 {
   // avoid multiple connections
-  disconnect( folder, TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ),
-              this, TQT_SLOT( slotIncidenceAdded( KMFolder*, Q_UINT32 ) ) );
-  disconnect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ),
-              this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, Q_UINT32 ) ) );
+  disconnect( folder, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
+              this, TQT_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) );
+  disconnect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
+              this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) );
   disconnect( folder, TQT_SIGNAL( expunged( KMFolder* ) ),
               this, TQT_SLOT( slotRefreshFolder( KMFolder* ) ) );
   disconnect( folder->storage(), TQT_SIGNAL( readOnlyChanged( KMFolder* ) ),
@@ -2098,10 +2098,10 @@ void KMailICalIfaceImpl::connectFolder( KMFolder* folder )
               this, TQT_SLOT( slotFolderLocationChanged( const TQString&, const TQString&) ) );
 
   // Setup the signals to listen for changes
-  connect( folder, TQT_SIGNAL( msgAdded( KMFolder*, Q_UINT32 ) ),
-           this, TQT_SLOT( slotIncidenceAdded( KMFolder*, Q_UINT32 ) ) );
-  connect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, Q_UINT32 ) ),
-           this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, Q_UINT32 ) ) );
+  connect( folder, TQT_SIGNAL( msgAdded( KMFolder*, TQ_UINT32 ) ),
+           this, TQT_SLOT( slotIncidenceAdded( KMFolder*, TQ_UINT32 ) ) );
+  connect( folder, TQT_SIGNAL( msgRemoved( KMFolder*, TQ_UINT32 ) ),
+           this, TQT_SLOT( slotIncidenceDeleted( KMFolder*, TQ_UINT32 ) ) );
   connect( folder, TQT_SIGNAL( expunged( KMFolder* ) ),
            this, TQT_SLOT( slotRefreshFolder( KMFolder* ) ) );
   connect( folder->storage(), TQT_SIGNAL( readOnlyChanged( KMFolder* ) ),
@@ -2139,15 +2139,15 @@ TQString KMailICalIfaceImpl::folderPixmap( KFolderTreeItem::Type type ) const
     return TQString::null;
 
   if( type == KFolderTreeItem::Contacts )
-    return TQString::fromLatin1( "kmgroupware_folder_contacts" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_contacts" );
   else if( type == KFolderTreeItem::Calendar )
-    return TQString::fromLatin1( "kmgroupware_folder_calendar" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_calendar" );
   else if( type == KFolderTreeItem::Notes )
-    return TQString::fromLatin1( "kmgroupware_folder_notes" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_notes" );
   else if( type == KFolderTreeItem::Tasks )
-    return TQString::fromLatin1( "kmgroupware_folder_tasks" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_tasks" );
   else if( type == KFolderTreeItem::Journals )
-    return TQString::fromLatin1( "kmgroupware_folder_journals" );
+    return TQString::tqfromLatin1( "kmgroupware_folder_journals" );
 
   return TQString::null;
 }