Backport for #156375: don't add a place having an empty name

[dolphin.git] / src / dolphincontextmenu.h

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index b8920b7e2101fdafda8f4e7dba49b3a3625f298a..a7cd9c01da420fe70c37ee2b6be6a90d8311af27 100644 (file)
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -59,15 +59,14 @@ public:
      *                is above the viewport.
      * @baseUrl       Base URL of the viewport where the context menu
      *                should be opened.
-     * @viewType      On which view type is the context menu shown.
      */
     DolphinContextMenu(DolphinMainWindow* parent,
-                       KFileItem* fileInfo,
+                       const KFileItem& fileInfo,
                        const KUrl& baseUrl);
 
     virtual ~DolphinContextMenu();
 
-    /** Opens the context menu modal. */
+    /** Opens the context menu model. */
     void open();
 
 private:
@@ -91,16 +90,6 @@ private:
     QList<QAction*> insertOpenWithItems(KMenu* popup,
                                         QVector<KService::Ptr>& openWithVector);
 
-    /**
-     * Inserts the 'Actions...' submenu to \a popup.
-     * @param popup          Menu where the 'Actions...' sub menu should
-     *                       be added.
-     * @param openWithVector Output parameter which contains all 'Actions...'
-     *                       services.
-     */
-    QList<QAction*> insertActionItems(KMenu* popup,
-                                      QVector<KDesktopFileActions::Service>& actionsVector);
-
     /**
      * Returns true, if 'menu' contains already
      * an entry with the name 'entryName'.
@@ -108,6 +97,17 @@ private:
     bool containsEntry(const KMenu* menu,
                        const QString& entryName) const;
 
+    /**
+     * Adds the "Show menubar" action to the menu if the
+     * menubar is hidden.
+     */
+    void addShowMenubarAction(KMenu* menu);
+
+    /**
+     * Returns a name for adding the URL \a url to the Places panel.
+     */
+    QString placesName(const KUrl& url) const;
+
 private:
     struct Entry
     {
@@ -127,7 +127,7 @@ private:
     };
 
     DolphinMainWindow* m_mainWindow;
-    KFileItem* m_fileInfo;
+    KFileItem m_fileInfo;
     KUrl m_baseUrl;
     KFileItemList m_selectedItems;
     KUrl::List m_selectedUrls;