| -rw-r--r-- | core/pim/datebook/datebook.cpp | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/core/pim/datebook/datebook.cpp b/core/pim/datebook/datebook.cpp index 706cc08..832b2f8 100644 --- a/core/pim/datebook/datebook.cpp +++ b/core/pim/datebook/datebook.cpp @@ -187,5 +187,4 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) channel = new QCopChannel( "QPE/Datebook", this ); connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(receive(const QCString&, const QByteArray&)) ); - qDebug("olle\n"); #endif #endif @@ -410,5 +409,4 @@ void DateBook::insertEvent( const Event &e ) void DateBook::duplicateEvent( const Event &e ) { - qWarning("Hmmm..."); // Alot of code duplication, as this is almost like editEvent(); if (syncing) { @@ -509,4 +507,5 @@ void DateBook::removeEvent( const Event &e ) if ( views->visibleWidget() == dayView && dayView ) dayView->redraw(); + } @@ -992,6 +991,5 @@ void DateBook::slotDoFind( const QString& txt, const QDate &dt, - static Event rev, - nonrev; + static Event rev, nonrev; if ( !inSearch ) { rev.setStart( QDateTime(QDate(1960, 1, 1), QTime(0, 0, 0)) ); @@ -1011,19 +1009,16 @@ void DateBook::slotDoFind( const QString& txt, const QDate &dt, for ( it = repeats.begin(); it != repeats.end(); ++it ) { if ( catComp( (*it).categories(), category ) ) { - while ( nextOccurance( *it, start, next ) ) { - if ( next < dtEnd ) { - if ( (*it).match( r ) && !(next <= rev.start()) ) { - rev = *it; - dtEnd = next; - rev.setStart( next ); - candidtate = true; - wrapAround = true; - start = dt; - break; - } else - start = next.date().addDays( 1 ); - } - } - } + if ( (*it).match( r ) ) { + if ( nextOccurance( *it, start, next ) ) { + if ( next < dtEnd && !(next <= rev.start() ) ) { + rev = *it; + dtEnd = next; + rev.setStart( next ); + candidtate = true; + wrapAround = true; + } + } + } + } } @@ -1076,7 +1071,5 @@ Event DateBookDBHack::eventByUID(int uid) { } - qDebug("Event not found: uid=%d\n", uid); Event ev; return ev; // return at least } - |