1 files changed, 7 insertions, 14 deletions

diff --git a/korganizer/kolistview.cpp b/korganizer/kolistview.cpp
index b236c2d..4fc1194 100644
--- a/korganizer/kolistview.cpp
+++ b/korganizer/kolistview.cpp
@@ -128,38 +128,36 @@ bool ListItemVisitor::visit(Event *e)
         mItem->setText(4,"---");
     else
         mItem->setText(4,e->dtEndTimeStr());
     mItem->setText(5, e->durationText());
     if ( e->isAlarmEnabled() ) {
         mItem->setText(6,e->alarms().first()->offsetText() );
     } else {
         mItem->setText(6, i18n("No"));
     }
     mItem->setText(7, e->recurrenceText());
     if( ! e->doesRecur() )
         mItem->setSortKey( 7, "-" );
     mItem->setText(8, e->cancelled() ? i18n("Yes") : i18n("No"));
     mItem->setText(9,e->categoriesStr());
     mItem->setText(10, KOPrefs::instance()->calName( e->calID() ));
     mItem->setText(11, KGlobal::locale()->formatDateTime( e->lastModified(), true, true ));
+    mItem->setSortKey(11,e->lastModifiedSortKey());
 
     QString key; 
-    QDate d = e->lastModified().date();
-    QTime t = e->lastModified().time();
-    key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),t.hour(),t.minute(),t.second() );
-    mItem->setSortKey(12,key);
+    QTime t;
     t = e->doesFloat() ? QTime(0,0) : e->dtStart().time();
     key.sprintf("%04d%02d%02d%02d%02d",ds.year(),ds.month(),ds.day(),t.hour(),t.minute());
     mItem->setSortKey(1,key);
 
     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;
 }
 
 bool ListItemVisitor::visit(Todo *t)
 {
     mItem->setText(0,t->summary());
     if ( t->isCompleted() ) {
         mItem->setSortKey(0,"99"+ t->summary().left(10));
     } else 
@@ -187,37 +185,36 @@ bool ListItemVisitor::visit(Todo *t)
     if (t->hasDueDate()) {
         mItem->setText(3,t->dtDueDateStr());
         if (t->doesFloat()) {
             mItem->setText(4,"---");
         } else {
             mItem->setText(4,t->dtDueTimeStr());
         }
     } else {
         mItem->setText(3,"---");
         mItem->setText(4,"---");
     }
     mItem->setText(5, t->durationText());
     mItem->setText(8, t->cancelled() ? i18n("Yes") : i18n("No"));
     mItem->setText(9,t->categoriesStr());
     mItem->setText(10, KOPrefs::instance()->calName( t->calID() ));
     mItem->setText(11, KGlobal::locale()->formatDateTime( t->lastModified(), true, true ));
+    mItem->setSortKey(11,t->lastModifiedSortKey());
     QString key;
-    QDate d = t->lastModified().date();
-    QTime tm = t->lastModified().time();
-    key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute(),tm.second() );
-    mItem->setSortKey(11,key);
+    QDate d;
+    QTime tm;
     if (t->hasDueDate()) {
         d = t->dtDue().date();
         tm = t->doesFloat() ? QTime(0,0) : t->dtDue().time();
         key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute());
         mItem->setSortKey(3,key);
     }
     if ( t->hasStartDate() ) {
         d = t->dtStart().date();
         tm = t->doesFloat() ? QTime(0,0) : t->dtStart().time();
         key.sprintf("%04d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute());
         mItem->setSortKey(1,key);
     }
     return true;
 }
 
 bool ListItemVisitor::visit(Journal * j)
@@ -233,43 +230,39 @@ bool ListItemVisitor::visit(Journal * j)
         des.replace (QRegExp ("\\n"),"" );
         des.replace (QRegExp ("\\r"),"" );
     }
     mItem->setText(0,des.left(25));
     mItem->setSortKey(0,"0"+ des.left(25));
     mItem->setText(1,j->dtStartDateStr());
     mItem->setText(2,"---");
     mItem->setText(3,"---");
     mItem->setText(4,"---");
     mItem->setText(5,"---");
     mItem->setText(6,"---");
     mItem->setText(7,"---");
     mItem->setText(8,"---");
     mItem->setText(9,j->categoriesStr());
     mItem->setText(10, KOPrefs::instance()->calName( j->calID() ));
     mItem->setText(11, KGlobal::locale()->formatDateTime( j->lastModified(), true, true ));
+    mItem->setSortKey(11,j->lastModifiedSortKey());
 
     QString key; 
-    QDate d = j->lastModified().date();
-    QTime tm = j->lastModified().time();
-    key.sprintf("%04d%02d%02d%02d%02d%02d",d.year(),d.month(),d.day(),tm.hour(),tm.minute(),tm.second() );
-    mItem->setSortKey(12,key);
+    QDate d;
     d = j->dtStart().date();
     key.sprintf("%04d%02d%02d",d.year(),d.month(),d.day());
     mItem->setSortKey(1,key);
-    mItem->setSortKey(7,key);
-
     return true;
 }
 
 KOListView::KOListView(Calendar *calendar, QWidget *parent,
                        const char *name)
     : KOEventView(calendar, parent, name)
 {
     
     mActiveItem = 0;
     mForceShowCompletedTodos = false;
     mListView = new KOListViewListView(this);
     mListView->addColumn(i18n("Summary"));
     mListView->addColumn(i18n("Start Date"));
     mListView->addColumn(i18n("Start Time"));
     mListView->addColumn(i18n("End/Due Date"));
     mListView->addColumn(i18n("End/Due Time"));