summaryrefslogtreecommitdiffstats
path: root/libkdepim/calendardiffalgo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libkdepim/calendardiffalgo.cpp')
-rw-r--r--libkdepim/calendardiffalgo.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/libkdepim/calendardiffalgo.cpp b/libkdepim/calendardiffalgo.cpp
index 79676fb84..dc22fd30e 100644
--- a/libkdepim/calendardiffalgo.cpp
+++ b/libkdepim/calendardiffalgo.cpp
@@ -42,17 +42,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 )
@@ -138,7 +138,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() ) );
@@ -202,12 +202,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 ] ) );
}
}