Changeset 13713

Timestamp:

Dec 29, 2012, 1:20:22 AM (10 years ago)

Author:

jordan

Message:

(trunk, qt) minor speedups to filterbar::recount()

Location:

trunk/qt

Files:

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

trunk/qt/filterbar.cc

@@ -473 +473 @@
             const FilterMode m = myPrefs.get<FilterMode>( key );
             QAbstractItemModel * model = myActivityCombo->model( );
-            QModelIndexList indices = model->match( model->index(0,0), ActivityRole, m.mode(), -1 );
+            QModelIndexList indices = model->match( model->index(0,0), ActivityRole, m.mode() );
             myActivityCombo->setCurrentIndex( indices.isEmpty() ? 0 : indices.first().row( ) );
             break;
@@ -545 +545 @@
     {
         myRecountTimer->setSingleShot( true );
-        myRecountTimer->start( 500 );
-    }
-}
-void
-FilterBar :: recount ( )
-{
-    // recount the activity combobox...
-    for( int i=0, n=FilterMode::NUM_MODES; i<n; ++i )
-    {
-        const FilterMode m( i );
-        QAbstractItemModel * model = myActivityCombo->model( );
-        QModelIndexList indices = model->match( model->index(0,0), ActivityRole, m.mode(), -1 );
-        if( !indices.isEmpty( ) )
-            model->setData( indices.first(), getCountString(myFilter.count(m)), TorrentCountRole );
-    }
-
-    refreshTrackers( );
+        myRecountTimer->start( 800 );
+    }
+}
+void
+FilterBar :: recount ()
+{
+  QAbstractItemModel * model = myActivityCombo->model();
+
+  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);
+    }
+
+  refreshTrackers ();
 }
 

trunk/qt/torrent-model.cc

@@ -39 +39 @@
 
 QVariant
-TorrentModel :: data( const QModelIndex& index, int role ) const
-{
-    QVariant var;
-    const int row = index.row( );
-    if( row<0 || row>=myTorrents.size() )
-        return QVariant( );
-
-    const Torrent* t = myTorrents.at( row );
-
-    switch( role )
-    {
-        case Qt::DisplayRole:
-            var = QString( t->name() );
-            break;
-
-        case Qt::DecorationRole:
-            var = t->getMimeTypeIcon( );
-            break;
-
-        case TorrentRole:
-            var = qVariantFromValue( t );
-            break;
-
-        default:
+TorrentModel :: data (const QModelIndex& index, int role) const
+{
+  QVariant var;
+
+  const Torrent * t = myTorrents.value (index.row(), 0);
+  if (t != 0)
+    {
+      switch (role)
+        {
+          case Qt::DisplayRole:
+            var.setValue (t->name());
+            break;
+
+          case Qt::DecorationRole:
+            var.setValue (t->getMimeTypeIcon());
+            break;
+
+          case TorrentRole:
+            var = qVariantFromValue(t);
+            break;
+
+          default:
             //std::cerr << "Unhandled role: " << role << std::endl;
             break;
-    }
-
-    return var;
+        }
+    }
+
+  return var;
 }