Qt: remove dead code/signals

diff --git a/modules/gui/qt4/components/playlist/panels.hpp b/modules/gui/qt4/components/playlist/panels.hpp
index d949c40ad23af15df642f82fc44cbe881033b681..d1c2d17c34c2698c042e3065a5519047fbda28fe 100644 (file)
--- a/modules/gui/qt4/components/playlist/panels.hpp
+++ b/modules/gui/qt4/components/playlist/panels.hpp
@@ -57,7 +57,6 @@ protected:
     intf_thread_t *p_intf;
     QFrame *parent;
 public slots:
-    virtual void setRoot( int ) = 0;
     virtual void setRoot( playlist_item_t * ) = 0;
 };
 
@@ -81,7 +80,6 @@ private:
     QSignalMapper *selectColumnsSigMapper;
 public slots:
     void removeItem( int );
-    virtual void setRoot( int );
     virtual void setRoot( playlist_item_t * );
 private slots:
     void deleteSelection();

diff --git a/modules/gui/qt4/components/playlist/playlist.cpp b/modules/gui/qt4/components/playlist/playlist.cpp
index 7851073a631c2f20fd2e71b8981e28adf69b7aa6..4d70cc510db70a7ae00082acd922a036f6ec1d44 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist.cpp
+++ b/modules/gui/qt4/components/playlist/playlist.cpp
@@ -86,11 +86,6 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i ) : p_intf ( _p_i )
     connect( selector, SIGNAL( activated( playlist_item_t * ) ),
              this, SIGNAL( rootChanged( playlist_item_t * ) ) );
 
-    /* Forward removal requests from the selector to the main panel */
-/*    CONNECT( qobject_cast<PLSelector *>( selector )->model,
-             shouldRemove( int ),
-             qobject_cast<StandardPLPanel *>( rightPanel ), removeItem( int ) ); */
-
     emit rootChanged( p_root );
 
     /* Add the two sides of the QSplitter */

diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp
index 1cb9695a9b957ee39b69d1dadc2ae3ed02e4fa8f..3102d1426a680223fc11abd705138e0d23d711af 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist_model.hpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.hpp
@@ -177,7 +177,6 @@ private:
     int i_cached_input_id;
 
 signals:
-    void shouldRemove( int );
     void currentChanged( const QModelIndex& );
 
 public slots:

diff --git a/modules/gui/qt4/components/playlist/selector.hpp b/modules/gui/qt4/components/playlist/selector.hpp
index f496dd9dff098ae52661733c1452fa47a97fc063..e395e8393c1fdfbfb412fd67250179998b6dd8a0 100644 (file)
--- a/modules/gui/qt4/components/playlist/selector.hpp
+++ b/modules/gui/qt4/components/playlist/selector.hpp
@@ -53,9 +53,7 @@ private:
 private slots:
     void setSource( QTreeWidgetItem *item );
 signals:
-    void activated( int );
     void activated( playlist_item_t * );
-    void shouldRemove( int );
 };
 
 #endif

diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp
index 5ecaf301a88f769008b30a62336257a8fe7e0df8..b1c2292a89e2032a756b7201153d8a4986198c73 100644 (file)
--- a/modules/gui/qt4/components/playlist/standardpanel.cpp
+++ b/modules/gui/qt4/components/playlist/standardpanel.cpp
@@ -302,16 +302,6 @@ void StandardPLPanel::doPopup( QModelIndex index, QPoint point )
 
 /* Set the root of the new Playlist */
 /* This activated by the selector selection */
-void StandardPLPanel::setRoot( int i_root_id )
-{
-    QPL_LOCK;
-    playlist_item_t *p_item = playlist_ItemGetById( THEPL, i_root_id );
-    assert( p_item );
-    p_item = playlist_GetPreferredNode( THEPL, p_item );
-    setRoot( p_item );
-    QPL_UNLOCK;
-}
-
 void StandardPLPanel::setRoot( playlist_item_t *p_item )
 {
     QPL_LOCK;