Reanimate drag and drop support for the URL navigator.

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 4bbd2d6a70f504754e3437ec81aa708e4626a27f..6c4dda80ab828467373125409d24e8b26e0c824c 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -177,12 +177,13 @@ void DolphinContextMenu::openItemContextMenu()
     const KUrl::List urls = m_dolphinView->selectedUrls();
 
     // insert 'Cut', 'Copy' and 'Paste'
-    const KStandardAction::StdAction actionNames[] = { KStandardAction::Cut, KStandardAction::Copy, KStandardAction::Paste };
-    const int count = sizeof(actionNames) / sizeof(KStandardAction::StdAction);
+    const KStandardAction::StandardAction actionNames[] = { KStandardAction::Cut, KStandardAction::Copy, KStandardAction::Paste };
+    const int count = sizeof(actionNames) / sizeof(KStandardAction::StandardAction);
     for (int i = 0; i < count; ++i) {
         QAction* action = dolphin->actionCollection()->action(KStandardAction::stdName(actionNames[i]));
-        if (action)
+        if (action != 0) {
             popup->addAction(action);
+        }
     }
     popup->insertSeparator();
 
@@ -204,7 +205,7 @@ void DolphinContextMenu::openItemContextMenu()
     // insert 'Bookmark this folder...' entry
     // urls is a list of selected items, so insert boolmark menu if
     // urls contains only one item, i.e. no multiple selection made
-    QAction *bookmarkAction = 0;
+    QAction* bookmarkAction = 0;
     if (m_fileInfo->isDir() && (urls.count() == 1)) {
         bookmarkAction = popup->addAction(i18n("Bookmark this folder"));
     }
@@ -297,8 +298,8 @@ QList<QAction*> DolphinContextMenu::insertOpenWithItems(KMenu* popup,
                 // will be skipped here.
                 const QString appName((*it)->name());
                 if (!containsEntry(openWithMenu, appName)) {
-                    QAction *action = openWithMenu->addAction((*it)->pixmap(K3Icon::Small),
-                                                              appName);
+                    const KIcon icon((*it)->icon());
+                    QAction *action = openWithMenu->addAction(icon, appName);
                     openWithVector.append(*it);
                     openWithActions << action;
                 }