Qt: menus: rename MenusManager to MenuBar.

as *Manager seems disliked.
(cherry picked from commit 2dc2da86)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

modules/gui/qt4/components/interface_widgets.cpp

@@ -272,7 +272,7 @@ void BackgroundWidget::paintEvent( QPaintEvent *e )
 
 void BackgroundWidget::contextMenuEvent( QContextMenuEvent *event )
 {
-    QVLCMenuManager::PopupMenu( p_intf, true );
+    VLCMenuBar::PopupMenu( p_intf, true );
     event->accept();
 }
 

modules/gui/qt4/components/playlist/standardpanel.cpp

@@ -120,7 +120,7 @@ void StandardPLPanel::popupPlView( const QPoint &point )
     QModelIndexList list = selection->selectedIndexes();
 
     if( !model->popup( index, globalPoint, list ) )
-        QVLCMenuManager::PopupMenu( p_intf, true );
+        VLCMenuBar::PopupMenu( p_intf, true );
 }
 
 void StandardPLPanel::popupSelectColumn( QPoint )

modules/gui/qt4/dialogs_provider.cpp

@@ -102,10 +102,10 @@ DialogsProvider::~DialogsProvider()
     delete menusUpdateMapper;
     delete SDMapper;
 
-    QVLCMenuManager::PopupMenu( p_intf, false );
-    QVLCMenuManager::AudioPopupMenu( p_intf, false );
-    QVLCMenuManager::VideoPopupMenu( p_intf, false );
-    QVLCMenuManager::MiscPopupMenu( p_intf, false );
+    VLCMenuBar::PopupMenu( p_intf, false );
+    VLCMenuBar::AudioPopupMenu( p_intf, false );
+    VLCMenuBar::VideoPopupMenu( p_intf, false );
+    VLCMenuBar::MiscPopupMenu( p_intf, false );
 }
 
 void DialogsProvider::quit()
@@ -152,13 +152,13 @@ void DialogsProvider::customEvent( QEvent *event )
            vlmDialog(); break;
 #endif
         case INTF_DIALOG_POPUPMENU:
-           QVLCMenuManager::PopupMenu( p_intf, (de->i_arg != 0) ); break;
+           VLCMenuBar::PopupMenu( p_intf, (de->i_arg != 0) ); break;
         case INTF_DIALOG_AUDIOPOPUPMENU:
-           QVLCMenuManager::AudioPopupMenu( p_intf, (de->i_arg != 0) ); break;
+           VLCMenuBar::AudioPopupMenu( p_intf, (de->i_arg != 0) ); break;
         case INTF_DIALOG_VIDEOPOPUPMENU:
-           QVLCMenuManager::VideoPopupMenu( p_intf, (de->i_arg != 0) ); break;
+           VLCMenuBar::VideoPopupMenu( p_intf, (de->i_arg != 0) ); break;
         case INTF_DIALOG_MISCPOPUPMENU:
-           QVLCMenuManager::MiscPopupMenu( p_intf, (de->i_arg != 0) ); break;
+           VLCMenuBar::MiscPopupMenu( p_intf, (de->i_arg != 0) ); break;
         case INTF_DIALOG_WIZARD:
         case INTF_DIALOG_STREAMWIZARD:
             openAndStreamingDialogs(); break;
@@ -724,7 +724,7 @@ void DialogsProvider::loadSubtitlesFile()
 
 void DialogsProvider::menuAction( QObject *data )
 {
-    QVLCMenuManager::DoAction( data );
+    VLCMenuBar::DoAction( data );
 }
 
 void DialogsProvider::menuUpdateAction( QObject *data )

modules/gui/qt4/dialogs_provider.hpp

@@ -83,12 +83,12 @@ enum {
 
 class QEvent;
 class QSignalMapper;
-class QVLCMenuManager;
+class VLCMenuBar;
 
 class DialogsProvider : public QObject
 {
     Q_OBJECT
-    friend class QVLCMenuManager;
+    friend class VLCMenuBar;
 
 public:
     static DialogsProvider *getInstance()

modules/gui/qt4/main_interface.cpp

@@ -146,7 +146,7 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
     /************
      * Menu Bar *
      ************/
-    QVLCMenuManager::createMenuBar( this, p_intf );
+    VLCMenuBar::createMenuBar( this, p_intf );
     CONNECT( THEMIM->getIM(), voutListChanged( vout_thread_t **, int ),
              this, destroyPopupMenu() );
 
@@ -570,12 +570,12 @@ inline void MainInterface::showTab( QWidget *widget )
 
 void MainInterface::destroyPopupMenu()
 {
-    QVLCMenuManager::PopupMenu( p_intf, false );
+    VLCMenuBar::PopupMenu( p_intf, false );
 }
 
 void MainInterface::popupMenu( const QPoint & )
 {
-    QVLCMenuManager::PopupMenu( p_intf, true );
+    VLCMenuBar::PopupMenu( p_intf, true );
 }
 
 void MainInterface::toggleFSC()
@@ -1002,7 +1002,7 @@ void MainInterface::createSystray()
     systrayMenu = new QMenu( qtr( "VLC media player" ), this );
     systrayMenu->setIcon( iconVLC );
 
-    QVLCMenuManager::updateSystrayMenu( this, p_intf, true );
+    VLCMenuBar::updateSystrayMenu( this, p_intf, true );
     sysTray->show();
 
     CONNECT( sysTray, activated( QSystemTrayIcon::ActivationReason ),
@@ -1062,7 +1062,7 @@ void MainInterface::toggleUpdateSystrayMenu()
 #endif
     }
     if( sysTray )
-        QVLCMenuManager::updateSystrayMenu( this, p_intf );
+        VLCMenuBar::updateSystrayMenu( this, p_intf );
 }
 
 /* First Item of the systray menu */
@@ -1074,14 +1074,14 @@ void MainInterface::showUpdateSystrayMenu()
         showNormal();
     activateWindow();
 
-    QVLCMenuManager::updateSystrayMenu( this, p_intf );
+    VLCMenuBar::updateSystrayMenu( this, p_intf );
 }
 
 /* First Item of the systray menu */
 void MainInterface::hideUpdateSystrayMenu()
 {
     hide();
-    QVLCMenuManager::updateSystrayMenu( this, p_intf );
+    VLCMenuBar::updateSystrayMenu( this, p_intf );
 }
 
 /* Click on systray Icon */
@@ -1093,7 +1093,7 @@ void MainInterface::handleSystrayClick(
         case QSystemTrayIcon::Trigger:
         case QSystemTrayIcon::DoubleClick:
 #ifdef Q_WS_MAC
-            QVLCMenuManager::updateSystrayMenu( this, p_intf );
+            VLCMenuBar::updateSystrayMenu( this, p_intf );
 #else
             toggleUpdateSystrayMenu();
 #endif
@@ -1128,7 +1128,7 @@ void MainInterface::updateSystrayTooltipName( const QString& name )
         }
     }
 
-    QVLCMenuManager::updateSystrayMenu( this, p_intf );
+    VLCMenuBar::updateSystrayMenu( this, p_intf );
 }
 
 /**
@@ -1149,7 +1149,7 @@ void MainInterface::updateSystrayTooltipStatus( int i_status )
         sysTray->setToolTip( qtr( "VLC media player" ) );
         break;
     }
-    QVLCMenuManager::updateSystrayMenu( this, p_intf );
+    VLCMenuBar::updateSystrayMenu( this, p_intf );
 }
 
 void MainInterface::changeEvent(QEvent *event)

modules/gui/qt4/menus.hpp

@@ -69,7 +69,7 @@ private:
     int i_val_type;
 };
 
-class QVLCMenuManager : public QObject
+class VLCMenuBar : public QObject
 {
     Q_OBJECT
     friend class MenuFunc;
@@ -155,7 +155,7 @@ private:
 public slots:
     static void updateRecents( intf_thread_t * );
 };
-Q_DECLARE_OPERATORS_FOR_FLAGS(QVLCMenuManager::actionflags)
+Q_DECLARE_OPERATORS_FOR_FLAGS(VLCMenuBar::actionflags)
 
 class MenuFunc : public QObject
 {
@@ -169,10 +169,10 @@ public:
     {
         switch( id )
         {
-            case 1: QVLCMenuManager::AudioMenu( p_intf, menu ); break;
-            case 2: QVLCMenuManager::VideoMenu( p_intf, menu ); break;
-            case 3: QVLCMenuManager::RebuildNavigMenu( p_intf, menu ); break;
-            case 4: QVLCMenuManager::ViewMenu( p_intf, menu ); break;
+            case 1: VLCMenuBar::AudioMenu( p_intf, menu ); break;
+            case 2: VLCMenuBar::VideoMenu( p_intf, menu ); break;
+            case 3: VLCMenuBar::RebuildNavigMenu( p_intf, menu ); break;
+            case 4: VLCMenuBar::ViewMenu( p_intf, menu ); break;
         }
     }
 private:

modules/gui/qt4/recents.cpp

@@ -103,7 +103,7 @@ void RecentsMRL::addRecent( const QString &mrl )
         if( stack->count() > RECENTS_LIST_SIZE )
             stack->takeLast();
     }
-    QVLCMenuManager::updateRecents( p_intf );
+    VLCMenuBar::updateRecents( p_intf );
     save();
 }
 
@@ -113,7 +113,7 @@ void RecentsMRL::clear()
         return;
 
     stack->clear();
-    if( isActive ) QVLCMenuManager::updateRecents( p_intf );
+    if( isActive ) VLCMenuBar::updateRecents( p_intf );
     save();
 }