summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -9,8 +9,10 @@
#include <qimage.h>
#include <qpainter.h>
+#include <qpe/qmath.h>
+
#include "ogfxeffect.h"
//======================================================================
@@ -20,9 +22,9 @@
//======================================================================
QPixmap& OGfxEffect::gradient(QPixmap &pixmap, const QColor &ca,
- const QColor &cb, GradientType eff, int ncols)
+ const QColor &cb, GradientType eff, int /*ncols*/)
{
if(pixmap.depth() > 8 &&
(eff == VerticalGradient || eff == HorizontalGradient)) {
@@ -90,15 +92,13 @@ QPixmap& OGfxEffect::gradient(QPixmap &pixmap, const QColor &ca,
QPixmap& OGfxEffect::blend(QPixmap &pixmap, float initial_intensity,
const QColor &bgnd, GradientType eff,
- bool anti_dir, int ncols)
+ bool anti_dir, int /*ncols*/)
{
QImage image = pixmap.convertToImage();
OGfxEffect::blend(image, initial_intensity, bgnd, eff, anti_dir);
- unsigned int tmp;
-
if ( pixmap. depth ( ) <= 8 )
image. convertDepth ( pixmap. depth ( ));
pixmap.convertFromImage(image);
@@ -217,9 +217,9 @@ QImage& OGfxEffect::blend(QImage &image, float initial_intensity,
if (eff == RectangleGradient)
intensity = initial_intensity + QMAX(xvar, yvar);
else
- intensity = initial_intensity + sqrt(xvar * xvar + yvar * yvar);
+ intensity = initial_intensity + qSqrt(xvar * xvar + yvar * yvar);
if (intensity > 1) intensity = 1;
if (intensity < 0) intensity = 0;
//NW
@@ -261,9 +261,9 @@ QImage& OGfxEffect::blend(QImage &image, float initial_intensity,
if (eff == RectangleGradient)
intensity = initial_intensity + QMAX(xvar, yvar);
else
- intensity = initial_intensity + sqrt(xvar * xvar + yvar * yvar);
+ intensity = initial_intensity + qSqrt(xvar * xvar + yvar * yvar);
if (intensity > 1) intensity = 1;
if (intensity < 0) intensity = 0;
//SW