From 08f868c2ce096e75bdbba40d83ffd89e243fee44 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 17 Aug 2011 00:17:01 +0200 Subject: [PATCH] * Fix sorting for real. --- src/sourcetree/items/collectionitem.cpp | 2 +- src/sourcetree/sourcesproxymodel.cpp | 16 ---------------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/sourcetree/items/collectionitem.cpp b/src/sourcetree/items/collectionitem.cpp index fcc83bc21..66ded6924 100644 --- a/src/sourcetree/items/collectionitem.cpp +++ b/src/sourcetree/items/collectionitem.cpp @@ -146,7 +146,7 @@ CollectionItem::peerSortValue() const if( m_source->isLocal() ) return 0; - return m_source->id(); + return 1; } diff --git a/src/sourcetree/sourcesproxymodel.cpp b/src/sourcetree/sourcesproxymodel.cpp index c3f15684d..dfc300803 100644 --- a/src/sourcetree/sourcesproxymodel.cpp +++ b/src/sourcetree/sourcesproxymodel.cpp @@ -91,22 +91,6 @@ SourcesProxyModel::expandRequested( const QModelIndex& idx ) bool SourcesProxyModel::lessThan( const QModelIndex& left, const QModelIndex& right ) const { - CollectionItem* ciL = qobject_cast< CollectionItem* >( m_model->data( left, SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >() ); - CollectionItem* ciR = qobject_cast< CollectionItem* >( m_model->data( right, SourcesModel::SourceTreeItemRole ).value< SourceTreeItem* >() ); - - if ( ciL && ciR ) - { - if ( ciL->source().isNull() ) - return true; - if ( ciR->source().isNull() ) - return false; - - if ( ciL->source() == SourceList::instance()->getLocal() ) - return true; - if ( ciR->source() == SourceList::instance()->getLocal() ) - return false; - } - if ( m_model->data( left, SourcesModel::SortRole ) != m_model->data( right, SourcesModel::SortRole ) ) return ( m_model->data( left, SourcesModel::SortRole ).toInt() < m_model->data( right, SourcesModel::SortRole ).toInt() );