Enable kdepim compilation under Qt4

This will likely break Qt3 compilation temporarily, which is an unintended side effect.
A third and final kdepim commit will repair Qt3 compilation shortly.


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227946 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 23 insertions, 23 deletions

diff --git a/kmail/kmcommands.cpp b/kmail/kmcommands.cpp
index 1473d3d6..ba4a84e7 100644
--- a/kmail/kmcommands.cpp
+++ b/kmail/kmcommands.cpp
@@ -586,7 +586,7 @@ KMUrlCopyCommand::KMUrlCopyCommand( const KURL &url, KMMainWidget *mainWidget )
 
 KMCommand::Result KMUrlCopyCommand::execute()
 {
-  TQClipboard* clip = TQApplication::clipboard();
+  TQClipboard* clip = TQApplication::tqclipboard();
 
   if (mUrl.protocol() == "mailto") {
     // put the url into the mouse selection and the clipboard
@@ -640,7 +640,7 @@ KMCommand::Result KMUrlSaveCommand::execute()
   {
     if (KMessageBox::warningContinueCancel(0,
         i18n("<qt>File <b>%1</b> exists.<br>Do you want to replace it?</qt>")
-        .arg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
+        .tqarg(saveUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         != KMessageBox::Continue)
       return Canceled;
   }
@@ -963,7 +963,7 @@ void KMSaveMsgCommand::slotSaveResult(KIO::Job *job)
     {
       if (KMessageBox::warningContinueCancel(0,
         i18n("File %1 exists.\nDo you want to replace it?")
-        .arg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
+        .tqarg(mUrl.prettyURL()), i18n("Save to File"), i18n("&Replace"))
         == KMessageBox::Continue) {
         mOffset = 0;
 
@@ -1397,12 +1397,12 @@ KMCommand::Result KMForwardDigestCommand::execute()
     msgPartText += "--";
     msgPartText += TQString::tqfromLatin1( boundary );
     msgPartText += "\nContent-Type: MESSAGE/RFC822";
-    msgPartText += TQString( "; CHARSET=%1" ).arg( msg->charset() );
+    msgPartText += TQString( "; CHARSET=%1" ).tqarg( TQString(msg->charset()) );
     msgPartText += '\n';
     DwHeaders dwh;
     dwh.MessageId().CreateDefault();
-    msgPartText += TQString( "Content-ID: %1\n" ).arg( dwh.MessageId().AsString().c_str() );
-    msgPartText += TQString( "Content-Description: %1" ).arg( msg->subject() );
+    msgPartText += TQString( "Content-ID: %1\n" ).tqarg( dwh.MessageId().AsString().c_str() );
+    msgPartText += TQString( "Content-Description: %1" ).tqarg( msg->subject() );
     if ( !msg->subject().tqcontains( "(fwd)" ) )
       msgPartText += " (fwd)";
     msgPartText += "\n\n";
@@ -1430,7 +1430,7 @@ KMCommand::Result KMForwardDigestCommand::execute()
   msgPart->setSubtypeStr( tmp );
   msgPart->setName( "unnamed" );
   msgPart->setCte( DwMime::kCte7bit );   // does it have to be 7bit?
-  msgPart->setContentDescription( TQString( "Digest of %1 messages." ).arg( msgCnt ) );
+  msgPart->setContentDescription( TQString( "Digest of %1 messages." ).tqarg( msgCnt ) );
   // THIS HAS TO BE AFTER setCte()!!!!
   msgPart->setBodyEncoded( TQCString( msgPartText.ascii() ) );
   KCursorSaver busy( KBusyPtr::busy() );
@@ -1741,7 +1741,7 @@ KMCommand::Result KMFilterActionCommand::execute()
     if ( diff < 10 || !( msgCount % 20 ) || msgCount <= 10 ) {
       progressItem->updateProgress();
       TQString statusMsg = i18n("Filtering message %1 of %2");
-      statusMsg = statusMsg.arg( msgCount ).arg( msgCountToFilter );
+      statusMsg = statusMsg.tqarg( msgCount ).tqarg( msgCountToFilter );
       KPIM::BroadcastqStatus::instance()->seStatusMsg( statusMsg );
       KApplication::kApplication()->eventLoop()->processEvents( TQEventLoop::ExcludeUserInput, 50 );
     }
@@ -1849,7 +1849,7 @@ void KMMenuCommand::folderToPopupMenu(bool move,
 {
   while ( menu->count() )
   {
-    TQPopupMenu *popup = menu->findItem( menu->idAt( 0 ) )->popup();
+    TQPopupMenu *popup = menu->tqfindItem( menu->idAt( 0 ) )->popup();
     if (popup)
       delete popup;
     else
@@ -1995,7 +1995,7 @@ KMCommand::Result KMCopyCommand::execute()
       // corrupt IMAP cache, see FolderStorage::getMsg()
       if ( msg == 0 ) {
         KMessageBox::error( tqparentWidget(), i18n("Corrupt IMAP cache detected in folder %1. "
-            "Copying of messages aborted.").arg( srcFolder->prettyURL() ) );
+            "Copying of messages aborted.").tqarg( srcFolder->prettyURL() ) );
         deleteLater();
         return Failed;
       }
@@ -2461,7 +2461,7 @@ KMCommand::Result KMUrlClickedCommand::execute()
         mime->name() == "application/x-shellscript" )
     {
       if (KMessageBox::warningYesNo( 0, i18n( "<qt>Do you really want to execute <b>%1</b>?</qt>" )
-        .arg( mUrl.prettyURL() ), TQString(), i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes)
+        .tqarg( mUrl.prettyURL() ), TQString(), i18n("Execute"), KStdGuiItem::cancel() ) != KMessageBox::Yes)
         return Canceled;
     }
     KRun * runner = new KRun( mUrl );
@@ -2605,7 +2605,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
         ++unnamedAtmCount;
         s = i18n("filename for the %1-th unnamed attachment",
                  "attachment.%1")
-            .arg( unnamedAtmCount );
+            .tqarg( unnamedAtmCount );
       }
       curUrl.setFileName( s );
     } else {
@@ -2622,7 +2622,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
      while ( renameNumbering.tqcontains(file) ) {
        file = origFile;
        int num = renameNumbering[file] + 1;
-       int dotIdx = file.findRev('.');
+       int dotIdx = file.tqfindRev('.');
        file = file.insert( (dotIdx>=0) ? dotIdx : file.length(), TQString("_") + TQString::number(num) );
      }
      curUrl.setFileName(file);
@@ -2644,7 +2644,7 @@ void KMSaveAttachmentsCommand::slotSaveAll()
       if ( KIO::NetAccess::exists( curUrl, false, tqparentWidget() ) ) {
         if ( KMessageBox::warningContinueCancel( tqparentWidget(),
               i18n( "A file named %1 already exists. Do you want to overwrite it?" )
-              .arg( curUrl.fileName() ),
+              .tqarg( curUrl.fileName() ),
               i18n( "File Already Exists" ), i18n("&Overwrite") ) == KMessageBox::Cancel) {
           continue;
         }
@@ -2752,8 +2752,8 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
       KMessageBox::error( tqparentWidget(),
           i18n( "%2 is detailed error description",
             "Could not write the file %1:\n%2" )
-          .arg( file.name() )
-          .arg( TQString::fromLocal8Bit( strerror( errno ) ) ),
+          .tqarg( file.name() )
+          .tqarg( TQString::fromLocal8Bit( strerror( errno ) ) ),
           i18n( "KMail Error" ) );
       return Failed;
     }
@@ -2777,7 +2777,7 @@ KMCommand::Result KMSaveAttachmentsCommand::saveItem( partNode *node,
     {
       KMessageBox::error( tqparentWidget(),
           i18n( "Could not write the file %1." )
-          .arg( url.path() ),
+          .tqarg( url.path() ),
           i18n( "KMail Error" ) );
       return Failed;
     }
@@ -3012,7 +3012,7 @@ KMCommand::Result KMIMChatCommand::execute()
           nameList.append( (*it).realName() );
       }
       TQString names = nameList.join( TQString::tqfromLatin1( ",\n" ) );
-      apology = apology.arg( names );
+      apology = apology.tqarg( names );
     }
 
     KMessageBox::sorry( tqparentWidget(), apology );
@@ -3216,7 +3216,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
     return;
 
   // FIXME: better detection of mimetype??
-  if ( !mAtmName.endsWith( ".xia", false ) )
+  if ( !mAtmName.tqendsWith( ".xia", false ) )
     return;
 
   const Kleo::CryptoBackend::Protocol * chiasmus =
@@ -3297,7 +3297,7 @@ void KMHandleAttachmentCommand::atmEncryptWithChiasmus()
 }
 
 static const TQString chomp( const TQString & base, const TQString & suffix, bool cs ) {
-  return base.endsWith( suffix, cs ) ? base.left( base.length() - suffix.length() ) : base ;
+  return base.tqendsWith( suffix, cs ) ? base.left( base.length() - suffix.length() ) : base ;
 }
 
 void KMHandleAttachmentCommand::slotAtmDecryptWithChiasmusResult( const GpgME::Error & err, const TQVariant & result )
@@ -3563,8 +3563,8 @@ KMCommand::Result CreateTodoCommand::execute()
 
   KMail::KorgHelper::ensureRunning();
 
-  TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").arg( msg->from() )
-                .arg( msg->to() ).arg( msg->subject() );
+  TQString txt = i18n("From: %1\nTo: %2\nSubject: %3").tqarg( msg->from() )
+                .tqarg( msg->to() ).tqarg( msg->subject() );
 
   KTempFile tf;
   tf.setAutoDelete( true );
@@ -3573,7 +3573,7 @@ KMCommand::Result CreateTodoCommand::execute()
   tf.close();
 
   KCalendarIface_stub *iface = new KCalendarIface_stub( kapp->dcopClient(), "korganizer", "CalendarIface" );
-  iface->openTodoEditor( i18n("Mail: %1").arg( msg->subject() ), txt, uri,
+  iface->openTodoEditor( i18n("Mail: %1").tqarg( msg->subject() ), txt, uri,
                          tf.name(), TQStringList(), "message/rfc822", true );
   delete iface;