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

List:       kde-commits
Subject:    KDE/kdepim/kaddressbook
From:       Stephen Kelly <steveire () gmail ! com>
Date:       2010-08-19 12:49:57
Message-ID: 20100819124957.6FFD5AC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1165463 by skelly:

Port away from CollectionSelectionModel to CheckableItemProxyModel

 M  +8 -9      mainwidget.cpp  


--- trunk/KDE/kdepim/kaddressbook/mainwidget.cpp #1165462:1165463
@@ -34,7 +34,7 @@
 #include "grantleecontactgroupformatter.h"
 #endif
 
-#include <akonadi/akonadi_next/collectionselectionproxymodel.h>
+#include <akonadi/akonadi_next/checkableitemproxymodel.h>
 #include <akonadi/etmviewstatesaver.h>
 #include <akonadi/collectionfilterproxymodel.h>
 #include <akonadi/collectionmodel.h>
@@ -134,21 +134,20 @@
    */
 
   mCollectionTree = new Akonadi::EntityMimeTypeFilterModel( this );
+  mCollectionTree->setDynamicSortFilter( true );
+  mCollectionTree->setSortCaseSensitivity( Qt::CaseInsensitive );
   mCollectionTree->setSourceModel( GlobalContactModel::instance()->model() );
   mCollectionTree->addMimeTypeInclusionFilter( Akonadi::Collection::mimeType() );
   mCollectionTree->setHeaderGroup( Akonadi::EntityTreeModel::CollectionTreeHeaders \
);  
-  Akonadi::CollectionSelectionProxyModel *proxyModel = new \
                Akonadi::CollectionSelectionProxyModel( this );
-  proxyModel->setDynamicSortFilter( true );
-  proxyModel->setSortCaseSensitivity( Qt::CaseInsensitive );
+  mCollectionSelectionModel = new QItemSelectionModel( mCollectionTree );
+  CheckableItemProxyModel *checkableProxyModel = new CheckableItemProxyModel( this \
); +  checkableProxyModel->setSelectionModel( mCollectionSelectionModel );
+  checkableProxyModel->setSourceModel( mCollectionTree );
 
-  mCollectionSelectionModel = new QItemSelectionModel( proxyModel );
-  proxyModel->setSelectionModel( mCollectionSelectionModel );
-  proxyModel->setSourceModel( mCollectionTree );
-
   mXXPortManager->setItemModel( allContactsModel() );
 
-  mCollectionView->setModel( proxyModel );
+  mCollectionView->setModel( checkableProxyModel );
   mCollectionView->setXmlGuiClient( guiClient );
   mCollectionView->header()->setDefaultAlignment( Qt::AlignCenter );
   mCollectionView->header()->setSortIndicatorShown( false );


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