Changeset 13720

Timestamp:

Dec 30, 2012, 1:28:28 AM (10 years ago)

Author:

jordan

Message:

(qt) small speedup when rebuilding the activity combobox's counts: walk the torrent model just once, rather than once per activity

Location:

trunk/qt

Files:

• filterbar.cc (modified) (1 diff)
• torrent-filter.cc (modified) (2 diffs)
• torrent-filter.h (modified) (1 diff)

trunk/qt/filterbar.cc

@@ -547 +547 @@
   QAbstractItemModel * model = myActivityCombo->model();
 
+  int torrentsPerMode[FilterMode::NUM_MODES] = { };
+  myFilter.countTorrentsPerMode (torrentsPerMode);
+
   for (int row=0, n=model->rowCount(); row<n; ++row)
     {
       QModelIndex index = model->index (row, 0);
       const int mode = index.data(ActivityRole).toInt();
-      model->setData (index, getCountString(myFilter.count(mode)), TorrentCountRole);
+      model->setData (index, getCountString(torrentsPerMode[mode]), TorrentCountRole);
     }
 

trunk/qt/torrent-filter.cc

@@ -11 +11 @@
  */
 
+#include <algorithm>
 #include <iostream>
 
@@ -206 +207 @@
 }
 
-int
-TorrentFilter :: count( const FilterMode& mode ) const
-{
-    int count = 0;
-
-    for( int row=0; ; ++row ) {
-        QModelIndex index = sourceModel()->index( row, 0 );
-        if( !index.isValid( ) )
-            break;
-        const Torrent * tor = index.data( TorrentModel::TorrentRole ).value<const Torrent*>();
-        if( activityFilterAcceptsTorrent( tor, mode ) )
-            ++count;
-    }
-
-    return count;
-}
+void
+TorrentFilter :: countTorrentsPerMode (int * setmeCounts) const
+{
+  std::fill_n (setmeCounts, FilterMode::NUM_MODES, 0);
+
+  for (int row(0); ; ++row)
+    { 
+      QModelIndex index (sourceModel()->index(row, 0));
+      if (!index.isValid())
+        break;
+
+      const Torrent * tor (index.data( TorrentModel::TorrentRole ).value<const Torrent*>());
+      for (int mode(0); mode<FilterMode::NUM_MODES; ++mode)
+        if (activityFilterAcceptsTorrent (tor, mode))
+          ++setmeCounts[mode];
+    }
+}
+

trunk/qt/torrent-filter.h

@@ -49 +49 @@
 
     public:
-        int count( const FilterMode& ) const;
+        void countTorrentsPerMode (int * setmeCounts) const;
 
     private: