Drop trailing semicolons

[vlc] / modules / gui / qt4 / menus.hpp

diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index b4c4d7b9f83f39e494b7cfc629197c7d9411e624..f553679ba91f187ff45c64e5f9f51443a44fe768 100644 (file)
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#ifndef _MENUS_H_
-#define _MENUS_H_
+#ifndef QVLC_MENUS_H_
+#define QVLC_MENUS_H_
 
 #include "qt4.hpp"
 
@@ -31,13 +31,6 @@
 #include <QAction>
 #include <vector>
 
-/* Folder vs. Directory */
-#if defined( WIN32 ) || defined(__APPLE__)
-#define I_OPEN_FOLDER N_("Open &Folder...")
-#else
-#define I_OPEN_FOLDER N_("Open D&irectory...")
-#endif //WIN32
-
 using namespace std;
 
 class QMenu;
@@ -53,6 +46,8 @@ public:
                   vlc_value_t _val, const char *_var ) : QObject( parent )
     {
         p_obj = _p_obj;
+        if( p_obj )
+            vlc_object_hold( p_obj );
         i_val_type = _i_type;
         val = _val;
         psz_var = strdup( _var );
@@ -62,6 +57,8 @@ public:
         free( psz_var );
         if( ( i_val_type & VLC_VAR_TYPE) == VLC_VAR_STRING )
             free( val.psz_string );
+        if( p_obj )
+            vlc_object_release( p_obj );
     }
 
     vlc_object_t *p_obj;
@@ -74,53 +71,66 @@ private:
 
 class QVLCMenu : public QObject
 {
-    Q_OBJECT;
+    Q_OBJECT
     friend class MenuFunc;
 
 public:
     /* Main bar creation */
-    static void createMenuBar( MainInterface *mi, intf_thread_t *, bool );
+    static void createMenuBar( MainInterface *mi, intf_thread_t * );
 
     /* 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 */
-    static void DoAction( intf_thread_t *, QObject * );
-
-    /* HACK for minimalView */
-    static QAction *minimalViewAction;
+    static void DoAction( QObject * );
 
 private:
     /* All main Menus */
-    static QMenu *FileMenu( intf_thread_t * );
-    static QMenu *SDMenu( intf_thread_t * );
-    static QMenu *ToolsMenu( intf_thread_t * );
-    static QMenu *ViewMenu( intf_thread_t *, QMenu *, MainInterface *,
-                             bool, bool with = true );
+    static QMenu *FileMenu( intf_thread_t *, QWidget * );
+    static QMenu *SDMenu( intf_thread_t *, QWidget * );
+
+    static QMenu *ToolsMenu( QMenu * );
+    static QMenu *ToolsMenu( QWidget * );
+
+    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 * );
+
     static QMenu *NavigMenu( intf_thread_t *, QMenu * );
+    static QMenu *NavigMenu( intf_thread_t *, QWidget * );
+    static QMenu *RebuildNavigMenu( intf_thread_t *, QMenu *);
+
     static QMenu *VideoMenu( intf_thread_t *, QMenu * );
+    static QMenu *VideoMenu( intf_thread_t *, QWidget * );
+
     static QMenu *AudioMenu( intf_thread_t *, QMenu * );
-    static QMenu *InterfacesMenu( intf_thread_t *p_intf, QMenu * );
-    static QMenu *HelpMenu( QMenu * );
+    static QMenu *AudioMenu( intf_thread_t *, QWidget * );
+
+    static QMenu *HelpMenu( QWidget * );
 
     /* Popups Menus */
-    static void PopupMenuStaticEntries( intf_thread_t *p_intf, QMenu *menu );
-    static void PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf,
+    static void PopupMenuStaticEntries( QMenu *menu );
+    static void PopupPlayEntries( QMenu *menu, intf_thread_t *p_intf,
                                          input_thread_t *p_input );
+    static void PopupMenuControlEntries( QMenu *menu, intf_thread_t *p_intf );
+    static void PopupMenuPlaylistControlEntries( QMenu *menu, intf_thread_t *p_intf );
+
     /* Generic automenu methods */
     static QMenu * Populate( intf_thread_t *, QMenu *current,
-                             vector<const char*>&, vector<vlc_object_t *>&,
-                             bool append = false );
+                             vector<const char*>&, vector<vlc_object_t *>& );
 
-    static void CreateAndConnect( QMenu *, const char *, QString, QString,
-                                  int, vlc_object_t *, vlc_value_t, int, bool c = false );
+    static void CreateAndConnect( QMenu *, const char *, const QString&,
+                                  const QString&, int, vlc_object_t *,
+                                  vlc_value_t, int, bool c = false );
     static void UpdateItem( intf_thread_t *, QMenu *, const char *,
                             vlc_object_t *, bool );
     static int CreateChoicesMenu( QMenu *,const char *, vlc_object_t *, bool );
@@ -137,20 +147,22 @@ class MenuFunc : public QObject
     Q_OBJECT
 
 public:
-    MenuFunc( QMenu *_menu, int _id ) { menu = _menu; id = _id; };
+    MenuFunc( QMenu *_menu, int _id ) : QObject( (QObject *)_menu ),
+                                        menu( _menu ), id( _id ){}
+
     void doFunc( intf_thread_t *p_intf)
     {
         switch( id )
         {
             case 1: QVLCMenu::AudioMenu( p_intf, menu ); break;
             case 2: QVLCMenu::VideoMenu( p_intf, menu ); break;
-            case 3: QVLCMenu::NavigMenu( p_intf, menu ); break;
-            case 4: QVLCMenu::InterfacesMenu( p_intf, menu ); break;
+            case 3: QVLCMenu::RebuildNavigMenu( p_intf, menu ); break;
+            case 4: QVLCMenu::ViewMenu( p_intf, menu ); break;
         }
-    };
+    }
 private:
-    int id;
     QMenu *menu;
+    int id;
 };
 
 #endif