[vlc-commits] Qt, menus: inline functions

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Mar 11 19:29:39 2011 +0100| [a25fb17cf5f100fac972b1e2826ded6ccd25ca9b] | committer: Jean-Baptiste Kempf

Qt, menus: inline functions

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

 modules/gui/qt4/menus.cpp |   20 --------------------
 modules/gui/qt4/menus.hpp |   16 +++++++++++-----
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index cf11152..67e8485 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -411,11 +411,6 @@ QMenu *QVLCMenu::ToolsMenu( QMenu *menu )
     return menu;
 }
 
-QMenu *QVLCMenu::ToolsMenu( QWidget *parent )
-{
-    return ToolsMenu( new QMenu( parent ) );
-}
-
 /**
  * View Menu
  * Interface modification, load other interfaces, activate Extensions
@@ -588,11 +583,6 @@ QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QMenu * current )
     return Populate( p_intf, current, varnames, objects );
 }
 
-QMenu *QVLCMenu::AudioMenu( intf_thread_t *p_intf, QWidget *parent )
-{
-    return AudioMenu( p_intf, new QMenu( parent ) );
-}
-
 /**
  * Main Video Menu
  * Subtitles are part of Video.
@@ -648,11 +638,6 @@ QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QMenu *current )
     return Populate( p_intf, current, varnames, objects );
 }
 
-QMenu *QVLCMenu::VideoMenu( intf_thread_t *p_intf, QWidget *parent )
-{
-    return VideoMenu( p_intf, new QMenu( parent ) );
-}
-
 /**
  * Navigation Menu
  * For DVD, MP4, MOV and other chapter based format
@@ -706,11 +691,6 @@ QMenu *QVLCMenu::RebuildNavigMenu( intf_thread_t *p_intf, QMenu *menu )
     return Populate( p_intf, menu, varnames, objects );
 }
 
-QMenu *QVLCMenu::NavigMenu( intf_thread_t *p_intf, QWidget *parent )
-{
-    return NavigMenu( p_intf, new QMenu( parent ) );
-}
-
 /**
  * Service Discovery SubMenu
  **/
diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index 6093e4f..edcbfc1 100644
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -29,11 +29,11 @@
 
 #include <QObject>
 #include <QAction>
+#include <QMenu>
 #include <vector>
 
 using namespace std;
 
-class QMenu;
 class QMenuBar;
 class QSystemTrayIcon;
 
@@ -97,7 +97,7 @@ private:
     static QMenu *SDMenu( intf_thread_t *, QWidget * );
 
     static QMenu *ToolsMenu( QMenu * );
-    static QMenu *ToolsMenu( QWidget * );
+    static QMenu *ToolsMenu( QWidget *parent ) { return ToolsMenu( new QMenu( parent ) ); }
 
     static QMenu *ViewMenu( intf_thread_t *, QMenu *, MainInterface * mi = NULL );
 
@@ -105,14 +105,20 @@ private:
     static void ExtensionsMenu( intf_thread_t *p_intf, QMenu * );
 
     static QMenu *NavigMenu( intf_thread_t *, QMenu * );
-    static QMenu *NavigMenu( intf_thread_t *, QWidget * );
+    static QMenu *NavigMenu( intf_thread_t *p_intf, QWidget *parent ) {
+        return NavigMenu( p_intf, new QMenu( parent ) );
+    }
     static QMenu *RebuildNavigMenu( intf_thread_t *, QMenu *);
 
     static QMenu *VideoMenu( intf_thread_t *, QMenu * );
-    static QMenu *VideoMenu( intf_thread_t *, QWidget * );
+    static QMenu *VideoMenu( intf_thread_t *p_intf, QWidget *parent ) {
+        return VideoMenu( p_intf, new QMenu( parent ) );
+    }
 
     static QMenu *AudioMenu( intf_thread_t *, QMenu * );
-    static QMenu *AudioMenu( intf_thread_t *, QWidget * );
+    static QMenu *AudioMenu( intf_thread_t *p_intf, QWidget *parent ) {
+        return AudioMenu( p_intf, new QMenu( parent ) );
+    }
 
     static QMenu *HelpMenu( QWidget * );