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
@@ -175,13 +175,13 @@ void OThemeBase::generateBorderPix( int i )
                                 Qt::CopyROP, false );
                         tmp.setMask( destMask );
                 }
                 pbPixmaps[ i ] ->setBorder( OThemePixmap::Right, tmp );
         }
         else
-                qDebug ( "OThemeBase: Tried making border from empty pixmap" );
+        odebug << "OThemeBase: Tried making border from empty pixmap" << oendl;
 }
 
 
 void OThemeBase::copyWidgetConfig( int sourceID, int destID, QString *pixnames,
                                    QString *brdnames )
 {
@@ -370,25 +370,25 @@ QImage* OThemeBase::loadImage( QString &name )
 {
         QImage * image = new QImage;
         QString path = configFilePath + "/pixmaps/" + 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 );
 }
 
 OThemePixmap* OThemeBase::loadPixmap( QString &name )
 {
         OThemePixmap * pixmap = new OThemePixmap( false );
         QString path = configFilePath + "/pixmaps/" + 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 );
 }
 
 OThemePixmap* OThemeBase::scale( int w, int h, WidgetType widget )
 {
@@ -420,13 +420,13 @@ OThemePixmap* OThemeBase::scale( int w, int h, WidgetType widget )
                         OThemePixmap * cachePix = cache->horizontalPixmap( w, widget );
                         if ( cachePix ) {
                                 cachePix = new OThemePixmap( *cachePix );
                                 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 {
                                 cache->insert( pixmaps[ widget ], OThemeCache::HorizontalScale, widget );
                                 QImage tmpImg = images[ widget ] ->
                                                 smoothScale( w, images[ widget ] ->height() );
@@ -442,13 +442,13 @@ OThemePixmap* OThemeBase::scale( int w, int h, WidgetType widget )
                         OThemePixmap * cachePix = cache->verticalPixmap( w, widget );
                         if ( cachePix ) {
                                 cachePix = new OThemePixmap( *cachePix );
                                 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 {
                                 cache->insert( pixmaps[ widget ], OThemeCache::VerticalScale, widget );
                                 QImage tmpImg =
                                     images[ widget ] ->smoothScale( images[ widget ] ->width(), h );
@@ -587,13 +587,13 @@ OThemePixmap* OThemeBase::scaleBorder( int w, int h, WidgetType widget )
                 }
                 p.end();
                 mPainter.end();
                 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 );
 }
 
 
 OThemePixmap* OThemeBase::blend( WidgetType widget )
@@ -802,23 +802,25 @@ void OThemeBase::applyMiscResourceGroup( Config *config )
         if ( tmpStr == "BottomLeft" )
                 sbPlacement = SBBottomLeft;
         else if ( tmpStr == "BottomRight" )
                 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" );
         if ( tmpStr == "Small" )
                 arrowStyle = SmallArrow;
         else if ( tmpStr == "3D" )
                 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" );
         if ( tmpStr == "Motif" )
                 shading = Motif;
         else if ( tmpStr == "Next" )
@@ -863,13 +865,14 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q
         else if ( tmpStr == "Horizontal" )
                 scaleHints [ i ] = HorizontalScale;
         else if ( tmpStr == "Vertical" )
                 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;
         }
 
 
         // Gradient type
         tmpStr = config->readEntry( "Gradient" );
@@ -886,13 +889,14 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q
         else if ( tmpStr == "Elliptic" )
                 gradients [ i ] = GrElliptic;
         else if ( tmpStr == "ReverseBevel" )
                 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;
         }
 
         // Blend intensity
         blends[ i ] = config->readEntry( "BlendIntensity", "0.0" ).toDouble();
 
@@ -942,14 +946,15 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q
         pbDuplicate[ i ] = false;
         pbPixmaps[ i ] = NULL;
         pbWidth[ i ] = 0;
         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;
                 }
         }
 
 
         // Various widget specific settings. This was more efficent when bunched
@@ -1000,13 +1005,13 @@ void OThemeBase::readResourceGroup( int i, QString *copyfrom, QString *pixnames,
                         }
                 }
                 if ( loadArray[ sIndex ] ) {
                         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
         // the rest of what we handle).
         for ( tmpVal = DisArrowUp; tmpVal <= DisArrowRight; ++tmpVal ) {
                 if ( tmpVal == i ) {