Cleanup of DolphinContextMenu:

- don't use any deprecated methods anymore
- temporary deactivated the "Open With..." submenu. There's a crash in KDirModel when invoking KFileItem::mimetype(); although the same code worked with an older version of kdelibs, I assume this is a Dolphin issue -> I'll do some further analyses...

svn path=/trunk/playground/utils/dolphin/; revision=626023

1 files changed, 5 insertions, 13 deletions

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index 9f31b6271..69554b01f 100644
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -21,10 +21,9 @@
 #ifndef DOLPHINCONTEXTMENU_H
 #define DOLPHINCONTEXTMENU_H
 
-#include <qpoint.h>
-#include <qstring.h>
-#include <q3valuelist.h>
-#include <q3valuevector.h>
+#include <QString>
+#include <QVector>
+
 #include <kservice.h>
 #include <kpropertiesdialog.h>
 #include <kdedesktopmimetype.h>
@@ -84,7 +83,7 @@ private:
      *                       to the predecessor.
      */
     QList<QAction*> insertOpenWithItems(KMenu* popup,
-                                        Q3ValueVector<KService::Ptr>& openWithVector);
+                                        QVector<KService::Ptr>& openWithVector);
 
     /**
      * Inserts the 'Actions...' submenu to \a popup.
@@ -94,7 +93,7 @@ private:
      *                       services.
      */
     QList<QAction*> insertActionItems(KMenu* popup,
-                                      Q3ValueVector<KDEDesktopMimeType::Service>& actionsVector);
+                                      QVector<KDEDesktopMimeType::Service>& actionsVector);
 
     /**
      * Returns true, if 'menu' contains already
@@ -103,13 +102,6 @@ private:
     bool containsEntry(const KMenu* menu,
                        const QString& entryName) const;
 
-    enum {
-        submenuID       =   90,
-        bookmarkID      =   91,
-        openWithIDStart =  100,
-        actionsIDStart  = 1000
-    };
-
     DolphinView* m_dolphinView;
     KFileItem* m_fileInfo;
     QPoint m_pos;