| -rw-r--r-- | korganizer/kolistview.cpp | 13 | ||||
| -rw-r--r-- | korganizer/searchdialog.cpp | 3 |
2 files changed, 8 insertions, 8 deletions
diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index e1b393d..a1bf9ff 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -97,3 +97,2 @@ bool ListItemVisitor::visit(Event *e) { - bool ok = false; @@ -128,2 +127,4 @@ bool ListItemVisitor::visit(Event *e) mItem->setText(6, e->recurrence()->recurrenceText()); + if( ! e->doesRecur() ) + mItem->setSortKey( 6, "-" ); mItem->setText(7,"---"); @@ -141,3 +142,2 @@ bool ListItemVisitor::visit(Event *e) mItem->setSortKey(3,key); - return true; @@ -167,2 +167,4 @@ bool ListItemVisitor::visit(Todo *t) mItem->setText(6, t->recurrence()->recurrenceText()); + if( ! t->doesRecur() ) + mItem->setSortKey( 6, "-" ); if (t->hasDueDate()) { @@ -882,2 +884,3 @@ void KOListView::addEvents(QPtrList<Event> eventList) { + Event *ev; @@ -918,8 +921,8 @@ void KOListView::addIncidence(Incidence *incidence) mUidDict.insert( incidence->uid(), incidence ); - KOListViewItem *item = new KOListViewItem( incidence, mListView ); ListItemVisitor v(item, mStartDate ); - if (incidence->accept(v)) return; + if (incidence->accept(v)) { + return; + } else delete item; - //qDebug("delete item "); } diff --git a/korganizer/searchdialog.cpp b/korganizer/searchdialog.cpp index de65b53..007d1f3 100644 --- a/korganizer/searchdialog.cpp +++ b/korganizer/searchdialog.cpp @@ -225,5 +225,3 @@ void SearchDialog::doSearch() } - search(re); - listView->setStartDate( mStartDate->date() ); @@ -232,3 +230,2 @@ void SearchDialog::doSearch() listView->addJournals(mMatchedJournals); - if (mMatchedEvents.count() + mMatchedJournals.count() + mMatchedTodos.count() == 0) { |