From e3e76014e70643b0828f30f5c5277e212495d37c Mon Sep 17 00:00:00 2001 From: zautrix Date: Sun, 17 Apr 2005 17:29:12 +0000 Subject: fixes --- (limited to 'korganizer/kolistview.cpp') diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp index e1b393d..a1bf9ff 100644 --- a/korganizer/kolistview.cpp +++ b/korganizer/kolistview.cpp @@ -95,7 +95,6 @@ ListItemVisitor::~ListItemVisitor() bool ListItemVisitor::visit(Event *e) { - bool ok = false; QString start, end; QDate ds, de; @@ -126,6 +125,8 @@ bool ListItemVisitor::visit(Event *e) mItem->setText(5, i18n("No")); } mItem->setText(6, e->recurrence()->recurrenceText()); + if( ! e->doesRecur() ) + mItem->setSortKey( 6, "-" ); mItem->setText(7,"---"); mItem->setText(8,"---"); mItem->setText(9, e->cancelled() ? i18n("Yes") : i18n("No")); @@ -139,7 +140,6 @@ bool ListItemVisitor::visit(Event *e) t = e->doesFloat() ? QTime(0,0) : e->dtEnd().time(); key.sprintf("%04d%02d%02d%02d%02d",de.year(),de.month(),de.day(),t.hour(),t.minute()); mItem->setSortKey(3,key); - return true; } @@ -165,6 +165,8 @@ bool ListItemVisitor::visit(Todo *t) mItem->setText(5, i18n("No")); } mItem->setText(6, t->recurrence()->recurrenceText()); + if( ! t->doesRecur() ) + mItem->setSortKey( 6, "-" ); if (t->hasDueDate()) { mItem->setText(7,t->dtDueDateStr()); if (t->doesFloat()) { @@ -880,6 +882,7 @@ void KOListView::showDates(const QDate &start, const QDate &end) void KOListView::addEvents(QPtrList eventList) { + Event *ev; for(ev = eventList.first(); ev; ev = eventList.next()) { addIncidence(ev); @@ -916,12 +919,12 @@ void KOListView::addIncidence(Incidence *incidence) // mListView->setFont ( KOPrefs::instance()->mListViewFont ); 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 "); } void KOListView::showEvents(QPtrList eventList) -- cgit v0.9.0.2