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

6 files changed, 18 insertions, 18 deletions

diff --git a/libkpimexchange/core/CMakeLists.txt b/libkpimexchange/core/CMakeLists.txt
index a91cedb00..e1d246cad 100644
--- a/libkpimexchange/core/CMakeLists.txt
+++ b/libkpimexchange/core/CMakeLists.txt
@@ -40,6 +40,6 @@ tde_add_library( kpimexchange SHARED AUTOMOC
     exchangeclient.cpp exchangeaccount.cpp exchangedownload.cpp exchangeupload.cpp
     exchangedelete.cpp utils.cpp exchangeprogress.cpp exchangemonitor.cpp
   VERSION 1.0.0
-  LINK kcal-shared
+  LINK ${TQT_LIBRARIES} kcal-shared
   DESTINATION ${LIB_INSTALL_DIR}
 )
diff --git a/libkpimexchange/core/exchangeaccount.cpp b/libkpimexchange/core/exchangeaccount.cpp
index 01ca1f02c..14b465605 100644
--- a/libkpimexchange/core/exchangeaccount.cpp
+++ b/libkpimexchange/core/exchangeaccount.cpp
@@ -249,7 +249,7 @@ void ExchangeAccount::slotFolderResult( KIO::Job *job )
   if ( job->error() ) {
     kdError() << "Error: Cannot get well-know folder names; " << job->error() << endl;
     TQString text = i18n("ExchangeAccount\nError accessing '%1': %2")
-                   .arg( baseURL().prettyURL() ).arg( job->errorString() );
+                   .tqarg( baseURL().prettyURL() ).tqarg( job->errorString() );
     KMessageBox::error( 0, text );
     mError = true;
     return;
diff --git a/libkpimexchange/core/exchangedownload.cpp b/libkpimexchange/core/exchangedownload.cpp
index a13672d90..cb941711f 100644
--- a/libkpimexchange/core/exchangedownload.cpp
+++ b/libkpimexchange/core/exchangedownload.cpp
@@ -182,8 +182,8 @@ void ExchangeDownload::slotSearchResult( KIO::Job *job )
     kdError() << "ExchangeDownload::slotSearchResult() error: "
               << job->error() << endl;
     TQString text = i18n("ExchangeDownload\nError accessing '%1': %2")
-                   .arg( mAccount->calendarURL().prettyURL() )
-                   .arg( job->errorString() );
+                   .tqarg( mAccount->calendarURL().prettyURL() )
+                   .tqarg( job->errorString() );
     KMessageBox::error( 0, text );
     finishUp( ExchangeClient::CommunicationError, job );
     return;
@@ -401,7 +401,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job )
 
   TQString lastModified = prop.namedItem( "lastmodified" ).toElement().text();
   if ( !lastModified.isEmpty() ) {
-    TQDateTime dt = utcAsZone( TQDateTime::fromString( lastModified, TQt::ISODate ), localTimeZoneId );
+    TQDateTime dt = utcAsZone( TQDateTime::fromString( lastModified, Qt::ISODate ), localTimeZoneId );
     event->setLastModified( dt );
     kdDebug() << "Got lastModified:" << lastModified << ", " << dt.toString() << endl;
   }
@@ -436,7 +436,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job )
 
   TQString created = prop.namedItem( "created" ).toElement().text();
   if ( !created.isEmpty() ) {
-    TQDateTime dt = utcAsZone( TQDateTime::fromString( created, TQt::ISODate ),
+    TQDateTime dt = utcAsZone( TQDateTime::fromString( created, Qt::ISODate ),
                     localTimeZoneId );
     event->setCreated( dt );
     kdDebug() << "got created: " << dt.toString() << endl;
@@ -444,7 +444,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job )
 
   TQString dtstart = prop.namedItem( "dtstart" ).toElement().text();
   if ( !dtstart.isEmpty() ) {
-    TQDateTime dt = utcAsZone( TQDateTime::fromString( dtstart, TQt::ISODate ),
+    TQDateTime dt = utcAsZone( TQDateTime::fromString( dtstart, Qt::ISODate ),
                               localTimeZoneId );
     event->setDtStart( dt );
     kdDebug() << "got dtstart: " << dtstart << " becomes in timezone " << dt.toString() << endl;
@@ -457,7 +457,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job )
 
   TQString dtend = prop.namedItem( "dtend" ).toElement().text();
   if ( !dtend.isEmpty() ) {
-    TQDateTime dt = utcAsZone( TQDateTime::fromString( dtend, TQt::ISODate ),
+    TQDateTime dt = utcAsZone( TQDateTime::fromString( dtend, Qt::ISODate ),
                               localTimeZoneId );
     // Outlook thinks differently about floating event timing than libkcal
     if ( floats ) dt = dt.addDays( -1 );
@@ -510,7 +510,7 @@ void ExchangeDownload::slotPropFindResult( KIO::Job *job )
   list = exdate.elementsByTagNameNS( "xml:", "v" );
   for( uint i=0; i < list.count(); i++ ) {
     TQDomElement item = list.item(i).toElement();
-    TQDate date = utcAsZone( TQDateTime::fromString( item.text(), TQt::ISODate ), localTimeZoneId ).date();
+    TQDate date = utcAsZone( TQDateTime::fromString( item.text(), Qt::ISODate ), localTimeZoneId ).date();
     exdates.append( date );
     // kdDebug() << "Got exdate: " << date.toString() << endl;
   }
diff --git a/libkpimexchange/core/exchangemonitor.cpp b/libkpimexchange/core/exchangemonitor.cpp
index ddb953135..b88510daf 100644
--- a/libkpimexchange/core/exchangemonitor.cpp
+++ b/libkpimexchange/core/exchangemonitor.cpp
@@ -104,7 +104,7 @@ ExchangeMonitor::ExchangeMonitor( ExchangeAccount* account, int pollMode, const
     //   kdError() << "Error in socket listen: " << code << endl;
     //mSocket.enableRead( true );
     kdDebug() << "Port: " << mSocket->port() << endl;
-    kdDebug() << "Host: " << mSocket->address().toString() << endl;
+    kdDebug() << "Host: " << TQString(mSocket->address().toString()) << endl;
     //  mStream = new TQTextStream( mSocket );
   }
 
@@ -303,7 +303,7 @@ void ExchangeMonitor::slotActivated( int )
   for ( it = lines.begin(); it != lines.end(); ++it ) {
     TQString line = (*it).stripWhiteSpace().lower();
     if ( line.startsWith( "subscription-id: " ) )
-      IDs = makeIDList( line.section(":",1).stripWhiteSpace() );
+      IDs = makeIDList( TQString(line.section(":",1)).stripWhiteSpace() );
   }
 
   if ( IDs.isEmpty() ) {
diff --git a/libkpimexchange/core/exchangeprogress.cpp b/libkpimexchange/core/exchangeprogress.cpp
index 84be823ae..a8fad42f9 100644
--- a/libkpimexchange/core/exchangeprogress.cpp
+++ b/libkpimexchange/core/exchangeprogress.cpp
@@ -65,7 +65,7 @@ void ExchangeProgress::slotTransferFinished()
 void ExchangeProgress::updateLabel()
 {
   progressBar()->setValue( m_finished );
-  TQString str = i18n( "Downloading, %1 of %2" ).arg( m_finished ).arg( m_total );
+  TQString str = i18n( "Downloading, %1 of %2" ).tqarg( m_finished ).tqarg( m_total );
   setLabel( str );
 }
 
diff --git a/libkpimexchange/core/exchangeupload.cpp b/libkpimexchange/core/exchangeupload.cpp
index 6582e57ea..50159fecf 100644
--- a/libkpimexchange/core/exchangeupload.cpp
+++ b/libkpimexchange/core/exchangeupload.cpp
@@ -253,20 +253,20 @@ void ExchangeUpload::startUpload( const KURL &url )
   if ( tzOffset == 0 ) 
     offsetString = "Z";
   else if ( tzOffset > 0 ) 
-    offsetString = TQString( "+%1:%2" ).arg(tzOffset/60, 2).arg( tzOffset%60, 2 );
+    offsetString = TQString( "+%1:%2" ).tqarg(tzOffset/60, 2).tqarg( tzOffset%60, 2 );
   else
-    offsetString = TQString( "-%1:%2" ).arg((-tzOffset)/60, 2).arg( (-tzOffset)%60, 2 );
+    offsetString = TQString( "-%1:%2" ).tqarg((-tzOffset)/60, 2).tqarg( (-tzOffset)%60, 2 );
   offsetString = offsetString.tqreplace( TQRegExp(" "), "0" );
 
   kdDebug() << "Timezone offset: " << tzOffset << " : " << offsetString << endl;
   kdDebug() << "ExchangeUpload::mTimeZoneId=" << mTimeZoneId << endl;
 
   addElement( doc, prop, "urn:schemas:calendar:", "dtstart", 
-      zoneAsUtc( event->dtStart(), mTimeZoneId ).toString( TQt::ISODate ) + "Z" );
+      zoneAsUtc( event->dtStart(), mTimeZoneId ).toString( Qt::ISODate ) + "Z" );
   //    event->dtStart().toString( "yyyy-MM-ddThh:mm:ss.zzzZ" ) );
   //    2002-06-04T08:00:00.000Z" );
   addElement( doc, prop, "urn:schemas:calendar:", "dtend", 
-      zoneAsUtc( event->dtEnd(), mTimeZoneId ).toString( TQt::ISODate ) + "Z" );
+      zoneAsUtc( event->dtEnd(), mTimeZoneId ).toString( Qt::ISODate ) + "Z" );
 #if 0
   addElement( doc, prop, "urn:schemas:calendar:", "dtstart", 
       event->dtStart().toString( "yyyy-MM-ddThh:mm:ss.zzz" )+ offsetString );
@@ -275,7 +275,7 @@ void ExchangeUpload::startUpload( const KURL &url )
   addElement( doc, prop, "urn:schemas:calendar:", "dtend", 
       event->dtEnd().toString( "yyyy-MM-ddThh:mm:ss.zzz" ) + offsetString );
 #endif
-  addElement( doc, prop, "urn:schemas:calendar:", "lastmodified", zoneAsUtc( event->lastModified(), mTimeZoneId ).toString( TQt::ISODate )+"Z" );
+  addElement( doc, prop, "urn:schemas:calendar:", "lastmodified", zoneAsUtc( event->lastModified(), mTimeZoneId ).toString( Qt::ISODate )+"Z" );
 
 //  addElement( doc, prop, "urn:schemas:calendar:", "meetingstatus", "confirmed" );
   addElement( doc, prop, "urn:schemas:httpmail:", "textdescription", event->description() );
@@ -308,7 +308,7 @@ void ExchangeUpload::startUpload( const KURL &url )
     KCal::DateList::iterator it;
     for ( it = exdates.begin(); it != exdates.end(); ++it ) {
       TQString date = (*it).toString( "yyyy-MM-ddT00:00:00.000" )+ offsetString;
-//      TQString date = zoneAsUtc( (*it), mTimeZoneId ).toString( TQt::ISODate );
+//      TQString date = zoneAsUtc( (*it), mTimeZoneId ).toString( Qt::ISODate );
       addElement( doc, exdate, "xml:", "v", date );
     }
   }