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
@@ -9,9 +9,13 @@
 
-#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>
@@ -45,3 +49,3 @@ QImage OGfxEffect::gradient(const QSize &size, const QColor &ca,
         if (size.width() == 0 || size.height() == 0) {
-                qDebug ( "WARNING: OGfxEffect::gradient: invalid image" );
+        odebug << "WARNING: OGfxEffect::gradient: invalid image" << oendl;
                 return image;
@@ -301,3 +305,3 @@ QImage& OGfxEffect::blend(QImage &image, float initial_intensity,
     if (image.width() == 0 || image.height() == 0) {
-      qDebug ( "Invalid image\n" );
+      odebug << "Invalid image" << oendl;
       return image;
@@ -487,3 +491,3 @@ QImage& OGfxEffect::blend(QImage &image, float initial_intensity,
     else 
-            qDebug ( "not implemented\n" );
+        odebug << "not implemented" << oendl;
 
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
@@ -180,3 +180,3 @@ void OThemeBase::generateBorderPix( int i )
         else
-                qDebug ( "OThemeBase: Tried making border from empty pixmap" );
+        odebug << "OThemeBase: Tried making border from empty pixmap" << oendl;
 }
@@ -375,3 +375,3 @@ QImage* OThemeBase::loadImage( QString &name )
                 return ( image );
-        qDebug ( "OThemeBase: Unable to load image %s\n", name.ascii ( ) );
+    odebug << "OThemeBase: Unable to load image " << name.ascii ( ) << oendl;
         delete image;
@@ -387,3 +387,3 @@ OThemePixmap* OThemeBase::loadPixmap( QString &name )
                 return pixmap;
-        qDebug ( "OThemeBase: Unable to load pixmap %s\n", name.ascii() );
+    odebug << "OThemeBase: Unable to load pixmap " << name.ascii() << oendl;
         delete pixmap;
@@ -425,3 +425,3 @@ OThemePixmap* OThemeBase::scale( int w, int h, WidgetType widget )
                                 else
-                                        qDebug ( "We would have inserted a null pixmap!\n" );
+                    odebug << "We would have inserted a null pixmap!" << oendl;
                                 pixmaps[ widget ] = cachePix;
@@ -447,3 +447,3 @@ OThemePixmap* OThemeBase::scale( int w, int h, WidgetType widget )
                                 else
-                                        qDebug ( "We would have inserted a null pixmap!\n" );
+                    odebug << "We would have inserted a null pixmap!" << oendl;
                                 pixmaps[ widget ] = cachePix;
@@ -592,3 +592,3 @@ OThemePixmap* OThemeBase::scaleBorder( int w, int h, WidgetType widget )
                 if ( !pixmap->mask() )
-                        qDebug ( "No mask for border pixmap!\n" );
+            odebug << "No mask for border pixmap!" << oendl;
         }
@@ -807,3 +807,4 @@ void OThemeBase::applyMiscResourceGroup( Config *config )
                 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;
@@ -817,3 +818,4 @@ void OThemeBase::applyMiscResourceGroup( Config *config )
                 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;
@@ -868,3 +870,4 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q
                 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;
@@ -891,3 +894,4 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q
                 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;
@@ -947,4 +951,5 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q
                 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;
@@ -1005,3 +1010,3 @@ void OThemeBase::readResourceGroup( int i, QString *copyfrom, QString *pixnames,
                 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 ;