summaryrefslogtreecommitdiffstats
path: root/libkcal/recurrence.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libkcal/recurrence.cpp')
-rw-r--r--libkcal/recurrence.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/libkcal/recurrence.cpp b/libkcal/recurrence.cpp
index 474d885f1..47169ae47 100644
--- a/libkcal/recurrence.cpp
+++ b/libkcal/recurrence.cpp
@@ -839,7 +839,7 @@ TQDateTime Recurrence::getNextDateTime( const TQDateTime &preDateTime ) const
TQDateTime nextDT = preDateTime;
// prevent infinite loops, e.g. when an exrule extinguishes an rrule (e.g.
// the exrule is identical to the rrule). If an occurrence is found, break
- // out of the loop by returning that QDateTime
+ // out of the loop by returning that TQDateTime
// TODO_Recurrence: Is a loop counter of 1000 really okay? I mean for secondly
// recurrence, an exdate might exclude more than 1000 intervals!
int loop = 0;
@@ -893,8 +893,8 @@ TQDateTime Recurrence::getNextDateTime( const TQDateTime &preDateTime ) const
nextDT = dates.first();
// Check if that date/time is excluded explicitly or by an exrule:
- if ( !tqcontainsSorted( mExDates, nextDT.date() ) &&
- !tqcontainsSorted( mExDateTimes, nextDT ) ) {
+ if ( !containsSorted( mExDates, nextDT.date() ) &&
+ !containsSorted( mExDateTimes, nextDT ) ) {
bool allowed = true;
for ( i = 0, end = mExRules.count(); i < end; ++i ) {
allowed = allowed && !( mExRules[i]->recursAt( nextDT ) );
@@ -914,7 +914,7 @@ TQDateTime Recurrence::getPreviousDateTime( const TQDateTime &afterDateTime ) co
TQDateTime prevDT = afterDateTime;
// prevent infinite loops, e.g. when an exrule extinguishes an rrule (e.g.
// the exrule is identical to the rrule). If an occurrence is found, break
- // out of the loop by returning that QDateTime
+ // out of the loop by returning that TQDateTime
int loop = 0;
while ( loop < 1000 ) {
// Outline of the algo:
@@ -964,8 +964,8 @@ TQDateTime Recurrence::getPreviousDateTime( const TQDateTime &afterDateTime ) co
prevDT = dates.last();
// Check if that date/time is excluded explicitly or by an exrule:
- if ( !tqcontainsSorted( mExDates, prevDT.date() ) &&
- !tqcontainsSorted( mExDateTimes, prevDT ) ) {
+ if ( !containsSorted( mExDates, prevDT.date() ) &&
+ !containsSorted( mExDateTimes, prevDT ) ) {
bool allowed = true;
for ( i = 0, end = mExRules.count(); i < end; ++i ) {
allowed = allowed && !( mExRules[i]->recursAt( prevDT ) );