1 files changed, 16 insertions, 16 deletions
diff --git a/libkdepim/calendardiffalgo.cpp b/libkdepim/calendardiffalgo.cpp
index 4550ef3b3..79676fb84 100644
--- a/libkdepim/calendardiffalgo.cpp
+++ b/libkdepim/calendardiffalgo.cpp
@@ -26,7 +26,7 @@
 using namespace KPIM;
 
 #ifndef KDE_USE_FINAL
-static bool compareString( const QString &left, const QString &right )
+static bool compareString( const TQString &left, const TQString &right )
 {
   if ( left.isEmpty() && right.isEmpty() )
     return true;
@@ -35,42 +35,42 @@ static bool compareString( const QString &left, const QString &right )
 }
 #endif
 
-static QString toString( KCal::Attendee *attendee )
+static TQString toString( KCal::Attendee *attendee )
 {
   return attendee->name() + "<" + attendee->email() + ">";
 }
 
-static QString toString( KCal::Alarm * )
+static TQString toString( KCal::Alarm * )
 {
-  return QString::null;
+  return TQString::null;
 }
 
-static QString toString( KCal::Incidence * )
+static TQString toString( KCal::Incidence * )
 {
-  return QString::null;
+  return TQString::null;
 }
 
-static QString toString( KCal::Attachment * )
+static TQString toString( KCal::Attachment * )
 {
-  return QString::null;
+  return TQString::null;
 }
 
-static QString toString( const QDate &date )
+static TQString toString( const TQDate &date )
 {
   return date.toString();
 }
 
-static QString toString( const QDateTime &dateTime )
+static TQString toString( const TQDateTime &dateTime )
 {
   return dateTime.toString();
 }
 
-static QString toString( const QString str )
+static TQString toString( const TQString str )
 {
   return str;
 }
 
-static QString toString( bool value )
+static TQString toString( bool value )
 {
   if ( value )
     return i18n( "Yes" );
@@ -126,7 +126,7 @@ void CalendarDiffAlgo::diffIncidenceBase( KCal::IncidenceBase *left, KCal::Incid
     conflictField( i18n( "Has duration" ), toString( left->hasDuration() ), toString( right->hasDuration() ) );
 
   if ( left->duration() != right->duration() )
-    conflictField( i18n( "Duration" ), QString::number( left->duration() ), QString::number( right->duration() ) );
+    conflictField( i18n( "Duration" ), TQString::number( left->duration() ), TQString::number( right->duration() ) );
 }
 
 void CalendarDiffAlgo::diffIncidence( KCal::Incidence *left, KCal::Incidence *right )
@@ -191,15 +191,15 @@ void CalendarDiffAlgo::diffTodo( KCal::Todo *left, KCal::Todo *right )
     conflictField( i18n( "Has Complete Date" ), toString( left->hasCompletedDate() ), toString( right->hasCompletedDate() ) );
 
   if ( left->percentComplete() != right->percentComplete() )
-    conflictField( i18n( "Complete" ), QString::number( left->percentComplete() ), QString::number( right->percentComplete() ) );
+    conflictField( i18n( "Complete" ), TQString::number( left->percentComplete() ), TQString::number( right->percentComplete() ) );
 
   if ( left->completed() != right->completed() )
     conflictField( i18n( "Completed" ), toString( left->completed() ), toString( right->completed() ) );
 }
 
 template <class L>
-void CalendarDiffAlgo::diffList( const QString &id,
-                                 const QValueList<L> &left, const QValueList<L> &right )
+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() )