Initial conversion of kdepim to TQt

This will probably require some tweaking before it will build under Qt4,
however Qt3 builds are OK.  Any alterations this commit makes to kdepim
behaviour under Qt3 are unintentional and should be fixed.


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

1 files changed, 6 insertions, 6 deletions

diff --git a/kitchensync/src/calendardiffalgo.cpp b/kitchensync/src/calendardiffalgo.cpp
index 9d18649a8..fe376428e 100644
--- a/kitchensync/src/calendardiffalgo.cpp
+++ b/kitchensync/src/calendardiffalgo.cpp
@@ -44,17 +44,17 @@ static TQString toString( KCal::Attendee *attendee )
 
 static TQString toString( KCal::Alarm * )
 {
-  return TQString::null;
+  return TQString();
 }
 
 static TQString toString( KCal::Incidence * )
 {
-  return TQString::null;
+  return TQString();
 }
 
 static TQString toString( KCal::Attachment * )
 {
-  return TQString::null;
+  return TQString();
 }
 
 static TQString toString( const TQDate &date )
@@ -140,7 +140,7 @@ void CalendarDiffAlgo::diffIncidence( KCal::Incidence *left, KCal::Incidence *ri
     conflictField( i18n( "Summary" ), left->summary(), right->summary() );
 
   if ( left->status() != right->status() )
-    conflictField( i18n( "Status" ), left->statusStr(), right->statusStr() );
+    conflictField( i18n( "tqStatus" ), left->statusStr(), right->statusStr() );
 
   if ( left->secrecy() != right->secrecy() )
     conflictField( i18n( "Secrecy" ), toString( left->secrecy() ), toString( right->secrecy() ) );
@@ -206,12 +206,12 @@ void CalendarDiffAlgo::diffList( const TQString &id,
                                  const TQValueList<L> &left, const TQValueList<L> &right )
 {
   for ( uint i = 0; i < left.count(); ++i ) {
-    if ( right.find( left[ i ] ) == right.end() )
+    if ( right.tqfind( left[ i ] ) == right.end() )
       additionalLeftField( id, toString( left[ i ] ) );
   }
 
   for ( uint i = 0; i < right.count(); ++i ) {
-    if ( left.find( right[ i ] ) == left.end() )
+    if ( left.tqfind( right[ i ] ) == left.end() )
       additionalRightField( id, toString( right[ i ] ) );
   }
 }