- 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
@@ -1,28 +1,32 @@
 /* This file is part of the KDE libraries
     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
 //
 //======================================================================
 
 
 QPixmap& OGfxEffect::gradient(QPixmap &pixmap, const QColor &ca,
         const QColor &cb, GradientType eff, int ncols)
@@ -34,25 +38,25 @@ QPixmap& OGfxEffect::gradient(QPixmap &pixmap, const QColor &ca,
         return pixmap;
 }
 
 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());
 
     if( eff == VerticalGradient || eff == HorizontalGradient ){
 
         uint *p;
@@ -290,25 +294,25 @@ QPixmap& OGfxEffect::blend(QPixmap &pixmap, float initial_intensity,
 
             pixmap.convertFromImage(image);
                 }
            return pixmap;
 }
 
 
 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;
     unsigned int a;
 
     // check the boundaries of the initial intesity param
     float unaffected = 1;
@@ -476,25 +480,25 @@ QImage& OGfxEffect::blend(QImage &image, float initial_intensity,
                 b = qBlue (data[ind]) + (int)(intensity *
                                               (b_bgnd - qBlue (data[ind])));
                 if (r > 255) r = 255; if (r < 0 ) r = 0;
                 if (g > 255) g = 255; if (g < 0 ) g = 0;
                 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,
                             GradientType gt, int xf, int yf)
 {
   if (image1.width() == 0 || image1.height() == 0 ||
       image2.width() == 0 || image2.height() == 0)
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
@@ -169,25 +169,25 @@ void OThemeBase::generateBorderPix( int i )
                 bitBlt( &tmp, 0, 0, pbPixmaps[ i ], pbPixmaps[ i ] ->width() - pbWidth[ i ],
                         pbWidth[ i ], pbWidth[ i ], pbPixmaps[ i ] ->height() - pbWidth[ i ] * 2,
                         Qt::CopyROP, false );
                 if ( srcMask ) {
                         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 ];
         blends[ destID ] = blends[ sourceID ];
         bContrasts[ destID ] = bContrasts[ sourceID ];
         borders[ destID ] = borders[ sourceID ];
         highlights[ destID ] = highlights[ sourceID ];
@@ -364,37 +364,37 @@ OThemeBase::~OThemeBase()
                         delete( grHighColors[ i ] );
         }
         delete cache;
 }
 
 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 ||
                         pixmaps[ widget ] ->height() != h ) {
                         OThemePixmap * cachePix = cache->pixmap( w, h, widget );
                         if ( cachePix ) {
                                 cachePix = new OThemePixmap( *cachePix );
@@ -414,47 +414,47 @@ OThemePixmap* OThemeBase::scale( int w, int h, WidgetType widget )
                                         blend( 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 );
                                 if ( blends[ widget ] != 0.0 )
                                         blend( 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 );
                                 if ( blends[ widget ] != 0.0 )
                                         blend( widget );
                         }
                 }
@@ -581,25 +581,25 @@ OThemePixmap* OThemeBase::scaleBorder( int w, int h, WidgetType widget )
                         p.drawTiledPixmap( w - bdWidth, bdWidth, bdWidth, h - bdWidth * 2,
                                            *tmp );
                         if ( srcMask )
                                 mPainter.drawTiledPixmap(  w - bdWidth, bdWidth,  bdWidth, h - bdWidth * 2, *srcMask );
                         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;
         switch ( gradients[ widget ] ) {
                 case GrHorizontal:
                         g = OGfxEffect::HorizontalGradient;
                         break;
@@ -796,35 +796,37 @@ static QColor strToColor ( const QString &str )
 void OThemeBase::applyMiscResourceGroup( Config *config )
 {
         config-> setGroup ( "Misc" );
         QString tmpStr;
 
         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" )
                 shading = KDE;
         else
                 shading = Windows;
 
@@ -857,48 +859,50 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q
                 return ;
 
         // Scale hint
         tmpStr = config->readEntry( "Scale" );
         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;
         else if ( tmpStr == "Horizontal" )
                 gradients [ i ] = GrHorizontal;
         else if ( tmpStr == "Vertical" )
                 gradients [ i ] = GrVertical;
         else if ( tmpStr == "Pyramid" )
                 gradients [ i ] = GrPyramid;
         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 );
 
         // Border width
         borders [ i ] = config->readNumEntry( "Border", 1 );
 
@@ -936,26 +940,27 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q
         images[ i ] = NULL;
 
 
         // Pixmap border
         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 )
                 roundedSlider = config->readBoolEntry( "SmallGroove", false );
         else if ( i == ActiveTab ) {
                 aTabLine = config->readBoolEntry( "BottomLine", true );
         }
@@ -994,25 +999,25 @@ void OThemeBase::readResourceGroup( int i, QString *copyfrom, QString *pixnames,
                 for ( sIndex = 0; sIndex < WIDGETS; ++sIndex ) {
                         if ( tmpStr == widgetEntries[ sIndex ] ) {
                                 if ( !loadArray[ sIndex ] )  // hasn't been loaded yet
                                         readResourceGroup( sIndex, copyfrom, pixnames, brdnames,
                                                            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() ) {
                                 copyWidgetConfig( ArrowUp + ( tmpVal - DisArrowUp ), i, pixnames,
                                                   brdnames );
                                 return ;
                         }