X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fqt4%2Fmenus.hpp;h=f553679ba91f187ff45c64e5f9f51443a44fe768;hb=7214994261f855c83ee4d40d4b068418e04dcc62;hp=3d86a98c89ae6b3bdfa10b72724365111b6b37a2;hpb=544625f19e2bcff397f6b591759f486d0a325075;p=vlc

diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index 3d86a98c89..f553679ba9 100644
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -71,7 +71,7 @@ private:
 
 class QVLCMenu : public QObject
 {
-    Q_OBJECT;
+    Q_OBJECT
     friend class MenuFunc;
 
 public:
@@ -80,12 +80,12 @@ public:
 
     /* Popups Menus */
     static void PopupMenu( intf_thread_t *, bool );
-    static void AudioPopupMenu( intf_thread_t * );
-    static void VideoPopupMenu( intf_thread_t * );
-    static void MiscPopupMenu( intf_thread_t * );
+    static void AudioPopupMenu( intf_thread_t *, bool );
+    static void VideoPopupMenu( intf_thread_t *, bool );
+    static void MiscPopupMenu( intf_thread_t *, bool );
 
     /* Systray */
-    static void updateSystrayMenu( MainInterface *,intf_thread_t  *,
+    static void updateSystrayMenu( MainInterface *, intf_thread_t  *,
                                    bool b_force_visible = false);
 
     /* Actions */
@@ -99,8 +99,8 @@ private:
     static QMenu *ToolsMenu( QMenu * );
     static QMenu *ToolsMenu( QWidget * );
 
-    static QMenu *ViewMenu( intf_thread_t *, QWidget *parent );
-    static QMenu *ViewMenu( intf_thread_t *, QMenu *, bool with_intf );
+    static QMenu *ViewMenu( intf_thread_t *, QWidget * );
+    static QMenu *ViewMenu( intf_thread_t *, QMenu *, MainInterface * mi = NULL );
 
     static QMenu *InterfacesMenu( intf_thread_t *p_intf, QMenu * );
     static void ExtensionsMenu( intf_thread_t *p_intf, QMenu * );
@@ -157,7 +157,7 @@ public:
             case 1: QVLCMenu::AudioMenu( p_intf, menu ); break;
             case 2: QVLCMenu::VideoMenu( p_intf, menu ); break;
             case 3: QVLCMenu::RebuildNavigMenu( p_intf, menu ); break;
-            case 4: QVLCMenu::ViewMenu( p_intf, menu, true ); break;
+            case 4: QVLCMenu::ViewMenu( p_intf, menu ); break;
         }
     }
 private: