| -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 @@ -188,3 +188,2 @@ DateBook::DateBook( QWidget *parent, const char *, WFlags f ) connect( channel, SIGNAL(received(const QCString&, const QByteArray&)), this, SLOT(receive(const QCString&, const QByteArray&)) ); - qDebug("olle\n"); #endif @@ -411,3 +410,2 @@ void DateBook::duplicateEvent( const Event &e ) { - qWarning("Hmmm..."); // Alot of code duplication, as this is almost like editEvent(); @@ -510,2 +508,3 @@ void DateBook::removeEvent( const Event &e ) dayView->redraw(); + } @@ -993,4 +992,3 @@ void DateBook::slotDoFind( const QString& txt, const QDate &dt, - static Event rev, - nonrev; + static Event rev, nonrev; if ( !inSearch ) { @@ -1012,17 +1010,14 @@ void DateBook::slotDoFind( const QString& txt, const QDate &dt, 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; + } + } + } + } } @@ -1077,3 +1072,2 @@ Event DateBookDBHack::eventByUID(int uid) { - qDebug("Event not found: uid=%d\n", uid); Event ev; @@ -1081,2 +1075 @@ Event DateBookDBHack::eventByUID(int uid) { } - |