From: Shaun Reich <shaun.reich@kdemail.net>
Date: Wed, 11 Mar 2009 20:47:46 +0000 (+0000)
Subject: The last commit made the menu be on the heap, this switches it back to stack... ... 
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/eba839113b100ac777c6333fd98243d8d591535a?ds=inline

The last commit made the menu be on the heap, this switches it back to stack... (I initially couldn't figure out how to do that (had to pass by reference)).

svn path=/trunk/KDE/kdebase/apps/; revision=938420
---

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 0f0db62b3..d47996a52 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -843,17 +843,17 @@ void DolphinMainWindow::closeTab(int index)
 
 void DolphinMainWindow::openTabContextMenu(int index, const QPoint& pos)
 {
-    KMenu* menu = new KMenu(this);
+    KMenu menu(this);
 
-    QAction* newTabAction = menu->addAction(KIcon("tab-new"), i18nc("@action:inmenu", "New Tab"));
+    QAction* newTabAction = menu.addAction(KIcon("tab-new"), i18nc("@action:inmenu", "New Tab"));
     newTabAction->setShortcut(actionCollection()->action("new_tab")->shortcut());
 
-    QAction* closeOtherTabsAction = menu->addAction(KIcon("tab-close-other"), i18nc("@action:inmenu", "Close Other Tabs"));
+    QAction* closeOtherTabsAction = menu.addAction(KIcon("tab-close-other"), i18nc("@action:inmenu", "Close Other Tabs"));
 
-    QAction* closeTabAction = menu->addAction(KIcon("tab-close"), i18nc("@action:inmenu", "Close Tab"));
+    QAction* closeTabAction = menu.addAction(KIcon("tab-close"), i18nc("@action:inmenu", "Close Tab"));
     closeTabAction->setShortcut(actionCollection()->action("close_tab")->shortcut());
-    KAcceleratorManager::manage(menu);
-    QAction* selectedAction = menu->exec(pos);
+    KAcceleratorManager::manage(&menu);
+    QAction* selectedAction = menu.exec(pos);
     if (selectedAction == newTabAction) {
         const ViewTab& tab = m_viewTab[index];
         Q_ASSERT(tab.primaryView != 0);