Start of refactoring so that the metadata widget can be moved outside of Dolphin...

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index cd3195e9ae4bffc5ada6806674e1b43b554dbfc5..ed99a34e74fc669e41b0fb308236bf7397b3b32d 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -88,7 +88,7 @@ void DolphinContextMenu::open()
         m_context |= TrashContext;
     }
 
-    if (!m_fileInfo.isNull() && (m_selectedItems.count() > 0)) {
+    if (!m_fileInfo.isNull() && !m_selectedItems.isEmpty()) {
         m_context |= ItemContext;
         // TODO: handle other use cases like devices + desktop files
     }
@@ -223,7 +223,7 @@ void DolphinContextMenu::openItemContextMenu()
         popup->addSeparator();
     }
 
-    // insert revision control actions
+    // insert version control actions
     addRevisionControlActions(popup);
 
     // insert 'Copy To' and 'Move To' sub menus
@@ -268,7 +268,7 @@ void DolphinContextMenu::openViewportContextMenu()
     popup->addAction(pasteAction);
 
     // setup 'View Mode' menu
-    KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode"));
+    KMenu* viewModeMenu = new KMenu(i18nc("@title:menu", "View Mode"), popup);
 
     QAction* iconsMode = m_mainWindow->actionCollection()->action("icons");
     viewModeMenu->addAction(iconsMode);
@@ -393,9 +393,9 @@ KFileItemListProperties& DolphinContextMenu::capabilities()
 void DolphinContextMenu::addRevisionControlActions(KMenu* menu)
 {
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
-    const QList<QAction*> revControlActions = view->revisionControlActions(m_selectedItems);
-    if (revControlActions.count() > 0) {
-        foreach (QAction* action, revControlActions) {
+    const QList<QAction*> versionControlActions = view->versionControlActions(m_selectedItems);
+    if (!versionControlActions.isEmpty()) {
+        foreach (QAction* action, versionControlActions) {
             menu->addAction(action);
         }
         menu->addSeparator();