[vlc-commits] Qt: EPGView: fix visibility warning

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sat Mar 24 15:32:46 2012 +0100| [fcf4105d266875fa5b858de75a74b89a763c30b9] | committer: Francois Cartegnie

Qt: EPGView: fix visibility warning

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

 modules/gui/qt4/components/epg/EPGView.cpp |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/gui/qt4/components/epg/EPGView.cpp b/modules/gui/qt4/components/epg/EPGView.cpp
index dc8ff62..399773a 100644
--- a/modules/gui/qt4/components/epg/EPGView.cpp
+++ b/modules/gui/qt4/components/epg/EPGView.cpp
@@ -132,15 +132,15 @@ static void cleanOverlapped( EPGEventByTimeQMap *epgItemByTime, EPGItem *epgItem
     }
 }
 
-bool EPGView::addEPGEvent( vlc_epg_event_t *data, QString channelName, bool b_current )
+bool EPGView::addEPGEvent( vlc_epg_event_t *eventdata, QString channelName, bool b_current )
 {
     /* Init our nested map if required */
     EPGEventByTimeQMap *epgItemByTime;
     EPGItem *epgItem;
     bool b_refresh_channels = false;
 
-    QDateTime eventStart = QDateTime::fromTime_t( data->i_start );
-    if ( eventStart.addSecs( data->i_duration ) < m_baseTime )
+    QDateTime eventStart = QDateTime::fromTime_t( eventdata->i_start );
+    if ( eventStart.addSecs( eventdata->i_duration ) < m_baseTime )
         return false; /* EPG feed sent expired item */
     if ( eventStart < m_startTime )
     {
@@ -164,13 +164,13 @@ bool EPGView::addEPGEvent( vlc_epg_event_t *data, QString channelName, bool b_cu
         /* Update our existing programs */
         epgItem = epgItemByTime->value( eventStart );
         epgItem->setCurrent( b_current );
-        if ( epgItem->setData( data ) ) /* updates our entry */
+        if ( epgItem->setData( eventdata ) ) /* updates our entry */
             cleanOverlapped( epgItemByTime, epgItem, scene() );
         mutex.unlock();
         return false;
     } else {
         /* Insert a new program entry */
-        epgItem = new EPGItem( data, this );
+        epgItem = new EPGItem( eventdata, this );
         cleanOverlapped( epgItemByTime, epgItem, scene() );
         /* Effectively insert our new program */
         epgItem->setCurrent( b_current );
@@ -187,10 +187,10 @@ bool EPGView::addEPGEvent( vlc_epg_event_t *data, QString channelName, bool b_cu
     return true;
 }
 
-void EPGView::removeEPGEvent( vlc_epg_event_t *data, QString channelName )
+void EPGView::removeEPGEvent( vlc_epg_event_t *eventdata, QString channelName )
 {
     EPGEventByTimeQMap *epgItemByTime;
-    QDateTime eventStart = QDateTime::fromTime_t( data->i_start );
+    QDateTime eventStart = QDateTime::fromTime_t( eventdata->i_start );
     EPGItem *epgItem;
     bool b_update_channels = false;