[vlc-commits] Qt: use isEmpty() iso empty()
Jean-Baptiste Kempf
git at videolan.org
Tue Aug 16 17:32:21 CEST 2011
vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Aug 16 17:07:18 2011 +0200| [0d348f07a8760054520819cc0ee764d1f4036d7a] | committer: Jean-Baptiste Kempf
Qt: use isEmpty() iso empty()
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0d348f07a8760054520819cc0ee764d1f4036d7a
---
modules/gui/qt4/components/epg/EPGView.cpp | 6 +++---
modules/gui/qt4/util/customwidgets.cpp | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/modules/gui/qt4/components/epg/EPGView.cpp b/modules/gui/qt4/components/epg/EPGView.cpp
index 935fd22..3899b6b 100644
--- a/modules/gui/qt4/components/epg/EPGView.cpp
+++ b/modules/gui/qt4/components/epg/EPGView.cpp
@@ -106,7 +106,7 @@ const QDateTime& EPGView::baseTime()
bool EPGView::hasValidData()
{
- return !epgitemsByChannel.empty();
+ return !epgitemsByChannel.isEmpty();
}
static void cleanOverlapped( EPGEventByTimeQMap *epgItemByTime, EPGItem *epgItem, QGraphicsScene *scene )
@@ -207,7 +207,7 @@ void EPGView::removeEPGEvent( vlc_epg_event_t *data, QString channelName )
delete epgItem;
}
- if ( epgItemByTime->keys().empty() )
+ if ( epgItemByTime->keys().isEmpty() )
{ /* Now unused channel */
epgitemsByChannel.remove( channelName );
delete epgItemByTime;
@@ -275,7 +275,7 @@ void EPGView::cleanup()
}
}
- if ( epgItemByTime->keys().empty() )
+ if ( epgItemByTime->keys().isEmpty() )
{ /* Now unused channel */
epgitemsByChannel.remove( channelName );
delete epgItemByTime;
diff --git a/modules/gui/qt4/util/customwidgets.cpp b/modules/gui/qt4/util/customwidgets.cpp
index dd40e46..8240c6d 100644
--- a/modules/gui/qt4/util/customwidgets.cpp
+++ b/modules/gui/qt4/util/customwidgets.cpp
@@ -344,7 +344,7 @@ void AnimatedIcon::play( int loops, int interval )
interval = 20;
}
- if( !mIdleFrame && (mFrames.empty() || loops != 0 ) )
+ if( !mIdleFrame && (mFrames.isEmpty() || loops != 0 ) )
{
#ifndef NDEBUG
printf( "AnimatedIcon::play(): no frames to display" );
@@ -373,7 +373,7 @@ void AnimatedIcon::play( int loops, int interval )
// private slot
void AnimatedIcon::onTimerTick()
{
- //assert( !mFrames.empty() );
+ //assert( !mFrames.isEmpty() );
if( ++mCurrentFrame > mFrames.count() )
{
if( mRemainingLoops != -1 )
More information about the vlc-commits
mailing list