Merge branch for accessibility

[dolphin.git] / src / dolphincontextmenu.h

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index 7f43de3680f50621d74ebfa0e703716f3a837f55..3d0005d30a21810546dabd754ea166427ada5870 100644 (file)
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -130,16 +130,11 @@ private:
      */
     void addShowMenuBarAction();
 
-    /**
-     * Returns a name for adding the URL \a url to the Places panel.
-     */
-    QString placesName(const KUrl& url) const;
-
     bool placeExists(const KUrl& url) const;
 
     QAction* createPasteAction();
 
-    KFileItemListProperties& selectedItemsProperties();
+    KFileItemListProperties& selectedItemsProperties() const;
 
     /**
      * Returns the file item for m_baseUrl.
@@ -170,10 +165,18 @@ private:
 
     /**
      * Updates m_removeAction to represent the 'Delete'-action if the shift-key
-     * has been pressed. Otherwise it represents the 'Move to Trash'-action.
+     * has been pressed or the selection is not local. Otherwise it represents
+     * the 'Move to Trash'-action.
      */
     void updateRemoveAction();
 
+    /**
+     * @return True if a moving to the trash should be done instead of
+     *         deleting the selected items.
+     * @see updateRemoveAction(), slotRemoveActionTriggered()
+     */
+    bool moveToTrash() const;
+
 private:
     struct Entry
     {
@@ -201,7 +204,7 @@ private:
     KFileItem* m_baseFileItem;  /// File item for m_baseUrl
 
     KFileItemList m_selectedItems;
-    KFileItemListProperties* m_selectedItemsProperties;
+    mutable KFileItemListProperties* m_selectedItemsProperties;
 
     int m_context;
     KonqCopyToMenu m_copyToMenu;