Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 14 insertions, 14 deletions

diff --git a/chalk/core/kis_gradient_painter.cc b/chalk/core/kis_gradient_painter.cc
index 8d387e6f..2258d899 100644
--- a/chalk/core/kis_gradient_painter.cc
+++ b/chalk/core/kis_gradient_painter.cc
@@ -20,7 +20,7 @@
 #include <string.h>
 #include <cfloat>
 
-#include "brush.h"
+#include "tqbrush.h"
 #include "tqcolor.h"
 #include "tqfontinfo.h"
 #include "tqfontmetrics.h"
@@ -483,7 +483,7 @@ KisGradientPainter::KisGradientPainter(KisPaintDeviceSP device) : super(device),
 
 bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
                        const KisPoint& gradientVectorEnd,
-                       enumGradientShape shape,
+                       enumGradientShape tqshape,
                        enumGradientRepeat repeat,
                        double antiAliasThreshold,
                        bool reverseGradient,
@@ -496,29 +496,29 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
 
     if (!m_gradient) return false;
 
-    GradientShapeStrategy *shapeStrategy = 0;
+    GradientShapeStrategy *tqshapeStrategy = 0;
 
-    switch (shape) {
+    switch (tqshape) {
     case GradientShapeLinear:
-        shapeStrategy = new LinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
+        tqshapeStrategy = new LinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
         break;
     case GradientShapeBiLinear:
-        shapeStrategy = new BiLinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
+        tqshapeStrategy = new BiLinearGradientStrategy(gradientVectorStart, gradientVectorEnd);
         break;
     case GradientShapeRadial:
-        shapeStrategy = new RadialGradientStrategy(gradientVectorStart, gradientVectorEnd);
+        tqshapeStrategy = new RadialGradientStrategy(gradientVectorStart, gradientVectorEnd);
         break;
     case GradientShapeSquare:
-        shapeStrategy = new SquareGradientStrategy(gradientVectorStart, gradientVectorEnd);
+        tqshapeStrategy = new SquareGradientStrategy(gradientVectorStart, gradientVectorEnd);
         break;
     case GradientShapeConical:
-        shapeStrategy = new ConicalGradientStrategy(gradientVectorStart, gradientVectorEnd);
+        tqshapeStrategy = new ConicalGradientStrategy(gradientVectorStart, gradientVectorEnd);
         break;
     case GradientShapeConicalSymetric:
-        shapeStrategy = new ConicalSymetricGradientStrategy(gradientVectorStart, gradientVectorEnd);
+        tqshapeStrategy = new ConicalSymetricGradientStrategy(gradientVectorStart, gradientVectorEnd);
         break;
     }
-    Q_CHECK_PTR(shapeStrategy);
+    Q_CHECK_PTR(tqshapeStrategy);
 
     GradientRepeatStrategy *repeatStrategy = 0;
 
@@ -566,7 +566,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
     for (int y = starty; y <= endy; y++) {
         for (int x = startx; x <= endx; x++) {
 
-            double t = shapeStrategy->valueAt( x, y);
+            double t = tqshapeStrategy->valueAt( x, y);
             t = repeatStrategy->valueAt(t);
 
             if (reverseGradient) {
@@ -662,7 +662,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
                             double sampleX = x - 0.5 + (sampleWidth / 2) + xSample * sampleWidth;
                             double sampleY = y - 0.5 + (sampleWidth / 2) + ySample * sampleWidth;
 
-                            double t = shapeStrategy->valueAt(sampleX, sampleY);
+                            double t = tqshapeStrategy->valueAt(sampleX, sampleY);
                             t = repeatStrategy->valueAt(t);
 
                             if (reverseGradient) {
@@ -715,7 +715,7 @@ bool KisGradientPainter::paintGradient(const KisPoint& gradientVectorStart,
         dev->writeBytes(layer.bits(), startx, starty, width, height);
         bltSelection(startx, starty, m_compositeOp, dev, m_opacity, startx, starty, width, height);
     }
-    delete shapeStrategy;
+    delete tqshapeStrategy;
 
     emit notifyProgressDone();