From: Ivailo Monev <xakepa10@gmail.com>
Date: Thu, 29 Oct 2015 11:40:31 +0000 (+0200)
Subject: kolourpaint: stop using obsolete code paths
X-Git-Tag: 4.22.0~955
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=11c6e675b11b2282047f59aacb08c5453626f13e;p=kde%2Fkde-extraapps.git

kolourpaint: stop using obsolete code paths

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---

diff --git a/kolourpaint/imagelib/effects/kpEffectBalance.cpp b/kolourpaint/imagelib/effects/kpEffectBalance.cpp
index 380ea2a3..15e67185 100644
--- a/kolourpaint/imagelib/effects/kpEffectBalance.cpp
+++ b/kolourpaint/imagelib/effects/kpEffectBalance.cpp
@@ -183,7 +183,7 @@ kpImage kpEffectBalance::applyEffect (const kpImage &image,
     }
     else
     {
-        for (int i = 0; i < qimage.numColors (); i++)
+        for (int i = 0; i < qimage.colorCount(); i++)
         {
             const QRgb rgb = qimage.color (i);
 
diff --git a/kolourpaint/imagelib/effects/kpEffectGrayscale.cpp b/kolourpaint/imagelib/effects/kpEffectGrayscale.cpp
index 900c45f4..80ba8a85 100644
--- a/kolourpaint/imagelib/effects/kpEffectGrayscale.cpp
+++ b/kolourpaint/imagelib/effects/kpEffectGrayscale.cpp
@@ -66,7 +66,7 @@ kpImage kpEffectGrayscale::applyEffect (const kpImage &image)
     else
     {
         // 1- & 8- bit images use a color table
-        for (int i = 0; i < qimage.numColors (); i++)
+        for (int i = 0; i < qimage.colorCount(); i++)
             qimage.setColor (i, toGray (qimage.color (i)));
     }
 
diff --git a/kolourpaint/imagelib/effects/kpEffectHSV.cpp b/kolourpaint/imagelib/effects/kpEffectHSV.cpp
index 03377dd5..a4bc142a 100644
--- a/kolourpaint/imagelib/effects/kpEffectHSV.cpp
+++ b/kolourpaint/imagelib/effects/kpEffectHSV.cpp
@@ -153,7 +153,7 @@ static void AdjustHSV (QImage* pImage, double hue, double saturation, double val
     }
     else
     {
-        for (int i = 0; i < pImage->numColors (); i++)
+        for (int i = 0; i < pImage->colorCount(); i++)
         {
             QRgb pix = pImage->color (i);
             pix = ::AdjustHSVInternal (pix, hue, saturation, value);
diff --git a/kolourpaint/imagelib/effects/kpEffectInvert.cpp b/kolourpaint/imagelib/effects/kpEffectInvert.cpp
index c9abc88b..4dd71024 100644
--- a/kolourpaint/imagelib/effects/kpEffectInvert.cpp
+++ b/kolourpaint/imagelib/effects/kpEffectInvert.cpp
@@ -72,7 +72,7 @@ void kpEffectInvert::applyEffect (QImage *destImagePtr, int channels)
     }
     else
     {
-        for (int i = 0; i < destImagePtr->numColors (); i++)
+        for (int i = 0; i < destImagePtr->colorCount(); i++)
         {
             destImagePtr->setColor (i, destImagePtr->color (i) ^ mask);
         }
diff --git a/kolourpaint/imagelib/effects/kpEffectReduceColors.cpp b/kolourpaint/imagelib/effects/kpEffectReduceColors.cpp
index bfedb798..5d848f96 100644
--- a/kolourpaint/imagelib/effects/kpEffectReduceColors.cpp
+++ b/kolourpaint/imagelib/effects/kpEffectReduceColors.cpp
@@ -115,7 +115,7 @@ QImage kpEffectReduceColors::convertImageDepth (const QImage &image, int depth,
         bool moreThan2Colors = false;
 
         QImage monoImage (image.width (), image.height (), QImage::Format_MonoLSB);
-        monoImage.setNumColors (2);
+        monoImage.setColorCount (2);
     #if DEBUG_KP_EFFECT_REDUCE_COLORS
         kDebug () << "\t\tinitialising output image w=" << monoImage.width ()
                    << ",h=" << monoImage.height ()