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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

16 files changed, 72 insertions, 72 deletions

diff --git a/chalk/core/kis_brush.cc b/chalk/core/kis_brush.cc
index 247bc7df..31ee9d18 100644
--- a/chalk/core/kis_brush.cc
+++ b/chalk/core/kis_brush.cc
@@ -816,7 +816,7 @@ TQImage KisBrush::scaleImage(const TQImage& srcImage, int width, int height)
         // or scaling it to less than half size.
         scaledImage = srcImage.smoothScale(width, height);
 
-        //filename = TQString("smoothScale_%1x%2.png").arg(width).arg(height);
+        //filename = TQString("smoothScale_%1x%2.png").tqarg(width).tqarg(height);
     }
     else {
         scaledImage.create(width, height, 32);
@@ -936,7 +936,7 @@ TQImage KisBrush::scaleImage(const TQImage& srcImage, int width, int height)
             }
         }
 
-        //filename = TQString("bilinear_%1x%2.png").arg(width).arg(height);
+        //filename = TQString("bilinear_%1x%2.png").tqarg(width).tqarg(height);
     }
 
     //scaledImage.save(filename, "PNG");
diff --git a/chalk/core/kis_convolution_painter.cc b/chalk/core/kis_convolution_painter.cc
index 32283ad3..ea0351df 100644
--- a/chalk/core/kis_convolution_painter.cc
+++ b/chalk/core/kis_convolution_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"
diff --git a/chalk/core/kis_exif_value.cc b/chalk/core/kis_exif_value.cc
index 1981bd02..043bf4e3 100644
--- a/chalk/core/kis_exif_value.cc
+++ b/chalk/core/kis_exif_value.cc
@@ -157,7 +157,7 @@ bool ExifValue::load(const TQDomElement& elmt)
         case EXIF_TYPE_BYTE:
             for(uint i = 0; i < components(); i++)
             {
-                if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
                 {
                     setValue(i, (TQ_UINT8)0);
                 } else {
@@ -171,7 +171,7 @@ bool ExifValue::load(const TQDomElement& elmt)
         case EXIF_TYPE_SHORT:
             for(uint i = 0; i < components(); i++)
             {
-                if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
                 {
                     setValue(i, (TQ_UINT16)0);
                 } else {
@@ -182,7 +182,7 @@ bool ExifValue::load(const TQDomElement& elmt)
         case EXIF_TYPE_LONG:
             for(uint i = 0; i < components(); i++)
             {
-                if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
                 {
                     setValue(i, (TQ_UINT32)0);
                 } else {
@@ -194,13 +194,13 @@ bool ExifValue::load(const TQDomElement& elmt)
             for(uint i = 0; i < components(); i++)
             {
                 KisExifRational r;
-                if( (attr = elmt.attribute(TQString("numerator%1").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("numerator%1").tqarg(i) ) ).isNull() )
                 {
                     r.numerator = (TQ_UINT32)0;
                 } else {
                     r.numerator = (TQ_UINT32) attr.toUInt();
                 }
-                if( (attr = elmt.attribute(TQString("denominator%1").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("denominator%1").tqarg(i) ) ).isNull() )
                 {
                     r.denominator = (TQ_UINT32)0;
                 } else {
@@ -212,7 +212,7 @@ bool ExifValue::load(const TQDomElement& elmt)
         case EXIF_TYPE_SBYTE:
             for(uint i = 0; i < components(); i++)
             {
-                if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
                 {
                     setValue(i, (TQ_INT8)0);
                 } else {
@@ -233,7 +233,7 @@ bool ExifValue::load(const TQDomElement& elmt)
         case EXIF_TYPE_SSHORT:
             for(uint i = 0; i < components(); i++)
             {
-                if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
                 {
                     setValue(i, (TQ_INT16)0);
                 } else {
@@ -244,7 +244,7 @@ bool ExifValue::load(const TQDomElement& elmt)
         case EXIF_TYPE_SLONG:
             for(uint i = 0; i < components(); i++)
             {
-                if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
                 {
                     setValue(i, (TQ_INT32)0);
                 } else {
@@ -256,13 +256,13 @@ bool ExifValue::load(const TQDomElement& elmt)
             for(uint i = 0; i < components(); i++)
             {
                 KisExifSRational r;
-                if( (attr = elmt.attribute(TQString("numerator%1").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("numerator%1").tqarg(i) ) ).isNull() )
                 {
                     r.numerator = (TQ_INT32)0;
                 } else {
                     r.numerator = (TQ_INT32) attr.toInt();
                 }
-                if( (attr = elmt.attribute(TQString("denominator%1").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("denominator%1").tqarg(i) ) ).isNull() )
                 {
                     r.denominator = (TQ_UINT32)0;
                 } else {
@@ -274,7 +274,7 @@ bool ExifValue::load(const TQDomElement& elmt)
         case EXIF_TYPE_FLOAT:
             for(uint i = 0; i < components(); i++)
             {
-                if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
                 {
                     setValue(i, (float)0);
                 } else {
@@ -285,7 +285,7 @@ bool ExifValue::load(const TQDomElement& elmt)
         case EXIF_TYPE_DOUBLE:
             for(uint i = 0; i < components(); i++)
             {
-                if( (attr = elmt.attribute(TQString("value%1").arg(i) ) ).isNull() )
+                if( (attr = elmt.attribute(TQString("value%1").tqarg(i) ) ).isNull() )
                 {
                     setValue(i, (double)0);
                 } else {
@@ -310,65 +310,65 @@ TQDomElement ExifValue::save(TQDomDocument& doc)
     {
         case EXIF_TYPE_BYTE:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").arg(i), asByte( i ) );
+                elmt.setAttribute(TQString("value%1").tqarg(i), asByte( i ) );
             break;
         case EXIF_TYPE_ASCII:
             elmt.setAttribute("value", asAscii() );
             break;
         case EXIF_TYPE_SHORT:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").arg(i), asShort( i ) );
+                elmt.setAttribute(TQString("value%1").tqarg(i), asShort( i ) );
             break;
         case EXIF_TYPE_LONG:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").arg(i), asLong( i ) );
+                elmt.setAttribute(TQString("value%1").tqarg(i), asLong( i ) );
             break;
         case EXIF_TYPE_RATIONAL:
             for(uint i = 0; i < components(); i++)
             {
                 KisExifRational r = asRational(i);
-                elmt.setAttribute(TQString("numerator%1").arg(i), r.numerator );
-                elmt.setAttribute(TQString("denominator%1").arg(i), r.denominator );
+                elmt.setAttribute(TQString("numerator%1").tqarg(i), r.numerator );
+                elmt.setAttribute(TQString("denominator%1").tqarg(i), r.denominator );
             }
             break;
         case EXIF_TYPE_SBYTE:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").arg(i), asSByte( i ) );
+                elmt.setAttribute(TQString("value%1").tqarg(i), asSByte( i ) );
             break;
         case EXIF_TYPE_UNDEFINED:
         {
             UByteArray value = asUndefined();
             TQByteArray data;
             data.setRawData((char*)value.data(), value.size());
-            TQByteArray encodedData;
-            KCodecs::base64Encode( data, encodedData );
+            TQByteArray tqencodedData;
+            KCodecs::base64Encode( data, tqencodedData );
             data.resetRawData( (char*)value.data(), value.size());
-            elmt.setAttribute("value", TQString(encodedData));
+            elmt.setAttribute("value", TQString(tqencodedData));
         }
             break;
         case EXIF_TYPE_SSHORT:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").arg(i), asSShort( i ) );
+                elmt.setAttribute(TQString("value%1").tqarg(i), asSShort( i ) );
             break;
         case EXIF_TYPE_SLONG:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").arg(i), asSLong( i ) );
+                elmt.setAttribute(TQString("value%1").tqarg(i), asSLong( i ) );
             break;
         case EXIF_TYPE_SRATIONAL:
             for(uint i = 0; i < components(); i++)
             {
                 KisExifSRational r = asSRational(i);
-                elmt.setAttribute(TQString("numerator%1").arg(i), r.numerator );
-                elmt.setAttribute(TQString("denominator%1").arg(i), r.denominator );
+                elmt.setAttribute(TQString("numerator%1").tqarg(i), r.numerator );
+                elmt.setAttribute(TQString("denominator%1").tqarg(i), r.denominator );
             }
             break;
         case EXIF_TYPE_FLOAT:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").arg(i), asFloat( i ) );
+                elmt.setAttribute(TQString("value%1").tqarg(i), asFloat( i ) );
             break;
         case EXIF_TYPE_DOUBLE:
             for(uint i = 0; i < components(); i++)
-                elmt.setAttribute(TQString("value%1").arg(i), asDouble( i ) );
+                elmt.setAttribute(TQString("value%1").tqarg(i), asDouble( i ) );
             break;
         case EXIF_TYPE_UNKNOW:
             break;
@@ -660,25 +660,25 @@ TQString ExifValue::toString(uint i)
     switch(type())
     {
         case EXIF_TYPE_BYTE:
-            return TQString("%1 ").arg( asExifNumber( i ).m_byte );
+            return TQString("%1 ").tqarg( asExifNumber( i ).m_byte );
         case EXIF_TYPE_SHORT:
-            return TQString("%1 ").arg( asExifNumber( i ).m_short );
+            return TQString("%1 ").tqarg( asExifNumber( i ).m_short );
         case EXIF_TYPE_LONG:
-            return TQString("%1 ").arg( asExifNumber( i ).m_long );
+            return TQString("%1 ").tqarg( asExifNumber( i ).m_long );
         case EXIF_TYPE_RATIONAL:
-            return TQString("%1 / %2 ").arg( asExifNumber( i ).m_rational.numerator ).arg( asExifNumber( i ).m_rational.denominator );
+            return TQString("%1 / %2 ").tqarg( asExifNumber( i ).m_rational.numerator ).tqarg( asExifNumber( i ).m_rational.denominator );
         case EXIF_TYPE_SBYTE:
-            return TQString("%1 ").arg( asExifNumber( i ).m_sbyte );
+            return TQString("%1 ").tqarg( asExifNumber( i ).m_sbyte );
         case EXIF_TYPE_SSHORT:
-            return TQString("%1 ").arg( asExifNumber( i ).m_sshort );
+            return TQString("%1 ").tqarg( asExifNumber( i ).m_sshort );
         case EXIF_TYPE_SLONG:
-            return TQString("%1 ").arg( asExifNumber( i ).m_slong );
+            return TQString("%1 ").tqarg( asExifNumber( i ).m_slong );
         case EXIF_TYPE_SRATIONAL:
-            return TQString("%1 / %2 ").arg( asExifNumber( i ).m_srational.numerator ).arg( asExifNumber( i ).m_srational.denominator );
+            return TQString("%1 / %2 ").tqarg( asExifNumber( i ).m_srational.numerator ).tqarg( asExifNumber( i ).m_srational.denominator );
         case EXIF_TYPE_FLOAT:
-            return TQString("%1 ").arg( asExifNumber( i ).m_float );
+            return TQString("%1 ").tqarg( asExifNumber( i ).m_float );
         case EXIF_TYPE_DOUBLE:
-            return TQString("%1 ").arg( asExifNumber( i ).m_double );
+            return TQString("%1 ").tqarg( asExifNumber( i ).m_double );
         default:
             return "unknow ";
     }
diff --git a/chalk/core/kis_fill_painter.cc b/chalk/core/kis_fill_painter.cc
index a025ce10..54e730a7 100644
--- a/chalk/core/kis_fill_painter.cc
+++ b/chalk/core/kis_fill_painter.cc
@@ -22,7 +22,7 @@
 #include <cfloat>
 #include <stack>
 
-#include "brush.h"
+#include "tqbrush.h"
 #include "tqfontinfo.h"
 #include "tqfontmetrics.h"
 #include "tqpen.h"
@@ -209,7 +209,7 @@ struct FillSegment {
 //    FillSegment* parent;
 };
 
-typedef enum { None = 0, Added = 1, Checked = 2 } Status;
+typedef enum { None = 0, Added = 1, Checked = 2 } tqStatus;
 
 KisSelectionSP KisFillPainter::createFloodSelection(int startX, int startY) {
     if (m_width < 0 || m_height < 0) {
@@ -260,9 +260,9 @@ KisSelectionSP KisFillPainter::createFloodSelection(int startX, int startY) {
 
     stack.push(new FillSegment(startX, startY/*, 0*/));
 
-    Status* map = new Status[m_size];
+    tqStatus* map = new tqStatus[m_size];
 
-    memset(map, None, m_size * sizeof(Status));
+    memset(map, None, m_size * sizeof(tqStatus));
 
     int progressPercent = 0; int pixelsDone = 0; int currentPercent = 0;
     emit notifyProgressStage(i18n("Making fill outline..."), 0);
diff --git a/chalk/core/kis_filter_registry.cc b/chalk/core/kis_filter_registry.cc
index 53f17ea8..b7c8383e 100644
--- a/chalk/core/kis_filter_registry.cc
+++ b/chalk/core/kis_filter_registry.cc
@@ -40,8 +40,8 @@ KisFilterRegistry::KisFilterRegistry()
     Q_ASSERT(KisFilterRegistry::m_singleton == 0);
     KisFilterRegistry::m_singleton = this;
 
-    KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Filter"),
-                                                         TQString::fromLatin1("(Type == 'Service') and "
+    KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Filter"),
+                                                         TQString::tqfromLatin1("(Type == 'Service') and "
                                                                              "([X-Chalk-Version] == 2)"));
 
     KTrader::OfferList::ConstIterator iter;
diff --git a/chalk/core/kis_gradient.cc b/chalk/core/kis_gradient.cc
index 6dffc087..efc370bb 100644
--- a/chalk/core/kis_gradient.cc
+++ b/chalk/core/kis_gradient.cc
@@ -26,7 +26,7 @@
 #include <cmath>
 
 #include <tqimage.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 
 #include <koColor.h>
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();
 
diff --git a/chalk/core/kis_gradient_painter.h b/chalk/core/kis_gradient_painter.h
index 2c0e29c2..fc31b117 100644
--- a/chalk/core/kis_gradient_painter.h
+++ b/chalk/core/kis_gradient_painter.h
@@ -66,7 +66,7 @@ public:
      */
     bool paintGradient(const KisPoint& gradientVectorStart,
                const KisPoint& gradientVectorEnd,
-               enumGradientShape shape,
+               enumGradientShape tqshape,
                enumGradientRepeat repeat,
                double antiAliasThreshold,
                bool reverseGradient,
diff --git a/chalk/core/kis_group_layer.cc b/chalk/core/kis_group_layer.cc
index 0e2f90d2..1f08dbdd 100644
--- a/chalk/core/kis_group_layer.cc
+++ b/chalk/core/kis_group_layer.cc
@@ -207,7 +207,7 @@ bool KisGroupLayer::removeLayer(int x)
         m_layers.erase(m_layers.begin() + reverseIndex(index));
         setDirty(removedLayer->extent());
         if (childCount() < 1) {
-            // No children, nothing to show for it.
+            // No tqchildren, nothing to show for it.
             m_projection->clear();
             setDirty();
         }
@@ -308,7 +308,7 @@ void KisGroupLayer::updateProjection(const TQRect & rc)
     // Get the first layer in this group to start compositing with
     KisLayerSP child = lastChild();
 
-    // No child -- clear the projection. Without children, a group layer is empty.
+    // No child -- clear the projection. Without tqchildren, a group layer is empty.
     if (!child) m_projection->clear();
 
     KisLayerSP startWith = 0;
diff --git a/chalk/core/kis_group_layer.h b/chalk/core/kis_group_layer.h
index 58a3ddab..a516ac72 100644
--- a/chalk/core/kis_group_layer.h
+++ b/chalk/core/kis_group_layer.h
@@ -80,7 +80,7 @@ public:
         {
 //            kdDebug(41001) << "GROUP\t\t" << name()
 //                    << " dirty: " << dirty()
-//                    << ", " << m_layers.count() << " children "
+//                    << ", " << m_layers.count() << " tqchildren "
 //                    << ", projection: " << m_projection
 //                    << "\n";
             return v.visit(this);
diff --git a/chalk/core/kis_imagepipe_brush.cc b/chalk/core/kis_imagepipe_brush.cc
index ca470382..726d0295 100644
--- a/chalk/core/kis_imagepipe_brush.cc
+++ b/chalk/core/kis_imagepipe_brush.cc
@@ -37,7 +37,7 @@
 #include <tqfile.h>
 #include <tqregexp.h>
 #include <tqstringlist.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/chalk/core/kis_nameserver.cc b/chalk/core/kis_nameserver.cc
index 4cb51a98..ff66144d 100644
--- a/chalk/core/kis_nameserver.cc
+++ b/chalk/core/kis_nameserver.cc
@@ -29,7 +29,7 @@ KisNameServer::~KisNameServer()
 
 TQString KisNameServer::name()
 {
-    return m_prefix.arg(m_generator++);
+    return m_prefix.tqarg(m_generator++);
 }
 
 TQ_INT32 KisNameServer::currentSeed() const
diff --git a/chalk/core/kis_painter.cc b/chalk/core/kis_painter.cc
index ed51587b..c64935fc 100644
--- a/chalk/core/kis_painter.cc
+++ b/chalk/core/kis_painter.cc
@@ -26,7 +26,7 @@
 #include <climits>
 #include <strings.h>
 
-#include "brush.h"
+#include "tqbrush.h"
 #include "tqfontinfo.h"
 #include "tqfontmetrics.h"
 #include "tqpen.h"
diff --git a/chalk/core/kis_paintop_registry.cc b/chalk/core/kis_paintop_registry.cc
index 7d5de556..012f2027 100644
--- a/chalk/core/kis_paintop_registry.cc
+++ b/chalk/core/kis_paintop_registry.cc
@@ -43,8 +43,8 @@ KisPaintOpRegistry::KisPaintOpRegistry()
     Q_ASSERT(KisPaintOpRegistry::m_singleton == 0);
     KisPaintOpRegistry::m_singleton = this;
 
-    KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/Paintop"),
-                                                         TQString::fromLatin1("(Type == 'Service') and "
+    KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/Paintop"),
+                                                         TQString::tqfromLatin1("(Type == 'Service') and "
                                                                              "([X-Chalk-Version] == 2)"));
 
     KTrader::OfferList::ConstIterator iter;
diff --git a/chalk/core/kis_palette.cc b/chalk/core/kis_palette.cc
index c6f0c645..161a4ff8 100644
--- a/chalk/core/kis_palette.cc
+++ b/chalk/core/kis_palette.cc
@@ -33,7 +33,7 @@
 #include <tqpoint.h>
 #include <tqvaluevector.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kdebug.h>
 #include <klocale.h>
diff --git a/chalk/core/kis_selection.cc b/chalk/core/kis_selection.cc
index 69b90fe3..03d76616 100644
--- a/chalk/core/kis_selection.cc
+++ b/chalk/core/kis_selection.cc
@@ -215,7 +215,7 @@ void KisSelection::paintUniformSelectionRegion(TQImage img, const TQRect& imageR
         TQRegion region = uniformRegion & TQRegion(imageRect);
 
         if (!region.isEmpty()) {
-            TQMemArray<TQRect> rects = region.rects();
+            TQMemArray<TQRect> rects = region.tqrects();
 
             for (unsigned int i = 0; i < rects.count(); i++) {
                 TQRect r = rects[i];