[vlc-commits] Qt: remove dead SD mapper and menu code
Rémi Denis-Courmont
git at videolan.org
Sun Nov 20 16:13:55 CET 2016
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Nov 20 16:44:46 2016 +0200| [2b0e83c33ecffa5d24a10436692e1f4f38e7b168] | committer: Rémi Denis-Courmont
Qt: remove dead SD mapper and menu code
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2b0e83c33ecffa5d24a10436692e1f4f38e7b168
---
modules/gui/qt/dialogs_provider.cpp | 12 ------------
modules/gui/qt/dialogs_provider.hpp | 2 --
2 files changed, 14 deletions(-)
diff --git a/modules/gui/qt/dialogs_provider.cpp b/modules/gui/qt/dialogs_provider.cpp
index 64a7deb..0d37cdb 100644
--- a/modules/gui/qt/dialogs_provider.cpp
+++ b/modules/gui/qt/dialogs_provider.cpp
@@ -85,9 +85,6 @@ DialogsProvider::DialogsProvider( intf_thread_t *_p_intf ) :
CONNECT( menusUpdateMapper, mapped(QObject *),
this, menuUpdateAction( QObject *) );
- SDMapper = new QSignalMapper();
- CONNECT( SDMapper, mapped (QString), this, SDMenuAction( QString ) );
-
new DialogHandler (p_intf, this );
}
@@ -106,7 +103,6 @@ DialogsProvider::~DialogsProvider()
delete menusMapper;
delete menusUpdateMapper;
- delete SDMapper;
delete popupMenu;
delete videoPopupMenu;
@@ -822,14 +818,6 @@ void DialogsProvider::menuUpdateAction( QObject *data )
func->doFunc( p_intf );
}
-void DialogsProvider::SDMenuAction( const QString& data )
-{
- if( !playlist_IsServicesDiscoveryLoaded( THEPL, qtu( data ) ) )
- playlist_ServicesDiscoveryAdd( THEPL, qtu( data ) );
- else
- playlist_ServicesDiscoveryRemove( THEPL, qtu( data ) );
-}
-
void DialogsProvider::sendKey( int key )
{
// translate from a vlc keycode into a Qt sequence
diff --git a/modules/gui/qt/dialogs_provider.hpp b/modules/gui/qt/dialogs_provider.hpp
index 01faa11..36a41ea 100644
--- a/modules/gui/qt/dialogs_provider.hpp
+++ b/modules/gui/qt/dialogs_provider.hpp
@@ -95,7 +95,6 @@ public:
protected:
QSignalMapper *menusMapper;
QSignalMapper *menusUpdateMapper;
- QSignalMapper *SDMapper;
void customEvent( QEvent *);
private:
@@ -175,7 +174,6 @@ public slots:
private slots:
void menuAction( QObject *);
void menuUpdateAction( QObject * );
- void SDMenuAction( const QString& );
signals:
void toolBarConfUpdated();
};
More information about the vlc-commits
mailing list