[vlc-commits] Qt, menus: remove unneeded function

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Mar 11 20:25:58 2011 +0100| [1cab82c213a6fb2098e73cf6875c46548b135dae] | committer: Jean-Baptiste Kempf

Qt, menus: remove unneeded function

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

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

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 41dcbea..42ecf16 100644
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -34,10 +34,9 @@
 # include "config.h"
 #endif
 
+#include <vlc_common.h>
 #include <vlc_intf_strings.h>
-#include <vlc_services_discovery.h> /*vlc_sd_GetNames*/
-#include <vlc_aout.h>
-#include <vlc_vout.h>
+#include <vlc_vout.h>              /* vout_thread_t */
 
 #include "menus.hpp"
 
@@ -695,37 +694,6 @@ QMenu *QVLCMenu::RebuildNavigMenu( intf_thread_t *p_intf, QMenu *menu )
 }
 
 /**
- * Service Discovery SubMenu
- **/
-QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf, QWidget *parent )
-{
-    QMenu *menu = new QMenu( parent );
-    menu->setTitle( qtr( I_PL_SD ) );
-
-    char **ppsz_longnames;
-    char **ppsz_names = vlc_sd_GetNames( p_intf, &ppsz_longnames, NULL );
-    if( !ppsz_names )
-        return menu;
-
-    char **ppsz_name = ppsz_names, **ppsz_longname = ppsz_longnames;
-    for( ; *ppsz_name; ppsz_name++, ppsz_longname++ )
-    {
-        if( !strcmp( *ppsz_name, "podcast" ) )
-        {
-            QAction *b = new QAction( qtr( "Configure podcasts..." ), menu );
-            //b->setEnabled( a->isChecked() );
-            menu->addAction( b );
-            CONNECT( b, triggered(), THEDP, podcastConfigureDialog() );
-        }
-        free( *ppsz_name );
-        free( *ppsz_longname );
-    }
-    free( ppsz_names );
-    free( ppsz_longnames );
-    return menu;
-}
-
-/**
  * Help/About Menu
 **/
 QMenu *QVLCMenu::HelpMenu( QWidget *parent )
diff --git a/modules/gui/qt4/menus.hpp b/modules/gui/qt4/menus.hpp
index edcbfc1..f264d6d 100644
--- a/modules/gui/qt4/menus.hpp
+++ b/modules/gui/qt4/menus.hpp
@@ -94,7 +94,6 @@ public:
 private:
     /* All main Menus */
     static QMenu *FileMenu( intf_thread_t *, QWidget * );
-    static QMenu *SDMenu( intf_thread_t *, QWidget * );
 
     static QMenu *ToolsMenu( QMenu * );
     static QMenu *ToolsMenu( QWidget *parent ) { return ToolsMenu( new QMenu( parent ) ); }