[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdeutils/kdf
From:       Jakub Stachowski <qbast () go2 ! pl>
Date:       2004-12-25 23:43:47
Message-ID: 20041225234347.C831F1C460 () office ! kde ! org
[Download RAW message or body]

CVS commit by qbast: 

Fixed sorting on size and available space columns.


  M +7 -11     kdfwidget.cpp   1.43
  M +2 -2      kdfwidget.h   1.15


--- kdeutils/kdf/kdfwidget.cpp  #1.42:1.43
@@ -68,28 +68,24 @@ CListViewItem::CListViewItem( CListView 
 // This ensures that the lexical string comparison gives numerical order.
 
-QString CListViewItem::key ( int column, bool ) const
+int CListViewItem::compare ( QListViewItem *i, int column, bool ) const
 {
   QString tmp;
 
+  CListViewItem *c = static_cast<CListViewItem*>(i);
+
   switch (column) {
   case KDFWidget::sizeCol:
-    tmp.sprintf("%10d",size);
-    break;
+    return (size==c->size) ? 0 : (size<c->size) ? -1 : 1;
 
   case KDFWidget::freeCol:
-    tmp.sprintf("%10d",avail);
-    break;
+    return (avail==c->avail) ? 0 : (avail<c->avail) ? -1 : 1;
 
   case KDFWidget::fullCol:
   case KDFWidget::usageCol:
-    tmp.sprintf("%7.2f",full);
-    break;
+    return (full==c->full) ? 0 : (full<c->full) ? -1 : 1;
 
   default:
-    tmp = text(column);
-    break;
+    return key(column,true).compare(i->key(column,true));
   }
-
-  return tmp;
 }
 

--- kdeutils/kdf/kdfwidget.h  #1.14:1.15
@@ -78,5 +78,5 @@ class CListViewItem : public QListViewIt
     CListViewItem ( CListView * parent, QListViewItem * after );
  
-    virtual QString key ( int column, bool ascending) const;
+    virtual int compare ( QListViewItem* i, int col, bool) const;
 
     void    setKeys ( int kb_size, int kb_avail, float percent_full ) ;


[prev in list] [next in list] [prev in thread] [next in thread]