]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Make the QWeakPointer<DolphinContextMenu> a QScopedPointer<DolphinContextMenu>
authorEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Wed, 28 Jan 2015 15:25:41 +0000 (16:25 +0100)
committerEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Wed, 28 Jan 2015 15:25:41 +0000 (16:25 +0100)
src/dolphinmainwindow.cpp

index a0512768770dade8a0d4c7c993bb954bfa7ae287..398af70a85f62b1d5e6623eaf6a579d6c114990d 100644 (file)
@@ -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()