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

4 files changed, 10 insertions, 10 deletions

diff --git a/kresources/egroupware/kabc_resourcexmlrpc.cpp b/kresources/egroupware/kabc_resourcexmlrpc.cpp
index ae789ef62..2e5053240 100644
--- a/kresources/egroupware/kabc_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kabc_resourcexmlrpc.cpp
@@ -393,7 +393,7 @@ void ResourceXMLRPC::deleteContactFinished( const TQValueList<TQVariant>&,
 void ResourceXMLRPC::fault( int error, const TQString &errorMsg,
                             const TQVariant& )
 {
-  TQString msg = i18n( "<qt>Server sent error %1: <b>%2</b></qt>" ).arg( error ).arg( errorMsg );
+  TQString msg = i18n( "<qt>Server sent error %1: <b>%2</b></qt>" ).tqarg( error ).tqarg( errorMsg );
   if ( addressBook() )
     addressBook()->error( msg );
 
@@ -408,7 +408,7 @@ void ResourceXMLRPC::addContactFault( int, const TQString &errorMsg,
   mAddrMap.remove( addr.uid() );
 
   TQString msg = i18n( "Unable to add contact %1 to server. (%2)" );
-  addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) );
+  addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) );
 }
 
 void ResourceXMLRPC::updateContactFault( int, const TQString &errorMsg,
@@ -417,7 +417,7 @@ void ResourceXMLRPC::updateContactFault( int, const TQString &errorMsg,
   KABC::Addressee addr = mAddrMap[ id.toString() ];
 
   TQString msg = i18n( "Unable to update contact %1 on server. (%2)" );
-  addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) );
+  addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) );
 }
 
 void ResourceXMLRPC::deleteContactFault( int, const TQString &errorMsg,
@@ -437,7 +437,7 @@ void ResourceXMLRPC::deleteContactFault( int, const TQString &errorMsg,
   mAddrMap.insert( addr.uid(), addr );
 
   TQString msg = i18n( "Unable to delete contact %1 from server. (%2)" );
-  addressBook()->error( msg.arg( addr.formattedName(), errorMsg ) );
+  addressBook()->error( msg.tqarg( addr.formattedName(), errorMsg ) );
 }
 
 TQString ResourceXMLRPC::addrTypesToTypeStr( int typeMask )
diff --git a/kresources/egroupware/kcal_resourcexmlrpc.cpp b/kresources/egroupware/kcal_resourcexmlrpc.cpp
index 6bbdc2342..b15a5a395 100644
--- a/kresources/egroupware/kcal_resourcexmlrpc.cpp
+++ b/kresources/egroupware/kcal_resourcexmlrpc.cpp
@@ -946,7 +946,7 @@ void ResourceXMLRPC::writeEvent( Event *event, TQMap<TQString, TQVariant> &args
 
   // handle all day events
   if ( event->doesFloat() )
-    args.insert( "end", event->dtEnd().addDays( 1 ) );
+    args.insert( "end", TQDateTime(event->dtEnd().addDays( 1 )) );
   else
     args.insert( "end", event->dtEnd() );
 
diff --git a/kresources/egroupware/todostatemapper.cpp b/kresources/egroupware/todostatemapper.cpp
index 0793bd609..2539d23aa 100644
--- a/kresources/egroupware/todostatemapper.cpp
+++ b/kresources/egroupware/todostatemapper.cpp
@@ -153,7 +153,7 @@ TQString TodoStateMapper::toRemote( int localState )
   else if ( localState == 100 )
     return "done";
   else
-    return TQString( "%1%" ).arg( localState );
+    return TQString( "%1%" ).tqarg( localState );
 }
 
 TQString TodoStateMapper::filename()
diff --git a/kresources/egroupware/xmlrpciface.cpp b/kresources/egroupware/xmlrpciface.cpp
index bd31a194a..4a46a37eb 100644
--- a/kresources/egroupware/xmlrpciface.cpp
+++ b/kresources/egroupware/xmlrpciface.cpp
@@ -113,7 +113,7 @@ void Query::slotResult( KIO::Job *job )
   if ( !doc.setContent( data, false, &errMsg, &errLine, &errCol  ) )
   {
     emit fault( -1, i18n( "Received invalid XML markup: %1 at %2:%3" )
-                        .arg( errMsg ).arg( errLine ).arg( errCol ), m_id );
+                        .tqarg( errMsg ).tqarg( errLine ).tqarg( errCol ), m_id );
     emit finished( this );
     return ;
   }
@@ -222,7 +222,7 @@ TQString Query::marshal( const TQVariant &arg ) const
       case TQVariant::ByteArray:
       return "<value><base64>" + KCodecs::base64Encode( arg.toByteArray() ) + "</base64></value>\r\n";
       case TQVariant::DateTime:
-      return "<value><datetime.iso8601>" + arg.toDateTime().toString( TQt::ISODate ) + "</datetime.iso8601></value>\r\n";
+      return "<value><datetime.iso8601>" + arg.toDateTime().toString( Qt::ISODate ) + "</datetime.iso8601></value>\r\n";
       case TQVariant::List:
       {
         TQString markup = "<value><array><data>\r\n";
@@ -277,9 +277,9 @@ TQVariant Query::demarshal( const TQDomElement &elem ) const
       return TQVariant( false );
   }
   else if ( typeName == "base64" )
-    return TQVariant( KCodecs::base64Decode( typeElement.text().latin1() ) );
+    return TQVariant( KCodecs::base64Decode( TQCString(typeElement.text().latin1()) ) );
   else if ( typeName == "datetime" || typeName == "datetime.iso8601" )
-    return TQVariant( TQDateTime::fromString( typeElement.text(), TQt::ISODate ) );
+    return TQVariant( TQDateTime::fromString( typeElement.text(), Qt::ISODate ) );
   else if ( typeName == "array" )
   {
     TQValueList<TQVariant> values;