[vlc-commits] Qt, selector: Signal renaming to avoid Qt confusion

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue May  3 00:50:08 2011 +0200| [6c569dcc7afa247c3005892bd1394a3e84106077] | committer: Jean-Baptiste Kempf

Qt, selector: Signal renaming to avoid Qt confusion

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/gui/qt4/components/playlist/playlist.cpp |    2 +-
 modules/gui/qt4/components/playlist/selector.cpp |    4 ++--
 modules/gui/qt4/components/playlist/selector.hpp |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/playlist.cpp b/modules/gui/qt4/components/playlist/playlist.cpp
index 54396ec..24fff93 100644
--- a/modules/gui/qt4/components/playlist/playlist.cpp
+++ b/modules/gui/qt4/components/playlist/playlist.cpp
@@ -144,7 +144,7 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QWidget *_par )
     layout->setColumnStretch( 3, 3 );
 
     /* Connect the activation of the selector to a redefining of the PL */
-    DCONNECT( selector, activated( playlist_item_t *, bool ),
+    DCONNECT( selector, categoryActivated( playlist_item_t *, bool ),
               mainView, setRoot( playlist_item_t *, bool ) );
     mainView->setRoot( p_root, false );
 
diff --git a/modules/gui/qt4/components/playlist/selector.cpp b/modules/gui/qt4/components/playlist/selector.cpp
index 4f9a9da..c65ce45 100644
--- a/modules/gui/qt4/components/playlist/selector.cpp
+++ b/modules/gui/qt4/components/playlist/selector.cpp
@@ -276,7 +276,7 @@ void PLSelector::setSource( QTreeWidgetItem *item )
     }
     else if( i_type == SQL_ML )
     {
-        emit activated( NULL, true );
+        emit categoryActivated( NULL, true );
         return;
     }
 
@@ -311,7 +311,7 @@ void PLSelector::setSource( QTreeWidgetItem *item )
 
     /* */
     if( pl_item )
-        emit activated( pl_item, false );
+        emit categoryActivated( pl_item, false );
 }
 
 PLSelItem * PLSelector::addItem (
diff --git a/modules/gui/qt4/components/playlist/selector.hpp b/modules/gui/qt4/components/playlist/selector.hpp
index ddac879..26c3354 100644
--- a/modules/gui/qt4/components/playlist/selector.hpp
+++ b/modules/gui/qt4/components/playlist/selector.hpp
@@ -145,7 +145,7 @@ private slots:
     void podcastRemove( PLSelItem* );
 
 signals:
-    void activated( playlist_item_t *, bool );
+    void categoryActivated( playlist_item_t *, bool );
 };
 
 #endif