Fix infinite recursion if the default text is empty.

[dolphin.git] / src / dolphincontextmenu.cpp

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index cd3195e9ae4bffc5ada6806674e1b43b554dbfc5..86b0ff15972dbc8e166d2dd54d6cca586446dfa1 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
     }
@@ -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);
@@ -394,7 +394,7 @@ void DolphinContextMenu::addRevisionControlActions(KMenu* menu)
 {
     const DolphinView* view = m_mainWindow->activeViewContainer()->view();
     const QList<QAction*> revControlActions = view->revisionControlActions(m_selectedItems);
-    if (revControlActions.count() > 0) {
+    if (!revControlActions.isEmpty()) {
         foreach (QAction* action, revControlActions) {
             menu->addAction(action);
         }