Diffstat (limited to 'noncore/multimedia/opieplayer2/skin.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/skin.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/noncore/multimedia/opieplayer2/skin.cpp b/noncore/multimedia/opieplayer2/skin.cpp index 7c38983..84f5f87 100644 --- a/noncore/multimedia/opieplayer2/skin.cpp +++ b/noncore/multimedia/opieplayer2/skin.cpp | |||
@@ -179,9 +179,9 @@ SkinData *SkinCache::lookupAndTake( const QString &skinPath, const QString &file | |||
179 | data = new SkinData; | 179 | data = new SkinData; |
180 | else | 180 | else |
181 | qDebug( "SkinCache: hit" ); | 181 | odebug << "SkinCache: hit" << oendl; |
182 | 182 | ||
183 | QPixmap *bgPixmap = m_backgroundPixmapCache.find( skinPath ); | 183 | QPixmap *bgPixmap = m_backgroundPixmapCache.find( skinPath ); |
184 | if ( bgPixmap ) { | 184 | if ( bgPixmap ) { |
185 | qDebug( "SkinCache: hit on bgpixmap" ); | 185 | odebug << "SkinCache: hit on bgpixmap" << oendl; |
186 | data->backgroundPixmap = *bgPixmap; | 186 | data->backgroundPixmap = *bgPixmap; |
187 | } | 187 | } |
@@ -219,15 +219,15 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS | |||
219 | switch ( m_currentState ) { | 219 | switch ( m_currentState ) { |
220 | case LoadBackgroundPixmap: | 220 | case LoadBackgroundPixmap: |
221 | qDebug( "load bgpixmap" ); | 221 | odebug << "load bgpixmap" << oendl; |
222 | m_skin.backgroundPixmap(); | 222 | m_skin.backgroundPixmap(); |
223 | m_currentState = LoadButtonUpImage; | 223 | m_currentState = LoadButtonUpImage; |
224 | break; | 224 | break; |
225 | case LoadButtonUpImage: | 225 | case LoadButtonUpImage: |
226 | qDebug( "load upimage" ); | 226 | odebug << "load upimage" << oendl; |
227 | m_skin.buttonUpImage(); | 227 | m_skin.buttonUpImage(); |
228 | m_currentState = LoadButtonDownImage; | 228 | m_currentState = LoadButtonDownImage; |
229 | break; | 229 | break; |
230 | case LoadButtonDownImage: | 230 | case LoadButtonDownImage: |
231 | qDebug( "load downimage" ); | 231 | odebug << "load downimage" << oendl; |
232 | m_skin.buttonDownImage(); | 232 | m_skin.buttonDownImage(); |
233 | m_currentState = LoadButtonMasks; | 233 | m_currentState = LoadButtonMasks; |
@@ -235,5 +235,5 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS | |||
235 | break; | 235 | break; |
236 | case LoadButtonMasks: | 236 | case LoadButtonMasks: |
237 | qDebug( "load button masks %i", m_currentButton ); | 237 | odebug << "load button masks " << m_currentButton << "" << oendl; |
238 | m_skin.buttonMaskImage( m_info.buttonInfo[ m_currentButton ].fileName ); | 238 | m_skin.buttonMaskImage( m_info.buttonInfo[ m_currentButton ].fileName ); |
239 | 239 | ||
@@ -244,5 +244,5 @@ SkinLoader::IncrementalLoader::LoaderResult SkinLoader::IncrementalLoader::loadS | |||
244 | break; | 244 | break; |
245 | case LoadButtonMask: | 245 | case LoadButtonMask: |
246 | qDebug( "load whole mask" ); | 246 | odebug << "load whole mask" << oendl; |
247 | m_skin.buttonMask( m_info.buttonInfo, m_info.buttonCount ); | 247 | m_skin.buttonMask( m_info.buttonInfo, m_info.buttonCount ); |
248 | return LoadingCompleted; | 248 | return LoadingCompleted; |
@@ -259,5 +259,5 @@ SkinLoader::SkinLoader() | |||
259 | SkinLoader::~SkinLoader() | 259 | SkinLoader::~SkinLoader() |
260 | { | 260 | { |
261 | qDebug( "SkinLoader::~SkinLoader()" ); | 261 | odebug << "SkinLoader::~SkinLoader()" << oendl; |
262 | killTimers(); | 262 | killTimers(); |
263 | delete m_currentLoader; | 263 | delete m_currentLoader; |
@@ -278,5 +278,5 @@ void SkinLoader::start() | |||
278 | assert( m_timerId == -1 ); | 278 | assert( m_timerId == -1 ); |
279 | m_timerId = startTimer( 100 /* ms */ ); | 279 | m_timerId = startTimer( 100 /* ms */ ); |
280 | qDebug( "SkinLoader::start() %d jobs", pendingSkins.count() ); | 280 | odebug << "SkinLoader::start() " << pendingSkins.count() << " jobs" << oendl; |
281 | } | 281 | } |
282 | 282 | ||
@@ -291,5 +291,5 @@ void SkinLoader::timerEvent( QTimerEvent *ev ) | |||
291 | 291 | ||
292 | if ( pendingSkins.isEmpty() ) { | 292 | if ( pendingSkins.isEmpty() ) { |
293 | qDebug( "all jobs done" ); | 293 | odebug << "all jobs done" << oendl; |
294 | killTimer( m_timerId ); | 294 | killTimer( m_timerId ); |
295 | m_timerId = -1; | 295 | m_timerId = -1; |
@@ -303,5 +303,5 @@ void SkinLoader::timerEvent( QTimerEvent *ev ) | |||
303 | 303 | ||
304 | m_currentLoader = new IncrementalLoader( nfo ); | 304 | m_currentLoader = new IncrementalLoader( nfo ); |
305 | qDebug( "new loader %i jobs left", pendingSkins.count() ); | 305 | odebug << "new loader " << pendingSkins.count() << " jobs left" << oendl; |
306 | } | 306 | } |
307 | 307 | ||
@@ -311,5 +311,5 @@ void SkinLoader::timerEvent( QTimerEvent *ev ) | |||
311 | } | 311 | } |
312 | 312 | ||
313 | qDebug( "finished step" ); | 313 | odebug << "finished step" << oendl; |
314 | } | 314 | } |
315 | 315 | ||