[vlc-commits] Qt: more warnings

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat May 14 13:48:44 2011 +0200| [8b2c14996c021cc5aca212de239a6b3ca1047d82] | committer: Jean-Baptiste Kempf

Qt: more warnings

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

 modules/gui/qt4/util/customwidgets.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/util/customwidgets.cpp b/modules/gui/qt4/util/customwidgets.cpp
index f144671..e9e83b0 100644
--- a/modules/gui/qt4/util/customwidgets.cpp
+++ b/modules/gui/qt4/util/customwidgets.cpp
@@ -302,7 +302,7 @@ QString VLCKeyToString( unsigned val )
 /* Animated Icon implementation */
 
 AnimatedIcon::AnimatedIcon( QWidget *parent )
-    : mTimer( this ), mIdleFrame( NULL )
+    : QLabel( parent ), mTimer( this ), mIdleFrame( NULL )
 {
     mCurrentFrame = mRemainingLoops = 0;
     connect( &mTimer, SIGNAL( timeout() ), this, SLOT( onTimerTick() ) );
@@ -344,7 +344,7 @@ void AnimatedIcon::play( int loops, int interval )
         interval = 20;
     }
 
-    if( !mIdleFrame && ( mFrames.empty() | (loops != 0) ) )
+    if( !mIdleFrame && (mFrames.empty() || loops != 0 ) )
     {
 #ifndef NDEBUG
         printf( "AnimatedIcon::play(): no frames to display" );