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

2 files changed, 8 insertions, 8 deletions

diff --git a/kresources/kolab/shared/kolabbase.cpp b/kresources/kolab/shared/kolabbase.cpp
index cb04d12be..3341ee35f 100644
--- a/kresources/kolab/shared/kolabbase.cpp
+++ b/kresources/kolab/shared/kolabbase.cpp
@@ -409,12 +409,12 @@ TQDomDocument KolabBase::domTree()
 
 TQString KolabBase::dateTimeToString( const TQDateTime& time )
 {
-  return time.toString( TQt::ISODate ) + 'Z';
+  return time.toString( Qt::ISODate ) + 'Z';
 }
 
 TQString KolabBase::dateToString( const TQDate& date )
 {
-  return date.toString( TQt::ISODate );
+  return date.toString( Qt::ISODate );
 }
 
 TQDateTime KolabBase::stringToDateTime( const TQString& _date )
@@ -423,15 +423,15 @@ TQDateTime KolabBase::stringToDateTime( const TQString& _date )
   //Deal with data from some clients that always append a Z to dates.
   if ( date.endsWith( "ZZ" ) )
     date.truncate( date.length() - 2 );
-  //In TQt3, TQt::ISODate cannot handle a trailing Z for UTC, so remove if found.
+  //In TQt3, Qt::ISODate cannot handle a trailing Z for UTC, so remove if found.
   else if ( date.endsWith( "Z" ) )
     date.truncate( date.length() - 1 );
-  return TQDateTime::fromString( date, TQt::ISODate );
+  return TQDateTime::fromString( date, Qt::ISODate );
 }
 
 TQDate KolabBase::stringToDate( const TQString& date )
 {
-  return TQDate::fromString( date, TQt::ISODate );
+  return TQDate::fromString( date, Qt::ISODate );
 }
 
 TQString KolabBase::sensitivityToString( Sensitivity s )
diff --git a/kresources/kolab/shared/resourcekolabbase.cpp b/kresources/kolab/shared/resourcekolabbase.cpp
index cf81f4518..90464b6b0 100644
--- a/kresources/kolab/shared/resourcekolabbase.cpp
+++ b/kresources/kolab/shared/resourcekolabbase.cpp
@@ -126,8 +126,8 @@ static TQString plainTextBody()
     " Groupware format.\nFor a list of such email clients please"
     " visit\n%1" );
   const char * url = "http://www.kolab.org/kolab2-clients.html";
-  TQString firstPartTextUntranslated = TQString::tqfromLatin1( firstPartTextToTranslate ).arg( url );
-  TQString firstPartText = i18n( firstPartTextToTranslate ).arg( url );
+  TQString firstPartTextUntranslated = TQString::tqfromLatin1( firstPartTextToTranslate ).tqarg( url );
+  TQString firstPartText = i18n( firstPartTextToTranslate ).tqarg( url );
   if ( firstPartText != firstPartTextUntranslated ) {
     firstPartText.append("\n\n-----------------------------------------------------\n\n");
     firstPartText.append( firstPartTextUntranslated );
@@ -190,7 +190,7 @@ bool ResourceKolabBase::kmailUpdate( const TQString& resource,
 TQString ResourceKolabBase::configFile( const TQString& type ) const
 {
   return locateLocal( "config",
-                      TQString( "kresources/kolab/%1rc" ).arg( type ) );
+                      TQString( "kresources/kolab/%1rc" ).tqarg( type ) );
 }
 
 bool ResourceKolabBase::connectToKMail() const