| -rw-r--r-- | noncore/styles/theme/ogfxeffect.cpp | 16 | ||||
| -rw-r--r-- | noncore/styles/theme/othemebase.cpp | 31 |
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 @@ -8,11 +8,15 @@ // $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> @@ -44,5 +48,5 @@ 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; } @@ -300,5 +304,5 @@ 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; } @@ -486,5 +490,5 @@ QImage& OGfxEffect::blend(QImage &image, float initial_intensity, else - qDebug ( "not implemented\n" ); + odebug << "not implemented" << oendl; return image; 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 @@ -179,5 +179,5 @@ void OThemeBase::generateBorderPix( int i ) } else - qDebug ( "OThemeBase: Tried making border from empty pixmap" ); + odebug << "OThemeBase: Tried making border from empty pixmap" << oendl; } @@ -374,5 +374,5 @@ QImage* OThemeBase::loadImage( QString &name ) 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 ); @@ -386,5 +386,5 @@ OThemePixmap* OThemeBase::loadPixmap( QString &name ) 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 ); @@ -424,5 +424,5 @@ OThemePixmap* OThemeBase::scale( int w, int h, WidgetType 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; } @@ -446,5 +446,5 @@ OThemePixmap* OThemeBase::scale( int w, int h, WidgetType 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; } @@ -591,5 +591,5 @@ OThemePixmap* OThemeBase::scaleBorder( int w, int h, WidgetType widget ) 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 ); @@ -806,5 +806,6 @@ void OThemeBase::applyMiscResourceGroup( Config *config ) 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; } @@ -816,5 +817,6 @@ void OThemeBase::applyMiscResourceGroup( Config *config ) 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; } @@ -867,5 +869,6 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q 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; } @@ -890,5 +893,6 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q 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; } @@ -946,6 +950,7 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q 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; } @@ -1004,5 +1009,5 @@ 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 ; } |