summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/styles/theme/ogfxeffect.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/noncore/styles/theme/ogfxeffect.cpp b/noncore/styles/theme/ogfxeffect.cpp
index a991728..55f3c1f 100644
--- a/noncore/styles/theme/ogfxeffect.cpp
+++ b/noncore/styles/theme/ogfxeffect.cpp
@@ -11,4 +11,6 @@
11#include <qpainter.h> 11#include <qpainter.h>
12 12
13#include <qpe/qmath.h>
14
13#include "ogfxeffect.h" 15#include "ogfxeffect.h"
14 16
@@ -22,5 +24,5 @@
22 24
23QPixmap& OGfxEffect::gradient(QPixmap &pixmap, const QColor &ca, 25QPixmap& OGfxEffect::gradient(QPixmap &pixmap, const QColor &ca,
24 const QColor &cb, GradientType eff, int ncols) 26 const QColor &cb, GradientType eff, int /*ncols*/)
25{ 27{
26 if(pixmap.depth() > 8 && 28 if(pixmap.depth() > 8 &&
@@ -92,11 +94,9 @@ QPixmap& OGfxEffect::gradient(QPixmap &pixmap, const QColor &ca,
92QPixmap& OGfxEffect::blend(QPixmap &pixmap, float initial_intensity, 94QPixmap& OGfxEffect::blend(QPixmap &pixmap, float initial_intensity,
93 const QColor &bgnd, GradientType eff, 95 const QColor &bgnd, GradientType eff,
94 bool anti_dir, int ncols) 96 bool anti_dir, int /*ncols*/)
95{ 97{
96 QImage image = pixmap.convertToImage(); 98 QImage image = pixmap.convertToImage();
97 OGfxEffect::blend(image, initial_intensity, bgnd, eff, anti_dir); 99 OGfxEffect::blend(image, initial_intensity, bgnd, eff, anti_dir);
98 100
99 unsigned int tmp;
100
101 if ( pixmap. depth ( ) <= 8 ) 101 if ( pixmap. depth ( ) <= 8 )
102 image. convertDepth ( pixmap. depth ( )); 102 image. convertDepth ( pixmap. depth ( ));
@@ -219,5 +219,5 @@ QImage& OGfxEffect::blend(QImage &image, float initial_intensity,
219 intensity = initial_intensity + QMAX(xvar, yvar); 219 intensity = initial_intensity + QMAX(xvar, yvar);
220 else 220 else
221 intensity = initial_intensity + sqrt(xvar * xvar + yvar * yvar); 221 intensity = initial_intensity + qSqrt(xvar * xvar + yvar * yvar);
222 if (intensity > 1) intensity = 1; 222 if (intensity > 1) intensity = 1;
223 if (intensity < 0) intensity = 0; 223 if (intensity < 0) intensity = 0;
@@ -263,5 +263,5 @@ QImage& OGfxEffect::blend(QImage &image, float initial_intensity,
263 intensity = initial_intensity + QMAX(xvar, yvar); 263 intensity = initial_intensity + QMAX(xvar, yvar);
264 else 264 else
265 intensity = initial_intensity + sqrt(xvar * xvar + yvar * yvar); 265 intensity = initial_intensity + qSqrt(xvar * xvar + yvar * yvar);
266 if (intensity > 1) intensity = 1; 266 if (intensity > 1) intensity = 1;
267 if (intensity < 0) intensity = 0; 267 if (intensity < 0) intensity = 0;