[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Calligra] 30a3f98: and more arm fixes
From:       Marijn Kruisselbrink <mkruisselbrink () kde ! org>
Date:       2010-12-13 19:57:41
Message-ID: 20101213195741.1293FA60B0 () git ! kde ! org
[Download RAW message or body]

commit 30a3f98b94fa2106c1767839f8041b6d9e31195e
branch master
Author: Marijn Kruisselbrink <mkruisselbrink@kde.org>
Date:   Mon Dec 13 04:58:37 2010 -0800

    and more arm fixes

diff --git a/krita/plugins/extensions/dockers/colorselectorng/kis_color_selector_simple.cpp \
b/krita/plugins/extensions/dockers/colorselectorng/kis_color_selector_simple.cpp \
                index 99653fa..a13c1af 100644
--- a/krita/plugins/extensions/dockers/colorselectorng/kis_color_selector_simple.cpp
+++ b/krita/plugins/extensions/dockers/colorselectorng/kis_color_selector_simple.cpp
@@ -39,7 +39,7 @@ void KisColorSelectorSimple::setColor(const QColor &c)
         emit paramChanged(-1, -1, -1, c.hslSaturationF(), c.lightnessF());
         break;
     case KisColorSelector::LH:
-        m_lastClickPos.setX(qBound(0., c.hueF(), 1.));
+        m_lastClickPos.setX(qBound<qreal>(0., c.hueF(), 1.));
         m_lastClickPos.setY(1.-c.lightnessF());
         emit paramChanged(c.hueF(), -1, -1, -1, c.lightnessF());
         break;
@@ -49,17 +49,17 @@ void KisColorSelectorSimple::setColor(const QColor &c)
         emit paramChanged(-1, c.saturationF(), c.valueF(), -1, -1);
         break;
     case KisColorSelector::VH:
-        m_lastClickPos.setX(qBound(0., c.hueF(), 1.));
+        m_lastClickPos.setX(qBound<qreal>(0., c.hueF(), 1.));
         m_lastClickPos.setY(c.valueF());
         emit paramChanged(c.hueF(), -1, c.valueF(), -1, -1);
         break;
     case KisColorSelector::hsvSH:
-        m_lastClickPos.setX(qBound(0., c.hueF(), 1.));
+        m_lastClickPos.setX(qBound<qreal>(0., c.hueF(), 1.));
         m_lastClickPos.setY(1-c.saturationF());
         emit paramChanged(c.hueF(), c.saturationF(), -1, -1, -1);
         break;
     case KisColorSelector::hslSH:
-        m_lastClickPos.setX(qBound(0., c.hueF(), 1.));
+        m_lastClickPos.setX(qBound<qreal>(0., c.hueF(), 1.));
         m_lastClickPos.setY(1-c.hslSaturationF());
         emit paramChanged(c.hueF(), -1, -1, c.hslSaturationF(), -1);
         break;
@@ -80,7 +80,7 @@ void KisColorSelectorSimple::setColor(const QColor &c)
         emit paramChanged(-1, -1, -1, c.hslSaturationF(), -1);
         break;
     case KisColorSelector::H:
-        m_lastClickPos.setX(1-qBound(0., c.hueF(), 1.));
+        m_lastClickPos.setX(1-qBound<qreal>(0., c.hueF(), 1.));
         emit paramChanged(c.hueF(), -1, -1, -1, -1);
         break;
     default:


[prev in list] [next in list] [prev in thread] [next in thread]