| -rw-r--r-- | noncore/multimedia/opieplayer2/skin.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp index 5d8929e..b2c1649 100644 --- a/noncore/multimedia/opieplayer2/skin.cpp +++ b/noncore/multimedia/opieplayer2/skin.cpp @@ -29,4 +29,5 @@ #include <qpe/config.h> +#include <qpe/global.h> #include <assert.h> @@ -180,9 +181,9 @@ SkinData *SkinCache::lookupAndTake( const QString &skinPath, const QString &file data = new SkinData; else - odebug << "SkinCache: hit" << oendl; + odebug << "SkinCache: hit" << oendl; QPixmap *bgPixmap = m_backgroundPixmapCache.find( skinPath ); if ( bgPixmap ) { - odebug << "SkinCache: hit on bgpixmap" << oendl; + odebug << "SkinCache: hit on bgpixmap" << oendl; data->backgroundPixmap = *bgPixmap; } @@ -220,15 +221,15 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS switch ( m_currentState ) { case LoadBackgroundPixmap: - odebug << "load bgpixmap" << oendl; + odebug << "load bgpixmap" << oendl; m_skin.backgroundPixmap(); m_currentState = LoadButtonUpImage; break; case LoadButtonUpImage: - odebug << "load upimage" << oendl; + odebug << "load upimage" << oendl; m_skin.buttonUpImage(); m_currentState = LoadButtonDownImage; break; case LoadButtonDownImage: - odebug << "load downimage" << oendl; + odebug << "load downimage" << oendl; m_skin.buttonDownImage(); m_currentState = LoadButtonMasks; @@ -236,5 +237,5 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS break; case LoadButtonMasks: - odebug << "load button masks " << m_currentButton << "" << oendl; + odebug << "load button masks " << m_currentButton << "" << oendl; m_skin.buttonMaskImage( m_info.buttonInfo[ m_currentButton ].fileName ); @@ -245,5 +246,5 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS break; case LoadButtonMask: - odebug << "load whole mask" << oendl; + odebug << "load whole mask" << oendl; m_skin.buttonMask( m_info.buttonInfo, m_info.buttonCount ); return LoadingCompleted; @@ -260,5 +261,5 @@ SkinLoader::SkinLoader() SkinLoader::~SkinLoader() { - odebug << "SkinLoader::~SkinLoader()" << oendl; + Global::statusMessage( tr( "Loading of Skin finished" ) ); killTimers(); delete m_currentLoader; @@ -279,5 +280,5 @@ void SkinLoader::start() assert( m_timerId == -1 ); m_timerId = startTimer( 100 /* ms */ ); - odebug << "SkinLoader::start() " << pendingSkins.count() << " jobs" << oendl; + odebug << "SkinLoader::start() " << pendingSkins.count() << " jobs" << oendl; } @@ -292,5 +293,5 @@ void SkinLoader::timerEvent( QTimerEvent *ev ) if ( pendingSkins.isEmpty() ) { - odebug << "all jobs done" << oendl; + odebug << "all jobs done" << oendl; killTimer( m_timerId ); m_timerId = -1; @@ -304,5 +305,5 @@ void SkinLoader::timerEvent( QTimerEvent *ev ) m_currentLoader = new IncrementalLoader( nfo ); - odebug << "new loader " << pendingSkins.count() << " jobs left" << oendl; + odebug << "new loader " << pendingSkins.count() << " jobs left" << oendl; } @@ -312,5 +313,5 @@ void SkinLoader::timerEvent( QTimerEvent *ev ) } - odebug << "finished step" << oendl; + odebug << "finished step" << oendl; } |