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

List:       kde-commits
Subject:    KDE/kdepimlibs/akonadi
From:       Tobias Koenig <tokoe () kde ! org>
Date:       2010-12-21 16:09:28
Message-ID: 20101221160928.4B1C9AC8AA () svn ! kde ! org
[Download RAW message or body]

SVN commit 1208427 by tokoe:

Use the collectionSelectionModel()->model() as base for CollectionDialog

This will prevent CollectionDialog to create its own ETM instance.


 M  +6 -6      standardactionmanager.cpp  


--- trunk/KDE/kdepimlibs/akonadi/standardactionmanager.cpp #1208426:1208427
@@ -703,22 +703,22 @@
 
     void slotCopyCollectionTo()
     {
-      pasteTo( collectionSelectionModel, CopyCollectionToMenu, Qt::CopyAction );
+      pasteTo( collectionSelectionModel, collectionSelectionModel->model(), \
CopyCollectionToMenu, Qt::CopyAction );  }
 
     void slotCopyItemTo()
     {
-      pasteTo( itemSelectionModel, CopyItemToMenu, Qt::CopyAction );
+      pasteTo( itemSelectionModel, collectionSelectionModel->model(), \
CopyItemToMenu, Qt::CopyAction );  }
 
     void slotMoveCollectionTo()
     {
-      pasteTo( collectionSelectionModel, MoveCollectionToMenu, Qt::MoveAction );
+      pasteTo( collectionSelectionModel, collectionSelectionModel->model(), \
MoveCollectionToMenu, Qt::MoveAction );  }
 
     void slotMoveItemTo()
     {
-      pasteTo( itemSelectionModel, MoveItemToMenu, Qt::MoveAction );
+      pasteTo( itemSelectionModel, collectionSelectionModel->model(), \
MoveItemToMenu, Qt::MoveAction );  }
 
     void slotCopyCollectionTo( QAction *action )
@@ -842,11 +842,11 @@
       }
     }
 
-    void pasteTo( QItemSelectionModel *selectionModel, StandardActionManager::Type \
type, Qt::DropAction dropAction ) +    void pasteTo( QItemSelectionModel \
*selectionModel, const QAbstractItemModel *model, StandardActionManager::Type type, \
Qt::DropAction dropAction )  {
       const QSet<QString> mimeTypes = mimeTypesOfSelection( type );
 
-      CollectionDialog dlg;
+      CollectionDialog dlg( const_cast<QAbstractItemModel*>( model ) );
       dlg.setMimeTypeFilter( mimeTypes.toList() );
 
       if ( type == CopyItemToMenu || type == MoveItemToMenu )


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