From: Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
Date: Wed, 28 Jan 2015 15:25:41 +0000 (+0100)
Subject: Make the QWeakPointer<DolphinContextMenu> a QScopedPointer<DolphinContextMenu>
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/7745a9354776c6043b4f691260e434c29de6ca0c

Make the QWeakPointer<DolphinContextMenu> a QScopedPointer<DolphinContextMenu>
---

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index a05127687..398af70a8 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -758,7 +758,7 @@ void DolphinMainWindow::openContextMenu(const QPoint& pos,
                                         const QUrl& url,
                                         const QList<QAction*>& customActions)
 {
-    QWeakPointer<DolphinContextMenu> contextMenu = new DolphinContextMenu(this, pos, item, url);
+    QScopedPointer<DolphinContextMenu> contextMenu(new DolphinContextMenu(this, pos, item, url));
     contextMenu.data()->setCustomActions(customActions);
     const DolphinContextMenu::Command command = contextMenu.data()->open();
 
@@ -781,8 +781,6 @@ void DolphinMainWindow::openContextMenu(const QPoint& pos,
     default:
         break;
     }
-
-    delete contextMenu.data();
 }
 
 void DolphinMainWindow::updateControlMenu()