1 files changed, 18 insertions, 13 deletions

diff --git a/noncore/styles/theme/othemebase.cpp b/noncore/styles/theme/othemebase.cpp
index 7ce4e5a..d2226e6 100644
--- a/noncore/styles/theme/othemebase.cpp
+++ b/noncore/styles/theme/othemebase.cpp
@@ -178,7 +178,7 @@ void OThemeBase::generateBorderPix( int i )
 		pbPixmaps[ i ] ->setBorder( OThemePixmap::Right, tmp );
 	}
 	else
-		qDebug ( "OThemeBase: Tried making border from empty pixmap" );
+        odebug << "OThemeBase: Tried making border from empty pixmap" << oendl;
 }
 
 
@@ -373,7 +373,7 @@ QImage* OThemeBase::loadImage( QString &name )
 	image->load( path );
 	if ( !image->isNull() )
 		return ( image );
-	qDebug ( "OThemeBase: Unable to load image %s\n", name.ascii ( ) );
+    odebug << "OThemeBase: Unable to load image " << name.ascii ( ) << oendl;
 	delete image;
 	return ( NULL );
 }
@@ -385,7 +385,7 @@ OThemePixmap* OThemeBase::loadPixmap( QString &name )
 	pixmap->load( path );
 	if ( !pixmap->isNull() )
 		return pixmap;
-	qDebug ( "OThemeBase: Unable to load pixmap %s\n", name.ascii() );
+    odebug << "OThemeBase: Unable to load pixmap " << name.ascii() << oendl;
 	delete pixmap;
 	return ( NULL );
 }
@@ -423,7 +423,7 @@ OThemePixmap* OThemeBase::scale( int w, int h, WidgetType widget )
 				if ( pixmaps[ widget ] )
 					cache->insert( pixmaps[ widget ], OThemeCache::HorizontalScale, widget );
 				else
-					qDebug ( "We would have inserted a null pixmap!\n" );
+                    odebug << "We would have inserted a null pixmap!" << oendl;
 				pixmaps[ widget ] = cachePix;
 			}
 			else {
@@ -445,7 +445,7 @@ OThemePixmap* OThemeBase::scale( int w, int h, WidgetType widget )
 				if ( pixmaps[ widget ] )
 					cache->insert( pixmaps[ widget ], OThemeCache::VerticalScale, widget );
 				else
-					qDebug ( "We would have inserted a null pixmap!\n" );
+                    odebug << "We would have inserted a null pixmap!" << oendl;
 				pixmaps[ widget ] = cachePix;
 			}
 			else {
@@ -590,7 +590,7 @@ OThemePixmap* OThemeBase::scaleBorder( int w, int h, WidgetType widget )
 		pixmap->setMask( mask );
 		cache->insert( pixmap, OThemeCache::FullScale, widget, true );
 		if ( !pixmap->mask() )
-			qDebug ( "No mask for border pixmap!\n" );
+            odebug << "No mask for border pixmap!" << oendl;
 	}
 	return ( pixmap );
 }
@@ -805,7 +805,8 @@ void OThemeBase::applyMiscResourceGroup( Config *config )
 		sbPlacement = SBBottomRight;
 	else {
 		if ( tmpStr != "Opposite" && !tmpStr.isEmpty() )
-			qDebug ( "OThemeBase: Unrecognized sb button option %s, using Opposite.\n", tmpStr.ascii() );
+            odebug << "OThemeBase: Unrecognized sb button option " << tmpStr.ascii()
+                   << ", using Opposite." << oendl;
 		sbPlacement = SBOpposite;
 	}
 	tmpStr = config->readEntry( "ArrowType" );
@@ -815,7 +816,8 @@ void OThemeBase::applyMiscResourceGroup( Config *config )
 		arrowStyle = MotifArrow;
 	else {
 		if ( tmpStr != "Normal" && !tmpStr.isEmpty() )
-			qDebug ( "OThemeBase: Unrecognized arrow option %s, using Normal.\n", tmpStr.ascii() );
+            odebug << "OThemeBase: Unrecognized arrow option " << tmpStr.ascii()
+                   << ", using Normal." << oendl;
 		arrowStyle = LargeArrow;
 	}
 	tmpStr = config->readEntry( "ShadeStyle" );
@@ -866,7 +868,8 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q
 		scaleHints [ i ] = VerticalScale;
 	else {
 		if ( tmpStr != "Tile" && !tmpStr.isEmpty() )
-			qDebug ( "OThemeBase: Unrecognized scale option %s, using Tile.\n", tmpStr.ascii() );
+            odebug << "OThemeBase: Unrecognized scale option " << tmpStr.ascii()
+                   << ", using Tile." << oendl;
 		scaleHints [ i ] = TileScale;
 	}
 
@@ -889,7 +892,8 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q
 		gradients [ i ] = GrReverseBevel;
 	else {
 		if ( tmpStr != "None" && !tmpStr.isEmpty() )
-			qDebug ( "OThemeBase: Unrecognized gradient option %s, using None.\n", tmpStr.ascii() );
+            odebug << "OThemeBase: Unrecognized gradient option " << tmpStr.ascii()
+                   << ", using None." << oendl;
 		gradients [ i ] = GrNone;
 	}
 
@@ -945,8 +949,9 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q
 	if ( !tmpStr.isEmpty() ) {
 		pbWidth[ i ] = config->readNumEntry( "PixmapBWidth", 0 );
 		if ( pbWidth[ i ] == 0 ) {
-			qDebug ( "OThemeBase: No border width specified for pixmapped border widget %s\n", widgetEntries[ i ] );
-			qDebug ( "OThemeBase: Using default of 2.\n" );
+            odebug << "OThemeBase: No border width specified for pixmapped border widget "
+                   << widgetEntries[ i ] << oendl;
+            odebug << "OThemeBase: Using default of 2." << oendl;
 			pbWidth[ i ] = 2;
 		}
 	}
@@ -1003,7 +1008,7 @@ void OThemeBase::readResourceGroup( int i, QString *copyfrom, QString *pixnames,
 			copyWidgetConfig( sIndex, i, pixnames, brdnames );
 		}
 		else
-			qDebug ( "OThemeBase: Unable to identify source widget for %s\n", widgetEntries[ i ] );
+            odebug << "OThemeBase: Unable to identify source widget for " << widgetEntries[ i ] << oendl;
 		return ;
 	}
 	// special inheritance for disabled arrows (these are tri-state unlike