Fix for crash which was introduced by commit

[dolphin.git] / src / dolphincontextmenu.h

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index c9840eae5f9732163f0e108b0b33bab0949c2be6..f7f3a231a24ee9373c39251efb7d3d71eca6f549 100644 (file)
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -21,16 +21,12 @@
 #define DOLPHINCONTEXTMENU_H
 
 #include <KFileItem>
 #define DOLPHINCONTEXTMENU_H
 
 #include <KFileItem>

-#include <KService>
-#include <KUrl>
+#include <QUrl>

 #include <konq_copytomenu.h>
 #include <konq_copytomenu.h>

-#include <KMenu>
+#include <QMenu>

 
 

-#include <QObject>

 
 

-#include <QVector>

 
 

-#include <QScopedPointer>

 
 class QAction;
 class DolphinMainWindow;
 
 class QAction;
 class DolphinMainWindow;


@@ -50,7 +46,7 @@ class DolphinRemoveAction;
  * - 'Actions':   Contains all actions which can be applied to the
  *                given item.
  */
  * - 'Actions':   Contains all actions which can be applied to the
  *                given item.
  */

-class DolphinContextMenu : public KMenu
+class DolphinContextMenu : public QMenu

 {
     Q_OBJECT
 
 {
     Q_OBJECT
 


@@ -58,6 +54,7 @@ public:
     enum Command
     {
         None,
     enum Command
     {
         None,

+        OpenParentFolder,

         OpenParentFolderInNewWindow,
         OpenParentFolderInNewTab
     };
         OpenParentFolderInNewWindow,
         OpenParentFolderInNewTab
     };


@@ -75,7 +72,7 @@ public:
     DolphinContextMenu(DolphinMainWindow* parent,
                        const QPoint& pos,
                        const KFileItem& fileInfo,
     DolphinContextMenu(DolphinMainWindow* parent,
                        const QPoint& pos,
                        const KFileItem& fileInfo,

-                       const KUrl& baseUrl);
+                       const QUrl& baseUrl);

 
     virtual ~DolphinContextMenu();
 
 
     virtual ~DolphinContextMenu();
 


@@ -92,11 +89,8 @@ public:
     Command open();
 
 protected:
     Command open();
 
 protected:

-    virtual void keyPressEvent(QKeyEvent *ev);
-    virtual void keyReleaseEvent(QKeyEvent *ev);
-
-signals:
-    void errorMessage(const QString& error);
+    virtual void keyPressEvent(QKeyEvent *ev) Q_DECL_OVERRIDE;
+    virtual void keyReleaseEvent(QKeyEvent *ev) Q_DECL_OVERRIDE;

 
 private:
     void openTrashContextMenu();
 
 private:
     void openTrashContextMenu();


@@ -112,7 +106,7 @@ private:
      */
     void addShowMenuBarAction();
 
      */
     void addShowMenuBarAction();
 

-    bool placeExists(const KUrl& url) const;
+    bool placeExists(const QUrl& url) const;

 
     QAction* createPasteAction();
 
 
     QAction* createPasteAction();
 


@@ -168,7 +162,7 @@ private:
 
     KFileItem m_fileInfo;
 
 
     KFileItem m_fileInfo;
 

-    KUrl m_baseUrl;
+    QUrl m_baseUrl;

     KFileItem* m_baseFileItem;  /// File item for m_baseUrl
 
     KFileItemList m_selectedItems;
     KFileItem* m_baseFileItem;  /// File item for m_baseUrl
 
     KFileItemList m_selectedItems;