Changeset 10586 for branches/1.9x/qt/torrent-filter.cc

Timestamp:

May 1, 2010, 4:46:08 AM (12 years ago)

Author:

charles

Message:

(1.9x qt) backport r10459 for #3119 "showing torrent properties can cause rearranging of torrnets if sort != sortbyName"

File:

• branches/1.9x/qt/torrent-filter.cc (modified) (3 diffs)

branches/1.9x/qt/torrent-filter.cc

@@ -86 +86 @@
 ***/
 
+namespace
+{
+    template <typename T> int compare( const T a, const T b )
+    {
+        if( a < b ) return -1;
+        if( b < a ) return 1;
+        return 0;
+    }
+}
+
 bool
 TorrentFilter :: lessThan( const QModelIndex& left, const QModelIndex& right ) const
@@ -91 +101 @@
     const Torrent * a = sourceModel()->data( left, TorrentModel::TorrentRole ).value<const Torrent*>();
     const Torrent * b = sourceModel()->data( right, TorrentModel::TorrentRole ).value<const Torrent*>();
-    bool less;
+    int less = 0;
 
     switch( myPrefs.get<SortMode>(Prefs::SORT_MODE).mode() )
     {
         case SortMode :: SORT_BY_SIZE:
-            less = a->sizeWhenDone() < b->sizeWhenDone();
+            less = compare( a->sizeWhenDone(), b->sizeWhenDone() );
             break;
         case SortMode :: SORT_BY_ACTIVITY:
-            less = a->downloadSpeed() + a->uploadSpeed() < b->downloadSpeed() + b->uploadSpeed();
+            less = compare( a->downloadSpeed() + a->uploadSpeed(), b->downloadSpeed() + b->uploadSpeed() );
+            if( !less )
+                less = compare( a->uploadedEver(), b->uploadedEver() );
             break;
         case SortMode :: SORT_BY_AGE:
-            less = a->dateAdded() < b->dateAdded();
+            less = compare( a->dateAdded().toTime_t(), b->dateAdded().toTime_t() );
             break;
         case SortMode :: SORT_BY_ID:
-            less = a->id() < b->id();
-            break;
-        case SortMode :: SORT_BY_RATIO:
-            less = a->compareRatio( *b ) < 0;
-            break;
-        case SortMode :: SORT_BY_PROGRESS:
-            less = a->percentDone() < b->percentDone();
-            break;
-        case SortMode :: SORT_BY_ETA:
-            less = a->compareETA( *b ) < 0;
+            less = compare( a->id(), b->id() );
             break;
         case SortMode :: SORT_BY_STATE:
@@ -120 +123 @@
                 less = a->hasError();
             else
-                less = a->getActivity() < b->getActivity();
+                less = compare( a->getActivity(), b->getActivity() );
+            if( less )
+                break;
+        case SortMode :: SORT_BY_PROGRESS:
+            less = compare( a->percentDone(), b->percentDone() );
+            if( less )
+                break;
+        case SortMode :: SORT_BY_RATIO:
+            less = a->compareRatio( *b );
+            break;
+        case SortMode :: SORT_BY_ETA:
+            less = a->compareETA( *b );
             break;
         case SortMode :: SORT_BY_TRACKER:
-            less = a->compareTracker( *b ) < 0;
+            less = a->compareTracker( *b );
             break;
         default:
-            less = a->name().compare( b->name(), Qt::CaseInsensitive ) > 0;
-            break;
-    }
-
-    return less;
+            break;
+    }
+    if( less == 0 )
+        less = -a->name().compare( b->name(), Qt::CaseInsensitive );
+    if( less == 0 )
+        less = compare( a->hashString(), b->hashString() );
+    return less < 0;
 }