[vlc-commits] Qt: epg dialog: fix base class hidden method

[Francois Cartegnie]

vlc/vlc-2.0 | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Mar  2 16:14:04 2012 +0100| [92b735eba4e3fe727177ad00a44faf11fbcd376c] | committer: Jean-Baptiste Kempf

Qt: epg dialog: fix base class hidden method
(cherry picked from commit c86cbfb9b1ebd6af37d47b47d8d982e5df989fca)

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

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=92b735eba4e3fe727177ad00a44faf11fbcd376c
---

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

diff --git a/modules/gui/qt4/dialogs/epg.cpp b/modules/gui/qt4/dialogs/epg.cpp
index 21ce324..11e06f8 100644
--- a/modules/gui/qt4/dialogs/epg.cpp
+++ b/modules/gui/qt4/dialogs/epg.cpp
@@ -73,7 +73,7 @@ EpgDialog::EpgDialog( intf_thread_t *_p_intf ): QVLCFrame( _p_intf )
     layout->addWidget( epg, 10 );
     layout->addWidget( descBox );
 
-    CONNECT( epg, itemSelectionChanged( EPGItem *), this, showEvent( EPGItem *) );
+    CONNECT( epg, itemSelectionChanged( EPGItem *), this, displayEvent( EPGItem *) );
     CONNECT( THEMIM->getIM(), epgChanged(), this, updateInfos() );
     CONNECT( THEMIM, inputChanged( input_thread_t * ), this, updateInfos() );
 
@@ -104,7 +104,7 @@ EpgDialog::~EpgDialog()
     writeSettings( "EPGDialog" );
 }
 
-void EpgDialog::showEvent( EPGItem *epgItem )
+void EpgDialog::displayEvent( EPGItem *epgItem )
 {
     if( !epgItem ) return;
 
diff --git a/modules/gui/qt4/dialogs/epg.hpp b/modules/gui/qt4/dialogs/epg.hpp
index 37b07ff..20e3364 100644
--- a/modules/gui/qt4/dialogs/epg.hpp
+++ b/modules/gui/qt4/dialogs/epg.hpp
@@ -48,7 +48,7 @@ private:
     friend class    Singleton<EpgDialog>;
 
 private slots:
-    void showEvent( EPGItem * );
+    void displayEvent( EPGItem * );
     void updateInfos();
 };