diff options
Diffstat (limited to 'libkcal/recurrence.cpp')
-rw-r--r-- | libkcal/recurrence.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp index 47169ae47..d4e47a528 100644 --- a/libkcal/recurrence.cpp +++ b/libkcal/recurrence.cpp @@ -112,13 +112,13 @@ bool Recurrence::operator==( const Recurrence& r2 ) const void Recurrence::addObserver( Observer *observer ) { - if ( !mObservers.tqcontains( observer ) ) + if ( !mObservers.contains( observer ) ) mObservers.append( observer ); } void Recurrence::removeObserver( Observer *observer ) { - if ( mObservers.tqcontains( observer ) ) + if ( mObservers.contains( observer ) ) mObservers.remove( observer ); } @@ -269,7 +269,7 @@ bool Recurrence::recursOn(const TQDate &qd) const { TimeList tms; // First handle dates. Exrules override - if ( mExDates.tqcontains( qd ) ) return false; + if ( mExDates.contains( qd ) ) return false; // For all-day events a matching exrule excludes the whole day // since exclusions take precedence over inclusions, we know it can't occur on that day. if ( doesFloat() ) { @@ -279,7 +279,7 @@ bool Recurrence::recursOn(const TQDate &qd) const } } - if ( mRDates.tqcontains( qd ) ) return true; + if ( mRDates.contains( qd ) ) return true; bool recurs = false; @@ -328,14 +328,14 @@ bool Recurrence::recursOn(const TQDate &qd) const bool Recurrence::recursAt( const TQDateTime &dt ) const { // if it's excluded anyway, don't bother to check if it recurs at all. - if ( mExDateTimes.tqcontains( dt )) return false; - if ( mExDates.tqcontains( dt.date() )) return false; + if ( mExDateTimes.contains( dt )) return false; + if ( mExDates.contains( dt.date() )) return false; for ( RecurrenceRule::List::ConstIterator rr = mExRules.begin(); rr != mExRules.end(); ++rr ) { if ( (*rr)->recursAt( dt ) ) return false; } // Check explicit recurrences, then rrules. - bool occurs = ( startDateTime() == dt ) || mRDateTimes.tqcontains( dt ); + bool occurs = ( startDateTime() == dt ) || mRDateTimes.contains( dt ); if ( occurs ) return true; for ( RecurrenceRule::List::ConstIterator rr = mRRules.begin(); rr != mRRules.end(); ++rr ) { @@ -624,7 +624,7 @@ void Recurrence::addMonthlyPos( short pos, const TQBitArray &days ) for ( int i = 0; i < 7; ++i ) { if ( days.testBit(i) ) { RecurrenceRule::WDayPos p( pos, i + 1 ); - if ( !positions.tqcontains( p ) ) { + if ( !positions.contains( p ) ) { changed = true; positions.append( p ); } @@ -646,7 +646,7 @@ void Recurrence::addMonthlyPos( short pos, ushort day ) TQValueList<RecurrenceRule::WDayPos> positions = rrule->byDays(); RecurrenceRule::WDayPos p( pos, day ); - if ( !positions.tqcontains( p ) ) { + if ( !positions.contains( p ) ) { positions.append( p ); rrule->setByDays( positions ); updated(); @@ -661,7 +661,7 @@ void Recurrence::addMonthlyDate( short day ) if ( !rrule ) return; TQValueList<int> monthDays = rrule->byMonthDays(); - if ( !monthDays.tqcontains( day ) ) { + if ( !monthDays.contains( day ) ) { monthDays.append( day ); rrule->setByMonthDays( monthDays ); updated(); @@ -682,7 +682,7 @@ void Recurrence::addYearlyDay( int day ) if ( !rrule ) return; TQValueList<int> days = rrule->byYearDays(); - if ( !days.tqcontains( day ) ) { + if ( !days.contains( day ) ) { days << day; rrule->setByYearDays( days ); updated(); @@ -710,7 +710,7 @@ void Recurrence::addYearlyMonth( short month ) if ( !rrule ) return; TQValueList<int> months = rrule->byMonths(); - if ( !months.tqcontains(month) ) { + if ( !months.contains(month) ) { months << month; rrule->setByMonths( months ); updated(); @@ -722,7 +722,7 @@ TimeList Recurrence::recurTimesOn( const TQDate &date ) const { TimeList times; // The whole day is excepted - if ( mExDates.tqcontains( date ) ) return times; + if ( mExDates.contains( date ) ) return times; // EXRULE takes precedence over RDATE entries, so for floating events, // a matching excule also excludes the whole day automatically if ( doesFloat() ) { |