- convert qDebug to odebug

2 files changed, 28 insertions, 19 deletions

diff --git a/noncore/styles/theme/ogfxeffect.cpp b/noncore/styles/theme/ogfxeffect.cpp
index 90b45fe..ab63c98 100644
--- a/noncore/styles/theme/ogfxeffect.cpp
+++ b/noncore/styles/theme/ogfxeffect.cpp
@@ -2,23 +2,27 @@
     Copyright (C) 1998, 1999 Christian Tibirna <ctibirna@total.net>
               (C) 1998, 1999 Daniel M. Duley <mosfet@kde.org>
               (C) 1998, 1999 Dirk A. Mueller <mueller@kde.org>
 
 */
 
 // $Id$
 
-#include <qimage.h>
-#include <qpainter.h>
+#include "ogfxeffect.h"
 
+/* OPIE */
+#include <opie2/odebug.h>
 #include <qpe/qmath.h>
 
-#include "ogfxeffect.h"
+/* QT */
+#include <qimage.h>
+#include <qpainter.h>
 
+/* STD */
 #include <cstdlib>
 #include <cmath>
 
 //======================================================================
 //
 // Gradient effects
 //
 //======================================================================
@@ -38,17 +42,17 @@ QImage OGfxEffect::gradient(const QSize &size, const QColor &ca,
                             const QColor &cb, GradientType eff, int /*ncols*/)
 {    
 	int rDiff, gDiff, bDiff;
 	int rca, gca, bca, rcb, gcb, bcb;
 	
 	QImage image(size, 32);
 
 	if (size.width() == 0 || size.height() == 0) {
-		qDebug ( "WARNING: OGfxEffect::gradient: invalid image" );
+        odebug << "WARNING: OGfxEffect::gradient: invalid image" << oendl;
 		return image;
 	}
 
     register int x, y;
 
     rDiff = (rcb = cb.red())   - (rca = ca.red());
     gDiff = (gcb = cb.green()) - (gca = ca.green());
     bDiff = (bcb = cb.blue())  - (bca = ca.blue());
@@ -294,17 +298,17 @@ QPixmap& OGfxEffect::blend(QPixmap &pixmap, float initial_intensity,
 }
 
 
 QImage& OGfxEffect::blend(QImage &image, float initial_intensity,
                             const QColor &bgnd, GradientType eff,
                             bool anti_dir)
 {
     if (image.width() == 0 || image.height() == 0) {
-      qDebug ( "Invalid image\n" );
+      odebug << "Invalid image" << oendl;
       return image;
     }
 
     int r_bgnd = bgnd.red(), g_bgnd = bgnd.green(), b_bgnd = bgnd.blue();
     int r, g, b;
     int ind;
 
     unsigned int xi, xf, yi, yf;
@@ -480,17 +484,17 @@ QImage& OGfxEffect::blend(QImage &image, float initial_intensity,
                 if (b > 255) b = 255; if (b < 0 ) b = 0;
                 a = qAlpha(data[ind]);
                 data[ind] = qRgba(r, g, b, a);
             }
         }
     }
 
     else 
-    	qDebug ( "not implemented\n" );
+        odebug << "not implemented" << oendl;
 
     return image;
 }
 
 #if 0
 // Not very efficient as we create a third big image...
 //
 QImage& KQGfxEffect::blend(QImage &image1, QImage &image2,
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
@@ -173,17 +173,17 @@ void OThemeBase::generateBorderPix( int i )
 			bitBlt( &destMask, 0, 0, srcMask, pbPixmaps[ i ] ->width() - pbWidth[ i ],
 			        pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2,
 			        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 )
 {
 	scaleHints[ destID ] = scaleHints[ sourceID ];
 	gradients[ destID ] = gradients[ sourceID ];
@@ -368,29 +368,29 @@ OThemeBase::~OThemeBase()
 
 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 )
 {
 	if ( scaleHints[ widget ] == FullScale ) {
 		if ( !pixmaps[ widget ] || pixmaps[ widget ] ->width() != w ||
@@ -418,17 +418,17 @@ OThemePixmap* OThemeBase::scale( int w, int h, WidgetType widget )
 	else if ( scaleHints[ widget ] == HorizontalScale ) {
 		if ( pixmaps[ widget ] ->width() != w ) {
 			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() );
 				pixmaps[ widget ] = new OThemePixmap;
 				pixmaps[ widget ] ->convertFromImage( tmpImg );
@@ -440,17 +440,17 @@ OThemePixmap* OThemeBase::scale( int w, int h, WidgetType widget )
 	else if ( scaleHints[ widget ] == VerticalScale ) {
 		if ( pixmaps[ widget ] ->height() != h ) {
 			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 );
 				pixmaps[ widget ] = new OThemePixmap;
 				pixmaps[ widget ] ->convertFromImage( tmpImg );
@@ -585,17 +585,17 @@ OThemePixmap* OThemeBase::scaleBorder( int w, int h, WidgetType widget )
 			else
 				mPainter.fillRect( w - bdWidth, bdWidth, bdWidth, h - bdWidth * 2, color1 );
 		}
 		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 )
 {
 	OGfxEffect::GradientType g;
@@ -800,27 +800,29 @@ void OThemeBase::applyMiscResourceGroup( Config *config )
 
 	tmpStr = config->readEntry( "SButtonPosition" );
 	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" )
 		shading = Next;
 	else if ( tmpStr == "KDE" )
@@ -861,17 +863,18 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q
 	if ( tmpStr == "Full" )
 		scaleHints [ i ] = FullScale;
 	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" );
 	if ( tmpStr == "Diagonal" )
 		gradients [ i ] = GrDiagonal;
@@ -884,17 +887,18 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q
 	else if ( tmpStr == "Rectangle" )
 		gradients [ i ] = GrRectangle;
 	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();
 
 	// Bevel contrast
 	bContrasts[ i ] = config->readNumEntry( "BevelContrast", 0 );
@@ -940,18 +944,19 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q
 	tmpStr = config->readEntry( "PixmapBorder", "" );
 	brdnames[ i ] = tmpStr;
 	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
 	// together in the misc group, but this makes an easier to read config.
 	if ( i == SliderGroove )
@@ -998,17 +1003,17 @@ void OThemeBase::readResourceGroup( int i, QString *copyfrom, QString *pixnames,
 					                   loadArray );
 				break;
 			}
 		}
 		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 ) {
 			tmpStr = pixnames [ i ];
 			if ( tmpStr.isEmpty() ) {