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

List:       kde-commits
Subject:    branches/work/akonadi-ports
From:       Volker Krause <vkrause () kde ! org>
Date:       2010-01-12 10:11:57
Message-ID: 1263291117.336448.26249.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1073464 by vkrause:

askDndActionMenu -> showDropActionMenu as per API review by Tobias


 M  +1 -1      kdepim/kmail/folderselectiontreeview.cpp  
 M  +6 -6      kdepimlibs/akonadi/dragdropmanager.cpp  
 M  +3 -3      kdepimlibs/akonadi/dragdropmanager_p.h  
 M  +4 -4      kdepimlibs/akonadi/entitytreeview.cpp  
 M  +2 -2      kdepimlibs/akonadi/entitytreeview.h  


--- branches/work/akonadi-ports/kdepim/kmail/folderselectiontreeview.cpp #1073463:1073464
@@ -212,7 +212,7 @@
   const int checkedFolderToolTipsPolicy = mainFolderView.readEntry( "ToolTipDisplayPolicy", 0 );
   changeToolTipsPolicyConfig( ( ToolTipDisplayPolicy )checkedFolderToolTipsPolicy );
 
-  d->collectionFolderView->askDndActionMenu( GlobalSettings::self()->showPopupAfterDnD() );
+  d->collectionFolderView->setShowDropActionMenu( GlobalSettings::self()->showPopupAfterDnD() );
   readQuotaConfig();
 }
 
--- branches/work/akonadi-ports/kdepimlibs/akonadi/dragdropmanager.cpp #1073463:1073464
@@ -33,7 +33,7 @@
 using namespace Akonadi;
 
 DragDropManager::DragDropManager( QAbstractItemView *view )
-    : mAskAction( true ), m_view( view )
+    : mShowDropActionMenu( true ), m_view( view )
 {
 }
 
@@ -155,7 +155,7 @@
     return true;
   }
 
-  if ( !mAskAction ) {
+  if ( !mShowDropActionMenu ) {
     if ( moveAllowed )
       defaultAction = Qt::MoveAction;
     else if ( copyAllowed )
@@ -270,13 +270,13 @@
   drag->exec( supportedActions, defaultAction );
 }
 
-bool DragDropManager::isAskDndActionMenu() const
+bool DragDropManager::showDropActionMenu() const
 {
-  return mAskAction;
+  return mShowDropActionMenu;
 }
 
-void DragDropManager::askDndActionMenu( bool _b)
+void DragDropManager::setShowDropActionMenu( bool _b)
 {
-  mAskAction = _b;
+  mShowDropActionMenu = _b;
 }
 
--- branches/work/akonadi-ports/kdepimlibs/akonadi/dragdropmanager_p.h #1073463:1073464
@@ -54,14 +54,14 @@
      */
     void startDrag( Qt::DropActions supportedActions );
 
-    bool isAskDndActionMenu() const;
-    void askDndActionMenu( bool );
+    bool showDropActionMenu() const;
+    void setShowDropActionMenu( bool );
 
   private:
     Collection currentDropTarget( QDropEvent* event ) const;
 
     bool hasAncestor( const QModelIndex& index, Collection::Id parentId ) const;
-    bool mAskAction;
+    bool mShowDropActionMenu;
     QAbstractItemView *m_view;
 };
 
--- branches/work/akonadi-ports/kdepimlibs/akonadi/entitytreeview.cpp #1073463:1073464
@@ -265,14 +265,14 @@
 }
 
 
-void EntityTreeView::askDndActionMenu(bool askAction)
+void EntityTreeView::setShowDropActionMenu(bool askAction)
 {
-  d->mDragDropManager->askDndActionMenu( askAction );
+  d->mDragDropManager->setShowDropActionMenu( askAction );
 }
 
-bool EntityTreeView::isAskDndActionMenu() const
+bool EntityTreeView::showDropActionMenu() const
 {
-  return d->mDragDropManager->isAskDndActionMenu();
+  return d->mDragDropManager->showDropActionMenu();
 }
 
 #include "entitytreeview.moc"
--- branches/work/akonadi-ports/kdepimlibs/akonadi/entitytreeview.h #1073463:1073464
@@ -111,12 +111,12 @@
     /**
      * Show or not dnd menu action during dnd
      */
-    void askDndActionMenu(bool askAction);
+    void setShowDropActionMenu(bool askAction);
 
     /**
      * Get info about show or not menu during dnd
      */
-    bool isAskDndActionMenu() const;
+    bool showDropActionMenu() const;
   Q_SIGNALS:
     /**
      * This signal is emitted whenever the user has clicked
[prev in list] [next in list] [prev in thread] [next in thread]