Fix selection rect after porting from QFontMetrics::width()

[dolphin.git] / src / dolphincontextmenu.h

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index 3646ebcb5114b13991dbb2e82f74fe2d84497f4c..3f36895ec0b62a09cc19e5ec390c8e089fd80576 100644 (file)
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -20,17 +20,11 @@
 #ifndef DOLPHINCONTEXTMENU_H
 #define DOLPHINCONTEXTMENU_H
 
 #ifndef DOLPHINCONTEXTMENU_H
 #define DOLPHINCONTEXTMENU_H
 

+#include <KFileCopyToMenu>

 #include <KFileItem>
 #include <KFileItem>

-#include <KService>
-#include <KUrl>
-#include <konq_copytomenu.h>
-#include <KMenu>

 
 

-#include <QObject>
-
-#include <QVector>
-
-#include <QScopedPointer>
+#include <QMenu>
+#include <QUrl>

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


@@ -50,7 +44,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
 


@@ -76,9 +70,9 @@ 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();
+    ~DolphinContextMenu() override;

 
     void setCustomActions(const QList<QAction*>& actions);
 
 
     void setCustomActions(const QList<QAction*>& actions);
 


@@ -93,8 +87,8 @@ public:
     Command open();
 
 protected:
     Command open();
 
 protected:

-    virtual void keyPressEvent(QKeyEvent *ev);
-    virtual void keyReleaseEvent(QKeyEvent *ev);
+    void keyPressEvent(QKeyEvent *ev) override;
+    void keyReleaseEvent(QKeyEvent *ev) override;

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


@@ -110,7 +104,7 @@ private:
      */
     void addShowMenuBarAction();
 
      */
     void addShowMenuBarAction();
 

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

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


@@ -122,15 +116,9 @@ private:
     KFileItem baseFileItem();
 
     /**
     KFileItem baseFileItem();
 
     /**

-     * Adds actions that have been installed as service-menu.
-     * (see http://techbase.kde.org/index.php?title=Development/Tutorials/Creating_Konqueror_Service_Menus)
-     */
-    void addServiceActions(KFileItemActions& fileItemActions);
-
-    /**
-     * Adds actions that are provided by a KFileItemActionPlugin.
+     * Adds "Open With" actions

      */
      */

-    void addFileItemPluginActions();
+    void addOpenWithActions(KFileItemActions& fileItemActions);

 
     /**
      * Adds actions that are provided by a KVersionControlPlugin.
 
     /**
      * Adds actions that are provided by a KVersionControlPlugin.


@@ -158,7 +146,9 @@ private:
     {
         NoContext = 0,
         ItemContext = 1,
     {
         NoContext = 0,
         ItemContext = 1,

-        TrashContext = 2
+        TrashContext = 2,
+        TimelineContext = 4,
+        SearchContext = 8,

     };
 
     QPoint m_pos;
     };
 
     QPoint m_pos;


@@ -166,19 +156,21 @@ private:
 
     KFileItem m_fileInfo;
 
 
     KFileItem m_fileInfo;
 

-    KUrl m_baseUrl;
+    QUrl m_baseUrl;

     KFileItem* m_baseFileItem;  /// File item for m_baseUrl
 
     KFileItemList m_selectedItems;
     mutable KFileItemListProperties* m_selectedItemsProperties;
 
     int m_context;
     KFileItem* m_baseFileItem;  /// File item for m_baseUrl
 
     KFileItemList m_selectedItems;
     mutable KFileItemListProperties* m_selectedItemsProperties;
 
     int m_context;

-    KonqCopyToMenu m_copyToMenu;
+    KFileCopyToMenu m_copyToMenu;

     QList<QAction*> m_customActions;
 
     Command m_command;
 
     DolphinRemoveAction* m_removeAction; // Action that represents either 'Move To Trash' or 'Delete'
     QList<QAction*> m_customActions;
 
     Command m_command;
 
     DolphinRemoveAction* m_removeAction; // Action that represents either 'Move To Trash' or 'Delete'

+    void addDirectoryItemContextMenu(KFileItemActions &fileItemActions);
+

 };
 
 #endif
 };
 
 #endif