summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/styles/theme/ogfxeffect.cpp16
-rw-r--r--noncore/styles/theme/othemebase.cpp31
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
@@ -6,15 +6,19 @@
*/
// $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>
//======================================================================
@@ -42,9 +46,9 @@ QImage OGfxEffect::gradient(const QSize &size, const QColor &ca,
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;
@@ -298,9 +302,9 @@ 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();
@@ -484,9 +488,9 @@ 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
@@ -177,9 +177,9 @@ void OThemeBase::generateBorderPix( int i )
}
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,
@@ -372,9 +372,9 @@ QImage* OThemeBase::loadImage( QString &name )
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 );
}
@@ -384,9 +384,9 @@ OThemePixmap* OThemeBase::loadPixmap( QString &name )
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 );
}
@@ -422,9 +422,9 @@ OThemePixmap* OThemeBase::scale( int w, int h, WidgetType widget )
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 );
@@ -444,9 +444,9 @@ OThemePixmap* OThemeBase::scale( int w, int h, WidgetType widget )
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 );
@@ -589,9 +589,9 @@ OThemePixmap* OThemeBase::scaleBorder( int w, int h, WidgetType widget )
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 );
}
@@ -804,9 +804,10 @@ void OThemeBase::applyMiscResourceGroup( Config *config )
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" )
@@ -814,9 +815,10 @@ void OThemeBase::applyMiscResourceGroup( Config *config )
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" )
@@ -865,9 +867,10 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q
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;
}
@@ -888,9 +891,10 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q
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
@@ -944,10 +948,11 @@ void OThemeBase::applyResourceGroup( Config *config, int i, QString *copyfrom, Q
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;
}
}
@@ -1002,9 +1007,9 @@ 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).