[vlc-commits] Qt: epg dialog: fix base class hidden method
Francois Cartegnie
git at videolan.org
Fri Mar 2 17:36:09 CET 2012
vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Fri Mar 2 16:14:04 2012 +0100| [c86cbfb9b1ebd6af37d47b47d8d982e5df989fca] | committer: Francois Cartegnie
Qt: epg dialog: fix base class hidden method
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c86cbfb9b1ebd6af37d47b47d8d982e5df989fca
---
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 c2036d8..1613f37 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 798cfd8..88bbd26 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();
};
More information about the vlc-commits
mailing list