[vlc-commits] Qt: remove unneeded include and parent objects

[Jean-Baptiste Kempf]

vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Jan 13 23:24:35 2012 +0100| [15d8afb033a534b0980992aa765c1efcf1264321] | committer: Jean-Baptiste Kempf

Qt: remove unneeded include and parent objects
(cherry picked from commit 06ca7e5db55f291040b577b7fcdcf95d6bc514a4)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=15d8afb033a534b0980992aa765c1efcf1264321
---

 modules/gui/qt4/menus.cpp |    4 ++--
 modules/gui/qt4/menus.hpp |    1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 4569a40..502a747 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -792,7 +792,7 @@ void VLCMenuBar::PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf,
                                         bool b_normal )
 {
     QAction *action;
-    QMenu *rateMenu = new QMenu( qtr( "Sp&eed" ) );
+    QMenu *rateMenu = new QMenu( qtr( "Sp&eed" ), menu );
     rateMenu->setTearOffEnabled( true );
 
     if( b_normal )
@@ -971,7 +971,7 @@ void VLCMenuBar::PopupMenu( intf_thread_t *p_intf, bool show )
     POPUP_BOILERPLATE
 
     /* */
-    menu = new QMenu( );
+    menu = new QMenu();
     QAction *action;
     bool b_isFullscreen = false;
     MainInterface *mi = p_intf->p_sys->p_mi;
diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index 3bf87b8..20ad2a4 100644
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -28,7 +28,6 @@
 #include "qt4.hpp"
 
 #include <QObject>
-#include <QAction>
 #include <QMenu>
 #include <QVector>