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, 5 insertions, 5 deletions

diff --git a/kresources/scalix/shared/resourcescalixbase.cpp b/kresources/scalix/shared/resourcescalixbase.cpp
index c9c7ee11d..c9bfca350 100644
--- a/kresources/scalix/shared/resourcescalixbase.cpp
+++ b/kresources/scalix/shared/resourcescalixbase.cpp
@@ -130,7 +130,7 @@ bool ResourceScalixBase::kmailUpdate( const TQString& resource,
 TQString ResourceScalixBase::configFile( const TQString& type ) const
 {
   return locateLocal( "config",
-                      TQString( "kresources/scalix/%1rc" ).arg( type ) );
+                      TQString( "kresources/scalix/%1rc" ).tqarg( type ) );
 }
 
 bool ResourceScalixBase::connectToKMail() const
diff --git a/kresources/scalix/shared/scalixbase.cpp b/kresources/scalix/shared/scalixbase.cpp
index 64400e4f8..337899035 100644
--- a/kresources/scalix/shared/scalixbase.cpp
+++ b/kresources/scalix/shared/scalixbase.cpp
@@ -372,12 +372,12 @@ TQDomDocument ScalixBase::domTree()
 
 TQString ScalixBase::dateTimeToString( const TQDateTime& time )
 {
-  return time.toString( TQt::ISODate ) + 'Z';
+  return time.toString( Qt::ISODate ) + 'Z';
 }
 
 TQString ScalixBase::dateToString( const TQDate& date )
 {
-  return date.toString( TQt::ISODate );
+  return date.toString( Qt::ISODate );
 }
 
 TQDateTime ScalixBase::stringToDateTime( const TQString& _date )
@@ -385,12 +385,12 @@ TQDateTime ScalixBase::stringToDateTime( const TQString& _date )
   TQString date( _date );
   if ( date.endsWith( "Z" ) )
     date.truncate( date.length() - 1 );
-  return TQDateTime::fromString( date, TQt::ISODate );
+  return TQDateTime::fromString( date, Qt::ISODate );
 }
 
 TQDate ScalixBase::stringToDate( const TQString& date )
 {
-  return TQDate::fromString( date, TQt::ISODate );
+  return TQDate::fromString( date, Qt::ISODate );
 }
 
 TQString ScalixBase::sensitivityToString( Sensitivity s )