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

List:       kde-commits
Subject:    branches/work/akonadi-ports
From:       Stephen Kelly <steveire () gmail ! com>
Date:       2009-10-19 16:09:25
Message-ID: 1255968565.118760.13733.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1037623 by skelly:

Update for renamed enums in kdelibs

Hopefully this doesn't mess up merging too much...

 M  +1 -1      kdepim/akonadi/akonadiconsole/browserwidget.cpp  
 M  +1 -1      kdepim/krss/examples/feeditemmodel_example/main.cpp  
 M  +1 -1      kdepim/messagelist/storagemodel.cpp  
 M  +1 -1      kdepimlibs/akonadi/favoritecollectionsmodel.cpp  


--- branches/work/akonadi-ports/kdepim/akonadi/akonadiconsole/browserwidget.cpp \
#1037622:1037623 @@ -155,7 +155,7 @@
 
   Akonadi::SelectionProxyModel *selectionProxyModel = new \
Akonadi::SelectionProxyModel( mCollectionView->selectionModel(), this );  \
                selectionProxyModel->setSourceModel( mBrowserModel );
-  selectionProxyModel->setFilterBehavior( KSelectionProxyModel::OnlySelectedChildren \
); +  selectionProxyModel->setFilterBehavior( \
KSelectionProxyModel::ChildrenOfExactSelection );  
   EntityFilterProxyModel *itemFilter = new EntityFilterProxyModel( this );
   itemFilter->setSourceModel( selectionProxyModel );
--- branches/work/akonadi-ports/kdepim/krss/examples/feeditemmodel_example/main.cpp \
#1037622:1037623 @@ -103,7 +103,7 @@
     m_feedView->setModel( m_itemModel );
 
     KSelectionProxyModel* selectionProxy = new KSelectionProxyModel( \
                m_feedView->selectionModel() );
-    selectionProxy->setFilterBehavior( \
KSelectionProxyModel::SelectedBranchesChildren ); +    \
selectionProxy->setFilterBehavior( KSelectionProxyModel::ChildrenOfExactSelection );  \
selectionProxy->setSourceModel( m_itemModel );  EntityFilterProxyModel* filterProxy2 \
= new EntityFilterProxyModel;  
--- branches/work/akonadi-ports/kdepim/messagelist/storagemodel.cpp #1037622:1037623
@@ -88,7 +88,7 @@
 
   KSelectionProxyModel *childrenFilter = new KSelectionProxyModel( \
d->mSelectionModel, this );  childrenFilter->setSourceModel( model );
-  childrenFilter->setFilterBehavior( KSelectionProxyModel::OnlySelectedChildren );
+  childrenFilter->setFilterBehavior( KSelectionProxyModel::ChildrenOfExactSelection \
);  
   EntityFilterProxyModel *itemFilter = new EntityFilterProxyModel( this );
   itemFilter->setSourceModel( childrenFilter );
--- branches/work/akonadi-ports/kdepimlibs/akonadi/favoritecollectionsmodel.cpp \
#1037622:1037623 @@ -116,7 +116,7 @@
     d( new Private( this ) )
 {
   setSourceModel( source );
-  setFilterBehavior(OnlySelected);
+  setFilterBehavior(ExactSelection);
 
   connect( source, SIGNAL( modelReset() ), this, SLOT( clearAndUpdateSelection() ) \
);  connect( source, SIGNAL( layoutChanged() ), this, SLOT( clearAndUpdateSelection() \
) );


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