[vlc-devel] commit: Qt: remove dead code/signals (Jean-Baptiste Kempf )
git version control
git at videolan.org
Mon Sep 7 00:04:55 CEST 2009
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Sep 2 00:54:39 2009 +0200| [6ea7535a0d65863088d368589785a4c3ab5db177] | committer: Jean-Baptiste Kempf
Qt: remove dead code/signals
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6ea7535a0d65863088d368589785a4c3ab5db177
---
modules/gui/qt4/components/playlist/panels.hpp | 2 --
modules/gui/qt4/components/playlist/playlist.cpp | 5 -----
.../gui/qt4/components/playlist/playlist_model.hpp | 1 -
modules/gui/qt4/components/playlist/selector.hpp | 2 --
.../gui/qt4/components/playlist/standardpanel.cpp | 10 ----------
5 files changed, 0 insertions(+), 20 deletions(-)
diff --git a/modules/gui/qt4/components/playlist/panels.hpp b/modules/gui/qt4/components/playlist/panels.hpp
index d949c40..d1c2d17 100644
--- 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 7851073..4d70cc5 100644
--- 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 1cb9695..3102d14 100644
--- 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 f496dd9..e395e83 100644
--- 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 5ecaf30..b1c2292 100644
--- 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;
More information about the vlc-devel
mailing list