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

This reverts commit 9484481655.

chalk/HACKING

@@ -62,7 +62,7 @@ Variable/Parameter names
 
 Designer
 
-	Chalk has started to use designer. All dialogs and all widgets that have a layout
+	Chalk has started to use designer. All dialogs and all widgets that have a tqlayout
 	manager must be done in designer. We don't add code nor add signal/slot connections
 	in designer
 

chalk/IMAGE_LIBRARIES

@@ -153,7 +153,7 @@ Disadvantages:
 
 Libart isn't really an image library, but rather a canvas that can be
 used to paint images on. It is optimized for vector graphics, and is
-used by Karbon to render shapes before display.
+used by Karbon to render tqshapes before display.
 
 Advantages:
 

chalk/chalkcolor/kis_basic_histogram_producers.cc

@@ -89,7 +89,7 @@ KisBasicU8HistogramProducer::KisBasicU8HistogramProducer(const KisID& id, KisCol
 }
 
 TQString KisBasicU8HistogramProducer::positionToString(double pos) const {
-    return TQString("%1").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
+    return TQString("%1").tqarg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
 }
 
 void KisBasicU8HistogramProducer::addRegionToBin(TQ_UINT8 * pixels, TQ_UINT8 * selectionMask, TQ_UINT32 nPixels, KisColorSpace *cs)
@@ -142,7 +142,7 @@ KisBasicU16HistogramProducer::KisBasicU16HistogramProducer(const KisID& id, KisC
 
 TQString KisBasicU16HistogramProducer::positionToString(double pos) const
 {
-    return TQString("%1").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
+    return TQString("%1").tqarg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
 }
 
 double KisBasicU16HistogramProducer::maximalZoom() const
@@ -210,7 +210,7 @@ KisBasicF32HistogramProducer::KisBasicF32HistogramProducer(const KisID& id, KisC
 }
 
 TQString KisBasicF32HistogramProducer::positionToString(double pos) const {
-    return TQString("%1").arg(static_cast<float>(pos)); // XXX I doubt this is correct!
+    return TQString("%1").tqarg(static_cast<float>(pos)); // XXX I doubt this is correct!
 }
 
 double KisBasicF32HistogramProducer::maximalZoom() const {
@@ -282,7 +282,7 @@ KisBasicF16HalfHistogramProducer::KisBasicF16HalfHistogramProducer(const KisID&
 }
 
 TQString KisBasicF16HalfHistogramProducer::positionToString(double pos) const {
-    return TQString("%1").arg(static_cast<float>(pos)); // XXX I doubt this is correct!
+    return TQString("%1").tqarg(static_cast<float>(pos)); // XXX I doubt this is correct!
 }
 
 double KisBasicF16HalfHistogramProducer::maximalZoom() const {
@@ -356,7 +356,7 @@ TQValueVector<KisChannelInfo *> KisGenericRGBHistogramProducer::channels() {
 }
 
 TQString KisGenericRGBHistogramProducer::positionToString(double pos) const {
-    return TQString("%1").arg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
+    return TQString("%1").tqarg(static_cast<TQ_UINT8>(pos * UINT8_MAX));
 }
 
 double KisGenericRGBHistogramProducer::maximalZoom() const {
@@ -433,7 +433,7 @@ TQValueVector<KisChannelInfo *> KisGenericLabHistogramProducer::channels() {
 }
 
 TQString KisGenericLabHistogramProducer::positionToString(double pos) const {
-    return TQString("%1").arg(static_cast<TQ_UINT16>(pos * UINT16_MAX));
+    return TQString("%1").tqarg(static_cast<TQ_UINT16>(pos * UINT16_MAX));
 }
 
 double KisGenericLabHistogramProducer::maximalZoom() const {

chalk/chalkcolor/kis_basic_histogram_producers.h

@@ -60,7 +60,7 @@ protected:
     /**
      * The order in which channels() returns is not the same as the internal representation,
      * that of the pixel internally. This method converts external usage to internal usage.
-     * This method uses some basic assumtpions about the layout of the pixel, so _extremely_
+     * This method uses some basic assumtpions about the tqlayout of the pixel, so _extremely_
      * exotic spaces might want to override this (see makeExternalToInternal source for
      * those assumptions)
      **/

chalk/chalkcolor/kis_colorspace_factory_registry.cc

@@ -62,8 +62,8 @@ KisColorSpaceFactoryRegistry::KisColorSpaceFactoryRegistry(TQStringList profileF
 */
 
     // Load all colorspace modules
-    KTrader::OfferList offers = KTrader::self()->query(TQString::fromLatin1("Chalk/ColorSpace"),
-                                                         TQString::fromLatin1("(Type == 'Service') and "
+    KTrader::OfferList offers = KTrader::self()->query(TQString::tqfromLatin1("Chalk/ColorSpace"),
+                                                         TQString::tqfromLatin1("(Type == 'Service') and "
                                                                              "([X-Chalk-Version] == 2)"));
 
     if (offers.empty()) {

chalk/chalkcolor/kis_profile.cc

@@ -25,7 +25,7 @@
 #include LCMS_HEADER
 
 #include <tqimage.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqfile.h>
 
 #include <kdebug.h>
@@ -65,7 +65,7 @@ KisProfile::KisProfile(const cmsHPROFILE profile)
 
     // Make a raw data image ready for saving
     _cmsSaveProfileToMem(m_profile, 0, &bytesNeeded); // calc size
-    if(m_rawData.resize(bytesNeeded))
+    if(m_rawData.tqresize(bytesNeeded))
     {
         _cmsSaveProfileToMem(m_profile, m_rawData.data(), &bytesNeeded); // fill buffer
         cmsHPROFILE newprofile = cmsOpenProfileFromMem(m_rawData.data(), (DWORD) bytesNeeded);

chalk/colorspaces/wet/kis_wet_palette_widget.cc

@@ -21,12 +21,12 @@
 
 #include <tqpushbutton.h>
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqcolor.h>
 #include <tqdrawutil.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqspinbox.h>
 #include <tqstyle.h>
@@ -50,7 +50,7 @@ KisWetPaletteWidget::KisWetPaletteWidget(TQWidget *parent, const char *name) : s
 {
     m_subject = 0;
 
-    TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main layout");
+    TQVBoxLayout * vl = new TQVBoxLayout(this, 0, -1, "main tqlayout");
 
     TQGridLayout * l = new TQGridLayout(vl, 2, 8, 2, "color wells grid");
 

chalk/colorspaces/wet/wet_plugin.cc

@@ -22,7 +22,7 @@
 
 #include <tqobject.h>
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqdockwindow.h>
 #include <tqpoint.h>
 #include <tqlabel.h>

chalk/colorspaces/wetsticky/ws/canvas.c

@@ -31,13 +31,13 @@ CELL canvas[CANVAS_WIDTH][CANVAS_HEIGHT];
 
 /*  This module maintains a list of the addresses of cells that have
     been modified since the last redraw and therefore need updating.
-    Points are added to this list by the need_to_repaint() routine
-    and are removed by the next_cell_for_repaint() function.  The
+    Points are added to this list by the need_to_tqrepaint() routine
+    and are removed by the next_cell_for_tqrepaint() function.  The
     pointer to the current tail of the list is updated by side-effect. */
 
 static POINT need_repainting[REDRAW_LIMIT];
 static int   next_free = 0;
-static int   next_to_repaint = 0;
+static int   next_to_tqrepaint = 0;
 
 /* *********************************************************************** */
 
@@ -50,7 +50,7 @@ int number_of_repaints_needed()
 
 /* *********************************************************************** */
 
-void need_to_repaint(point)
+void need_to_tqrepaint(point)
 /*  The cell at this location needs to be redrawn since it has
     been altered.   Scan the list to see if it is already
     scheduled for a repainting operation and only add it if
@@ -62,7 +62,7 @@ POINT point;
    int k;
 
 
-   /*  If the list is already full then simply ignore the repaint
+   /*  If the list is already full then simply ignore the tqrepaint
        request - it will get done eventually anyway.  */
 
    if (next_free == REDRAW_LIMIT) return;
@@ -85,7 +85,7 @@ POINT point;
 
 /* *********************************************************************** */
 
-void next_cell_for_repaint(cell, locus)
+void next_cell_for_tqrepaint(cell, locus)
 /*  This routine returns the next cell to be repainted, together with its
     location on the canvas.  This is determined by taking the next point 
     from the need_repainting list and accessing its cell.  If the list is 
@@ -97,16 +97,16 @@ void next_cell_for_repaint(cell, locus)
    POINT_PTR locus;
 
 {
-   if (next_to_repaint >= next_free) {
-      next_to_repaint = next_free = 0;
+   if (next_to_tqrepaint >= next_free) {
+      next_to_tqrepaint = next_free = 0;
       *(cell) = NIL;
       return;
    }
 
-   *(cell) = get_cell(need_repainting[next_to_repaint]);
-   locus->x = need_repainting[next_to_repaint].x;
-   locus->y = need_repainting[next_to_repaint].y;
-   next_to_repaint++;
+   *(cell) = get_cell(need_repainting[next_to_tqrepaint]);
+   locus->x = need_repainting[next_to_tqrepaint].x;
+   locus->y = need_repainting[next_to_tqrepaint].y;
+   next_to_tqrepaint++;
 }
 
 /* *********************************************************************** */

chalk/colorspaces/wetsticky/ws/canvas.h

@@ -22,11 +22,11 @@ Wet and Sticky is free software; you can redistribute it and/or modify it under
 extern int number_of_repaints_needed();
 /*  Returns the number of cells needing to repainted.  */
 
-extern void need_to_repaint (/* POINT */);
+extern void need_to_tqrepaint (/* POINT */);
 /*  Requests that the cell at the given point be repainted
     at the next update as it has been modified.  */
 
-extern void next_cell_for_repaint (/* *CELL_PTR, POINT_PTR  */);
+extern void next_cell_for_tqrepaint (/* *CELL_PTR, POINT_PTR  */);
 /*  Returns a pointer to a cell that needs to be updated as well
     as the location of that cell on the canvas.   If there are
     no more cells to be redrawn then the pointer will be NIL.  */

chalk/colorspaces/wetsticky/ws/engine.c

@@ -192,7 +192,7 @@ int      amount;
 
    }
 
-   need_to_repaint(destLocus);
+   need_to_tqrepaint(destLocus);
 }
 
 /* *********************************************************************** */

chalk/colorspaces/wetsticky/ws/engine3.c

@@ -191,7 +191,7 @@ int      amount;
 
    }
 
-   need_to_repaint(destLocus);
+   need_to_tqrepaint(destLocus);
 }
 
 /* *********************************************************************** */

chalk/colorspaces/wetsticky/ws/ogl_interface.c

@@ -255,7 +255,7 @@ void evolve_paint()
 
    for (k=0; k < STEP_LIMIT; k++) single_step();
    while (TRUE) {
-      next_cell_for_repaint(&cell, &p);
+      next_cell_for_tqrepaint(&cell, &p);
       if (cell == NIL) return;
       paint_cell(cell, p.x, p.y);     
 	   glFlush();

chalk/colorspaces/wetsticky/ws/x_interface.c

@@ -700,7 +700,7 @@ void evolve_paint()
 
    for (k=0; k < STEP_LIMIT; k++) single_step();
    while (TRUE) {
-      next_cell_for_repaint(&cell, &p);
+      next_cell_for_tqrepaint(&cell, &p);
       if (cell == NIL) return;
       paint_cell(cell, p.x, p.y);     
    } 

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");

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"

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 ";
     }

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);

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;

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>

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();
 

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,

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;

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);

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>

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

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"

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;

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>

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];

chalk/doc/DESIGN.obsolete

@@ -21,7 +21,7 @@ Design Patterns
   changes:
 
             * Change brushes handling to a generic Mediator pattern
-              (kis_resource_mediator). Resources are brush shapes,
+              (kis_resource_mediator). Resources are brush tqshapes,
               patterns (and colours, too?) Patrick intended a Flyweight
               here.
 

chalk/doc/background_paper.txt

@@ -79,6 +79,6 @@ We need perhaps to add a light source or two, in OpenGL mode... I think
 we do.
 
 On top of the layers are what Xara calls blobs: the temporary droppings of
-tools, like rubber bands, vector paths, brush shape cursors.
+tools, like rubber bands, vector paths, brush tqshape cursors.
 
 

chalk/doc/chalk-features

@@ -201,10 +201,10 @@ of a tablet. Tilt and rotation is not yet supported.
 
 * Brushes
 
-** gimp brush shapes. Support for colored and grayscale brushes and
+** gimp brush tqshapes. Support for colored and grayscale brushes and
    pipe brushes. Support from Gimp parasites in brushes.
-** custom brush shapes
-** text brush shapes
+** custom brush tqshapes
+** text brush tqshapes
 ** brushes created from layers or images. These brushes can be saved
 ** colored brushes can also be used as masks
 

chalk/doc/chalk.xmi

@@ -473,15 +473,15 @@ managed by this KisTileMgr" visibility="public" xmi.id="354" type="Q_INT32" name
     <UML:Operation comment="Returns true if this KisTileMgr does not manage any
 tiles." visibility="public" xmi.id="362" type="bool" name="empty" />
     <UML:Operation comment="Height in pixels of the total area managed by this KisTileMgr" visibility="public" xmi.id="363" type="Q_INT32" name="height" />
-    <UML:Operation comment="XXX" visibility="public" xmi.id="364" type="KisTileSP" name="invalidate" >
+    <UML:Operation comment="XXX" visibility="public" xmi.id="364" type="KisTileSP" name="tqinvalidate" >
      <UML:Parameter visibility="private" xmi.id="365" value="" type="KisTileSP" name="tile" />
      <UML:Parameter visibility="private" xmi.id="366" value="" type="Q_INT32" name="xpix" />
      <UML:Parameter visibility="private" xmi.id="367" value="" type="Q_INT32" name="ypix" />
     </UML:Operation>
-    <UML:Operation comment="XXX" visibility="public" xmi.id="368" type="KisTileSP" name="invalidate" >
+    <UML:Operation comment="XXX" visibility="public" xmi.id="368" type="KisTileSP" name="tqinvalidate" >
      <UML:Parameter visibility="private" xmi.id="369" value="" type="Q_INT32" name="tileno" />
     </UML:Operation>
-    <UML:Operation comment="XXX" visibility="public" xmi.id="370" type="KisTileSP" name="invalidate" >
+    <UML:Operation comment="XXX" visibility="public" xmi.id="370" type="KisTileSP" name="tqinvalidate" >
      <UML:Parameter visibility="private" xmi.id="371" value="" type="Q_INT32" name="xpix" />
      <UML:Parameter visibility="private" xmi.id="372" value="" type="Q_INT32" name="ypix" />
     </UML:Operation>
@@ -645,7 +645,7 @@ of tile in x and y." visibility="public" xmi.id="408" type="void" name="tileCoor
     <UML:Operation visibility="public" xmi.id="476" type="virtual void" isAbstract="true" name="insert" >
      <UML:Parameter visibility="private" xmi.id="477" value="" type="KisTileSP" name="tile" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="478" type="virtual void" isAbstract="true" name="sizeHint" >
+    <UML:Operation visibility="public" xmi.id="478" type="virtual void" isAbstract="true" name="tqsizeHint" >
      <UML:Parameter visibility="private" xmi.id="479" value="" type="Q_INT32" name="nelements" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="480" type="virtual " name="~KisTileCacheInterface" />
@@ -1705,17 +1705,17 @@ pixels in the brush." visibility="public" xmi.id="705" type="virtual KisAlphaMas
      <UML:Parameter visibility="private" xmi.id="1359" value="" type="const enumImgType &amp;" name="imgType" />
      <UML:Parameter visibility="private" xmi.id="1360" value="" type="const QString &amp;" name="name" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1361" type="virtual void" name="invalidate" />
-    <UML:Operation visibility="public" xmi.id="1362" type="virtual void" name="invalidate" >
+    <UML:Operation visibility="public" xmi.id="1361" type="virtual void" name="tqinvalidate" />
+    <UML:Operation visibility="public" xmi.id="1362" type="virtual void" name="tqinvalidate" >
      <UML:Parameter visibility="private" xmi.id="1363" value="" type="Q_INT32" name="tileno" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1364" type="virtual void" name="invalidate" >
+    <UML:Operation visibility="public" xmi.id="1364" type="virtual void" name="tqinvalidate" >
      <UML:Parameter visibility="private" xmi.id="1365" value="" type="Q_INT32" name="x" />
      <UML:Parameter visibility="private" xmi.id="1366" value="" type="Q_INT32" name="y" />
      <UML:Parameter visibility="private" xmi.id="1367" value="" type="Q_INT32" name="w" />
      <UML:Parameter visibility="private" xmi.id="1368" value="" type="Q_INT32" name="h" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1369" type="virtual void" name="invalidate" >
+    <UML:Operation visibility="public" xmi.id="1369" type="virtual void" name="tqinvalidate" >
      <UML:Parameter visibility="private" xmi.id="1370" value="" type="const QRect &amp;" name="rc" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1371" type="KisLayerSP" name="layer" >
@@ -1930,17 +1930,17 @@ cannot be abstract, because otherwise this class would be abstract." visibility=
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1529" type="const KisImageSP" name="image" />
     <UML:Operation visibility="protected" xmi.id="1530" type="void" name="init" />
-    <UML:Operation visibility="public" xmi.id="1531" type="virtual void" name="invalidate" />
-    <UML:Operation visibility="public" xmi.id="1532" type="virtual void" name="invalidate" >
+    <UML:Operation visibility="public" xmi.id="1531" type="virtual void" name="tqinvalidate" />
+    <UML:Operation visibility="public" xmi.id="1532" type="virtual void" name="tqinvalidate" >
      <UML:Parameter visibility="private" xmi.id="1533" value="" type="Q_INT32" name="tileno" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1534" type="virtual void" name="invalidate" >
+    <UML:Operation visibility="public" xmi.id="1534" type="virtual void" name="tqinvalidate" >
      <UML:Parameter visibility="private" xmi.id="1535" value="" type="Q_INT32" name="x" />
      <UML:Parameter visibility="private" xmi.id="1536" value="" type="Q_INT32" name="y" />
      <UML:Parameter visibility="private" xmi.id="1537" value="" type="Q_INT32" name="w" />
      <UML:Parameter visibility="private" xmi.id="1538" value="" type="Q_INT32" name="h" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="1539" type="virtual void" name="invalidate" >
+    <UML:Operation visibility="public" xmi.id="1539" type="virtual void" name="tqinvalidate" >
      <UML:Parameter visibility="private" xmi.id="1540" value="" type="const QRect &amp;" name="rc" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="1541" type="void" name="maskBounds" >
@@ -2649,17 +2649,17 @@ in the constructor, you have to call loadAsync.
     <UML:Operation visibility="public" xmi.id="2090" type="" name="KisRenderInterface" >
      <UML:Parameter visibility="private" xmi.id="2091" value="" type="const KisRenderInterface &amp;" name="rhs" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="2092" type="virtual void" isAbstract="true" name="invalidate" />
-    <UML:Operation visibility="public" xmi.id="2093" type="virtual void" isAbstract="true" name="invalidate" >
+    <UML:Operation visibility="public" xmi.id="2092" type="virtual void" isAbstract="true" name="tqinvalidate" />
+    <UML:Operation visibility="public" xmi.id="2093" type="virtual void" isAbstract="true" name="tqinvalidate" >
      <UML:Parameter visibility="private" xmi.id="2094" value="" type="Q_INT32" name="tileno" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="2095" type="virtual void" isAbstract="true" name="invalidate" >
+    <UML:Operation visibility="public" xmi.id="2095" type="virtual void" isAbstract="true" name="tqinvalidate" >
      <UML:Parameter visibility="private" xmi.id="2096" value="" type="Q_INT32" name="x" />
      <UML:Parameter visibility="private" xmi.id="2097" value="" type="Q_INT32" name="y" />
      <UML:Parameter visibility="private" xmi.id="2098" value="" type="Q_INT32" name="w" />
      <UML:Parameter visibility="private" xmi.id="2099" value="" type="Q_INT32" name="h" />
     </UML:Operation>
-    <UML:Operation visibility="public" xmi.id="2100" type="virtual void" isAbstract="true" name="invalidate" >
+    <UML:Operation visibility="public" xmi.id="2100" type="virtual void" isAbstract="true" name="tqinvalidate" >
      <UML:Parameter visibility="private" xmi.id="2101" value="" type="const QRect &amp;" name="rc" />
     </UML:Operation>
     <UML:Operation visibility="public" xmi.id="2102" type="virtual Q_INT32" isAbstract="true" name="tileNum" >
@@ -3926,10 +3926,10 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="1353" label="index" />
       <listitem open="0" type="815" id="1351" label="index" />
       <listitem open="0" type="815" id="1355" label="init" />
-      <listitem open="0" type="815" id="1362" label="invalidate" />
-      <listitem open="0" type="815" id="1361" label="invalidate" />
-      <listitem open="0" type="815" id="1369" label="invalidate" />
-      <listitem open="0" type="815" id="1364" label="invalidate" />
+      <listitem open="0" type="815" id="1362" label="tqinvalidate" />
+      <listitem open="0" type="815" id="1361" label="tqinvalidate" />
+      <listitem open="0" type="815" id="1369" label="tqinvalidate" />
+      <listitem open="0" type="815" id="1364" label="tqinvalidate" />
       <listitem open="0" type="815" id="1371" label="layer" />
       <listitem open="0" type="815" id="1373" label="layer" />
       <listitem open="0" type="815" id="1375" label="layers" />
@@ -4126,10 +4126,10 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="1526" label="height" />
       <listitem open="0" type="815" id="1529" label="image" />
       <listitem open="0" type="815" id="1530" label="init" />
-      <listitem open="0" type="815" id="1532" label="invalidate" />
-      <listitem open="0" type="815" id="1531" label="invalidate" />
-      <listitem open="0" type="815" id="1539" label="invalidate" />
-      <listitem open="0" type="815" id="1534" label="invalidate" />
+      <listitem open="0" type="815" id="1532" label="tqinvalidate" />
+      <listitem open="0" type="815" id="1531" label="tqinvalidate" />
+      <listitem open="0" type="815" id="1539" label="tqinvalidate" />
+      <listitem open="0" type="815" id="1534" label="tqinvalidate" />
       <listitem open="0" type="815" id="1541" label="maskBounds" />
       <listitem open="0" type="815" id="1543" label="maskBounds" />
       <listitem open="0" type="815" id="1548" label="move" />
@@ -4263,10 +4263,10 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="2087" label="=" />
       <listitem open="0" type="815" id="2089" label="KisRenderInterface" />
       <listitem open="0" type="815" id="2090" label="KisRenderInterface" />
-      <listitem open="0" type="815" id="2093" label="invalidate" />
-      <listitem open="0" type="815" id="2095" label="invalidate" />
-      <listitem open="0" type="815" id="2092" label="invalidate" />
-      <listitem open="0" type="815" id="2100" label="invalidate" />
+      <listitem open="0" type="815" id="2093" label="tqinvalidate" />
+      <listitem open="0" type="815" id="2095" label="tqinvalidate" />
+      <listitem open="0" type="815" id="2092" label="tqinvalidate" />
+      <listitem open="0" type="815" id="2100" label="tqinvalidate" />
       <listitem open="0" type="815" id="2102" label="tileNum" />
       <listitem open="0" type="815" id="2105" label="tiles" />
       <listitem open="0" type="815" id="2106" label="validate" />
@@ -4485,7 +4485,7 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="473" label="KisTileCacheInterface" />
       <listitem open="0" type="815" id="474" label="flush" />
       <listitem open="0" type="815" id="476" label="insert" />
-      <listitem open="0" type="815" id="478" label="sizeHint" />
+      <listitem open="0" type="815" id="478" label="tqsizeHint" />
       <listitem open="0" type="815" id="480" label="~KisTileCacheInterface" />
      </listitem>
      <listitem open="0" type="813" id="1996" label="KisTileCommand" >
@@ -4535,9 +4535,9 @@ in the constructor, you have to call loadAsync.
       <listitem open="0" type="815" id="359" label="duplicate" />
       <listitem open="0" type="815" id="362" label="empty" />
       <listitem open="0" type="815" id="363" label="height" />
-      <listitem open="0" type="815" id="364" label="invalidate" />
-      <listitem open="0" type="815" id="370" label="invalidate" />
-      <listitem open="0" type="815" id="368" label="invalidate" />
+      <listitem open="0" type="815" id="364" label="tqinvalidate" />
+      <listitem open="0" type="815" id="370" label="tqinvalidate" />
+      <listitem open="0" type="815" id="368" label="tqinvalidate" />
       <listitem open="0" type="815" id="373" label="invalidateTile" />
       <listitem open="0" type="815" id="376" label="invalidateTiles" />
       <listitem open="0" type="815" id="378" label="memSize" />

chalk/doc/controller.xmi

@@ -3219,12 +3219,12 @@ XXX: for post 1.4: make sure we can drag & drop widgets." isSpecification="f
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1726" isRoot="false" initialValue="" type="1701" isAbstract="false" name="m_ac" />
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1751" isRoot="false" initialValue="" type="1750" isAbstract="false" name="m_toolDockManager" />
       <UML:Attribute comment="// Sliders" isSpecification="false" isLeaf="false" visibility="private" xmi.id="1753" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_layerchannelslider" />
-      <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1754" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_shapesslider" />
+      <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1754" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_tqshapesslider" />
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1755" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_fillsslider" />
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1756" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_toolcontrolslider" />
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1757" isRoot="false" initialValue="" type="1752" isAbstract="false" name="m_colorslider" />
       <UML:Attribute comment="// Dockers" isSpecification="false" isLeaf="false" visibility="private" xmi.id="1759" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_layerchanneldocker" />
-      <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1760" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_shapesdocker" />
+      <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1760" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_tqshapesdocker" />
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1761" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_fillsdocker" />
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1762" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_toolcontroldocker" />
       <UML:Attribute isSpecification="false" isLeaf="false" visibility="private" xmi.id="1763" isRoot="false" initialValue="" type="1758" isAbstract="false" name="m_colordocker" />
@@ -36138,7 +36138,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="// Sliders" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_shapesslider;" >
+          <ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_tqshapesslider;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -36163,7 +36163,7 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
             <codecomment tag="" indentLevel="1" text="// Dockers" />
            </header>
           </ccfdeclarationcodeblock>
-          <ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_shapesdocker;" >
+          <ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_tqshapesdocker;" >
            <header>
             <codecomment tag="" indentLevel="1" />
            </header>
@@ -36382,14 +36382,14 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
                 <javacodedocumentation tag="" indentLevel="1" text="// Sliders" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_shapesslider;" >
+              <codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_tqshapesslider;" >
                <header>
-                <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesslider&amp;#010;&amp;#010;@return the value of m_shapesslider" />
+                <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesslider&amp;#010;&amp;#010;@return the value of m_tqshapesslider" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_shapesslider = value;" >
+              <codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_tqshapesslider = value;" >
                <header>
-                <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesslider&amp;#010;&amp;#010;" />
+                <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesslider&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
               <codeaccessormethod accessType="0" parent_id="1755" tag="hblock_tag_27" canDelete="false" indentLevel="1" classfield_id="1755" text="return m_fillsslider;" >
@@ -36432,14 +36432,14 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
                 <javacodedocumentation tag="" indentLevel="1" text="// Dockers" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_shapesdocker;" >
+              <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_tqshapesdocker;" >
                <header>
-                <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesdocker&amp;#010;&amp;#010;@return the value of m_shapesdocker" />
+                <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesdocker&amp;#010;&amp;#010;@return the value of m_tqshapesdocker" />
                </header>
               </codeaccessormethod>
-              <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_shapesdocker = value;" >
+              <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_tqshapesdocker = value;" >
                <header>
-                <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesdocker&amp;#010;&amp;#010;" />
+                <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesdocker&amp;#010;&amp;#010;" />
                </header>
               </codeaccessormethod>
               <codeaccessormethod accessType="0" parent_id="1761" tag="hblock_tag_42" canDelete="false" indentLevel="1" classfield_id="1761" text="return m_fillsdocker;" >
@@ -36982,19 +36982,19 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_shapesslider;" >
+       <ccfdeclarationcodeblock parent_id="1754" tag="tblock_23" canDelete="false" indentLevel="1" text="private KoTabbedToolDock* m_tqshapesslider;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_shapesslider;" >
+       <codeaccessormethod accessType="0" parent_id="1754" tag="hblock_tag_24" canDelete="false" indentLevel="1" classfield_id="1754" text="return m_tqshapesslider;" >
         <header>
-         <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesslider&amp;#010;&amp;#010;@return the value of m_shapesslider" />
+         <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesslider&amp;#010;&amp;#010;@return the value of m_tqshapesslider" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_shapesslider = value;" >
+       <codeaccessormethod accessType="1" parent_id="1754" tag="hblock_tag_25" canDelete="false" indentLevel="1" classfield_id="1754" text="m_tqshapesslider = value;" >
         <header>
-         <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesslider&amp;#010;&amp;#010;" />
+         <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesslider&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>
@@ -37082,19 +37082,19 @@ XXX: for post 1.4: make sure we can drag &amp; drop widgets." isSpecification="f
        <header>
         <codecomment tag="" />
        </header>
-       <ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_shapesdocker;" >
+       <ccfdeclarationcodeblock parent_id="1760" tag="tblock_38" canDelete="false" indentLevel="1" text="private KisDockFrameDocker* m_tqshapesdocker;" >
         <header>
          <codecomment tag="" indentLevel="1" />
         </header>
        </ccfdeclarationcodeblock>
-       <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_shapesdocker;" >
+       <codeaccessormethod accessType="0" parent_id="1760" tag="hblock_tag_39" canDelete="false" indentLevel="1" classfield_id="1760" text="return m_tqshapesdocker;" >
         <header>
-         <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_shapesdocker&amp;#010;&amp;#010;@return the value of m_shapesdocker" />
+         <javacodedocumentation tag="" indentLevel="1" text="Get the value of m_tqshapesdocker&amp;#010;&amp;#010;@return the value of m_tqshapesdocker" />
         </header>
        </codeaccessormethod>
-       <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_shapesdocker = value;" >
+       <codeaccessormethod accessType="1" parent_id="1760" tag="hblock_tag_40" canDelete="false" indentLevel="1" classfield_id="1760" text="m_tqshapesdocker = value;" >
         <header>
-         <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_shapesdocker&amp;#010;&amp;#010;" />
+         <javacodedocumentation tag="" indentLevel="1" text="Set the value of m_tqshapesdocker&amp;#010;&amp;#010;" />
         </header>
        </codeaccessormethod>
       </codeclassfield>

chalk/doc/doc-outline

@@ -85,7 +85,7 @@ The current outline (working towards 1.6):
   - [TODO] properties, usage, converting, ...
 
 - Commands
-  - General layout
+  - General tqlayout
   - Menus
   - Toolbars
   - Palettes
@@ -142,7 +142,7 @@ Outline for the 1.5 manual (final as of 2006-05-31):
   - Available colorspaces
 
 - Commands ([TODO] make up-to-date)
-  - General layout
+  - General tqlayout
   - Menus
   - Toolbars
   - Palettes

chalk/doc/selections

@@ -117,7 +117,7 @@ discarded.
 
 If a transform is applied to a image, all layers are transformed. The 
 selection is transformed, too: in the new situation, the layer that has a 
-selection active still has a selection, but the shape of the selection is 
+selection active still has a selection, but the tqshape of the selection is 
 transformed.
 
 If a layer is moved, the selection moves with the layer (this is not 

chalk/doc/the preview widget

@@ -2,7 +2,7 @@
 On Tuesday 21 June 2005 14:16, Casper Boemann wrote:
 > Hi
 >
-> As you might have noticed I have changed the layout of the preview, to lo=
+> As you might have noticed I have changed the tqlayout of the preview, to lo=
 ok
 > more like digikam.
 >

chalk/plugins/filters/blur/kis_blur_filter.cc

@@ -72,7 +72,7 @@ KisFilterConfiguration* KisBlurFilter::configuration(TQWidget* w)
         config->setProperty("halfHeight", wCTA->widget()->intHalfWidth->value() );
         config->setProperty("rotate", wCTA->widget()->intAngle->value() );
         config->setProperty("strength", wCTA->widget()->intStrength->value() );
-        config->setProperty("shape", wCTA->widget()->cbShape->currentItem());
+        config->setProperty("tqshape", wCTA->widget()->cbShape->currentItem());
     }
     return config;
 }
@@ -87,7 +87,7 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte
     if(!config) config = new KisFilterConfiguration(id().id(), 1);
 
     TQVariant value;
-    int shape = (config->getProperty("shape", value)) ? value.toInt() : 0;
+    int tqshape = (config->getProperty("tqshape", value)) ? value.toInt() : 0;
     uint halfWidth = (config->getProperty("halfWidth", value)) ? value.toUInt() : 5;
     uint width = 2 * halfWidth + 1;
     uint halfHeight = (config->getProperty("halfHeight", value)) ? value.toUInt() : 5;
@@ -100,7 +100,7 @@ void KisBlurFilter::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte
 
     KisAutobrushShape* kas;
     kdDebug() << width << " " << height << " " << hFade << " " << vFade << endl;
-    switch(shape)
+    switch(tqshape)
     {
         case 1:
             kas = new KisAutobrushRectShape(width, height , hFade, vFade);

chalk/plugins/filters/blur/kis_wdg_blur.cc

@@ -20,7 +20,7 @@
 
 #include "kis_wdg_blur.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtoolbutton.h>
 
 #include <kcombobox.h>
@@ -55,7 +55,7 @@ KisWdgBlur::KisWdgBlur( KisFilter* nfilter, TQWidget * parent, const char * name
 void KisWdgBlur::setConfiguration(KisFilterConfiguration* config)
 {
     TQVariant value;
-    if (config->getProperty("shape", value))
+    if (config->getProperty("tqshape", value))
     {
         widget()->cbShape->setCurrentItem( value.toUInt() );
     }

chalk/plugins/filters/blur/wdgblur.ui

@@ -32,7 +32,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>40</width>
                     <height>20</height>
@@ -49,7 +49,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -58,7 +58,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout17</cstring>
+                <cstring>tqlayout17</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -76,13 +76,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>16</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>16</width>
                             <height>32767</height>

chalk/plugins/filters/bumpmap/bumpmap.cc

@@ -31,7 +31,7 @@
 #include <vector>
 
 #include <tqpoint.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
 #include <tqbuttongroup.h>

chalk/plugins/filters/bumpmap/wdgbumpmap.ui

@@ -52,7 +52,7 @@ layer, the current layer will be used.</string>
                     <property name="textFormat">
                         <enum>RichText</enum>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>WordBreak|AlignVCenter</set>
                     </property>
                 </widget>
@@ -66,7 +66,7 @@ layer, the current layer will be used.</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
@@ -82,7 +82,7 @@ layer, the current layer will be used.</string>
             <property name="title">
                 <string>Settings</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignAuto</set>
             </property>
             <grid>

chalk/plugins/filters/cimg/CImg.h

@@ -3749,8 +3749,8 @@ namespace cimg_library {
         then this image is displayed in the current display window.
         \param list     : The list of images to display.
         \param axe      : The axe used to append the image for visualization. Can be 'x' (default),'y','z' or 'v'.
-        \param align : Defines the relative alignment of images when displaying images of different sizes.
-        Can be '\p c' (centered, which is the default), '\p p' (top alignment) and '\p n' (bottom aligment).
+        \param align : Defines the relative tqalignment of images when displaying images of different sizes.
+        Can be '\p c' (centered, which is the default), '\p p' (top tqalignment) and '\p n' (bottom aligment).
 
         \see CImg::get_append()
     **/
@@ -7772,7 +7772,7 @@ namespace cimg_library {
 
     //! Return a resized image.
     /**
-       \param src = Image giving the geometry of the resize.
+       \param src = Image giving the tqgeometry of the resize.
        \param interp = Resizing type :
        - 0 = no interpolation : additionnal space is filled with 0.
        - 1 = bloc interpolation (nearest point).
@@ -7788,7 +7788,7 @@ namespace cimg_library {
 
     //! Return a resized image.
     /**
-       \param disp = Display giving the geometry of the resize.
+       \param disp = Display giving the tqgeometry of the resize.
        \param interp = Resizing type :
        - 0 = no interpolation : additionnal space is filled with 0.
        - 1 = bloc interpolation (nearest point).
@@ -7830,7 +7830,7 @@ namespace cimg_library {
 
     //! Resize the image.
     /**
-       \param src = Image giving the geometry of the resize.
+       \param src = Image giving the tqgeometry of the resize.
        \param interp = Resizing type :
        - 0 = no interpolation : additionnal space is filled with 0.
        - 1 = bloc interpolation (nearest point).
@@ -7846,7 +7846,7 @@ namespace cimg_library {
 
     //! Resize the image
     /**
-       \param disp = Display giving the geometry of the resize.
+       \param disp = Display giving the tqgeometry of the resize.
        \param interp = Resizing type :
        - 0 = no interpolation : additionnal space is filled with 0.
        - 1 = bloc interpolation (nearest point).
@@ -12881,7 +12881,7 @@ namespace cimg_library {
        \param sharpness = define the contour preservation.
        \param anisotropy = define the smoothing anisotropy.
        \param alpha = image pre-blurring (gaussian).
-       \param sigma = regularity of the tensor-valued geometry.
+       \param sigma = regularity of the tensor-valued tqgeometry.
        \param dl = spatial discretization.
        \param da = angular discretization.
        \param gauss_prec = precision of the gaussian function.
@@ -17550,7 +17550,7 @@ namespace cimg_library {
     //! Return a single image which is the concatenation of all images of the current CImgl instance.
     /**
        \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'.
-       \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
+       \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
        \return A CImg<T> image corresponding to the concatenation is returned.
     **/
     CImg<T> get_append(const char axe='x',const char align='c') const {
@@ -17740,7 +17740,7 @@ namespace cimg_library {
        The function returns immediately.
        \param disp : reference to an existing CImgDisplay instance, where the current image list will be displayed.
        \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'.
-       \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
+       \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
        \return A reference to the current CImgl instance is returned.
     **/
     const CImgl& display(CImgDisplay& disp,const char axe='x',const char align='c') const { 
@@ -17755,7 +17755,7 @@ namespace cimg_library {
        The function returns when a key is pressed or the display window is closed by the user.
        \param title : specify the title of the opening display window.
        \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'.
-       \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
+       \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
        \param min_size : specify the minimum size of the opening display window. Images having dimensions below this
        size will be upscaled.
        \param max_size : specify the maximum size of the opening display window. Images having dimensions above this
@@ -17774,7 +17774,7 @@ namespace cimg_library {
        Images of the list are concatenated in a single temporarly image for visualization purposes.
        The function returns when a key is pressed or the display window is closed by the user.
        \param axe : specify the axe for image concatenation. Can be 'x','y','z' or 'v'.
-       \param align : specify the alignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
+       \param align : specify the tqalignment for image concatenation. Can be 'p' (top), 'c' (center) or 'n' (bottom).
        \param min_size : specify the minimum size of the opening display window. Images having dimensions below this
        size will be upscaled.
        \param max_size : specify the maximum size of the opening display window. Images having dimensions above this

chalk/plugins/filters/cimg/kis_cimg_filter.cc

@@ -429,7 +429,7 @@ bool KisCImgFilter::prepare_inpaint()
 
 bool KisCImgFilter::prepare_resize()
 {
-    const char *geom  = NULL; //cimg_option("-g",(const char*)NULL,"Output image geometry");
+    const char *geom  = NULL; //cimg_option("-g",(const char*)NULL,"Output image tqgeometry");
     const bool anchor = true; //cimg_option("-anchor",true,"Anchor original pixels");
     if (!geom) throw CImgArgumentException("You need to specify an output geomety (option -g)");
     int w,h; get_geom(geom,w,h);
@@ -445,7 +445,7 @@ bool KisCImgFilter::prepare_resize()
 
 bool KisCImgFilter::prepare_visuflow()
 {
-    const char *geom     = "100%x100%"; //cimg_option("-g","100%x100%","Output geometry");
+    const char *geom     = "100%x100%"; //cimg_option("-g","100%x100%","Output tqgeometry");
     //const char *file_i   = (const char *)NULL; //cimg_option("-i",(const char*)NULL,"Input init image");
     const bool normalize = false; //cimg_option("-norm",false,"Normalize input flow");
 

chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc

@@ -19,7 +19,7 @@
  *
  * Ported from the CImg Gimp plugin by Victor Stinner and David Tschumperlé.
  */
-#include "layout.h"
+#include "tqlayout.h"
 #include "tqcheckbox.h"
 #include "tqpushbutton.h"
 

chalk/plugins/filters/cimg/wdg_cimg.ui

@@ -42,7 +42,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>51</width>
                     <height>20</height>

chalk/plugins/filters/colorify/KisWdgColorify.cpp

@@ -21,7 +21,7 @@
 #include "KisWdgColorify.h"
 
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 
 #include <kcolorbutton.h>

chalk/plugins/filters/colorify/WdgColorifyBase.ui

@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>61</width>
                     <height>20</height>
@@ -38,7 +38,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -79,7 +79,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>

chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc

@@ -21,7 +21,7 @@
 #include "kis_wdg_color_to_alpha.h"
 
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 
 #include <kcolorbutton.h>

chalk/plugins/filters/colors/wdgcolortoalphabase.ui

@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>61</width>
                     <height>20</height>
@@ -38,7 +38,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -95,7 +95,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>

chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc

@@ -23,7 +23,7 @@
 
 #include <klocale.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
 #include <tqlabel.h>
@@ -98,7 +98,7 @@ void KisBrightnessContrastFilterConfiguration::fromXML( const TQString& s )
         }
         n = n.nextSibling();
     }
-    // If the adjustment was cached, it now has changed - invalidate it
+    // If the adjustment was cached, it now has changed - tqinvalidate it
     delete m_adjustment;
     m_adjustment = 0;
 }

chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc

@@ -17,7 +17,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
 #include <tqlabel.h>

chalk/plugins/filters/colorsfilters/wdg_brightness_contrast.ui

@@ -32,7 +32,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -50,13 +50,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>250</width>
                             <height>20</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>250</width>
                             <height>20</height>
@@ -84,13 +84,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>254</width>
                             <height>254</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>254</width>
                             <height>254</height>
@@ -116,13 +116,13 @@
                             <property name="name">
                                 <cstring>kCurve</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>250</width>
                                     <height>250</height>
                                 </size>
                             </property>
-                            <property name="maximumSize">
+                            <property name="tqmaximumSize">
                                 <size>
                                     <width>250</width>
                                     <height>250</height>
@@ -143,13 +143,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>20</width>
                             <height>250</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>20</width>
                             <height>250</height>
@@ -169,7 +169,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="1" column="0">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -193,7 +193,7 @@
                     <property name="text">
                         <string>Contrast</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -226,7 +226,7 @@
                     <property name="text">
                         <string>Brightness</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>
@@ -253,7 +253,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>131</width>
                     <height>20</height>

chalk/plugins/filters/colorsfilters/wdg_perchannel.ui

@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -47,7 +47,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout8</cstring>
+                <cstring>tqlayout8</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -65,13 +65,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>0</width>
                             <height>20</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>20</height>
@@ -134,13 +134,13 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>20</width>
                             <height>0</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>20</width>
                             <height>32767</height>

chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_base_widget.ui

@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -34,7 +34,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -69,7 +69,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>21</width>
                                     <height>20</height>
@@ -80,7 +80,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -115,7 +115,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>24</width>
                                     <height>20</height>
@@ -134,7 +134,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
@@ -153,7 +153,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>

chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc

@@ -18,7 +18,7 @@
 
 #include "kis_custom_convolution_filter_configuration_widget.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqspinbox.h>
 
 #include <klocale.h>

chalk/plugins/filters/fastcolortransfer/kis_wdg_fastcolortransfer.cpp

@@ -20,7 +20,7 @@
 
 #include "kis_wdg_fastcolortransfer.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kurlrequester.h>
 

chalk/plugins/filters/fastcolortransfer/wdgfastcolortransfer.ui

@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -55,7 +55,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>101</height>

chalk/plugins/filters/lenscorrectionfilter/kis_wdg_lens_correction.cpp

@@ -20,7 +20,7 @@
 
 #include "kis_wdg_lens_correction.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <knuminput.h>
 

chalk/plugins/filters/lenscorrectionfilter/wdglenscorrectionoptions.ui

@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>90</height>
@@ -46,7 +46,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>
@@ -118,7 +118,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>16</width>
                             <height>20</height>
@@ -135,7 +135,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>51</width>
                             <height>20</height>

chalk/plugins/filters/levelfilter/kgradientslider.cc

@@ -66,7 +66,7 @@ void KGradientSlider::paintEvent(TQPaintEvent *)
     /*if (!m_dragging) {*/
         TQPixmap pm(size());
         TQPainter p1;
-        p1.begin(TQT_TQPAINTDEVICE(&pm), this);
+        p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
 
         pm.fill();
 
@@ -203,7 +203,7 @@ void KGradientSlider::mousePressEvent ( TQMouseEvent * e )
             m_gamma = 1.0 / pow (10, tmp);
             break;
        }
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KGradientSlider::mouseReleaseEvent ( TQMouseEvent * e )
@@ -212,7 +212,7 @@ void KGradientSlider::mouseReleaseEvent ( TQMouseEvent * e )
         return;
 
     m_dragging = false;
-    repaint(false);
+    tqrepaint(false);
 
     switch (m_grab_cursor) {
         case BlackCursor:
@@ -283,7 +283,7 @@ void KGradientSlider::mouseMoveEvent ( TQMouseEvent * e )
         }
     }
 
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KGradientSlider::leaveEvent( TQEvent * )
@@ -294,7 +294,7 @@ void KGradientSlider::leaveEvent( TQEvent * )
 void KGradientSlider::enableGamma(bool b)
 {
     m_gammaEnabled = b;
-    repaint(false);
+    tqrepaint(false);
 }
 
 double KGradientSlider::getGamma(void)
@@ -311,7 +311,7 @@ void KGradientSlider::modifyBlack(int v) {
             double tmp   = log10 (1.0 / m_gamma);
             m_gammacursor = (unsigned int)tqRound(mid + delta * tmp);
         }
-        repaint(false);
+        tqrepaint(false);
     }
 }
 void KGradientSlider::modifyWhite(int v) {
@@ -323,7 +323,7 @@ void KGradientSlider::modifyWhite(int v) {
             double tmp   = log10 (1.0 / m_gamma);
             m_gammacursor = (unsigned int)tqRound(mid + delta * tmp);
         }
-        repaint(false);
+        tqrepaint(false);
     }
 }
 void KGradientSlider::modifyGamma(double v) {
@@ -332,7 +332,7 @@ void KGradientSlider::modifyGamma(double v) {
     double mid   = (double)m_blackcursor + delta;
     double tmp   = log10 (1.0 / m_gamma);
     m_gammacursor = (unsigned int)tqRound(mid + delta * tmp);
-    repaint(false);
+    tqrepaint(false);
 }
 
 #include "kgradientslider.moc"

chalk/plugins/filters/levelfilter/kis_level_filter.cc

@@ -22,7 +22,7 @@
 
 #include <klocale.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqpainter.h>
 #include <tqlabel.h>

chalk/plugins/filters/levelfilter/wdg_level.ui

@@ -20,13 +20,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>0</height>
         </size>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>32767</width>
             <height>32767</height>
@@ -60,7 +60,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -70,13 +70,13 @@
                     <property name="name">
                         <cstring>histview</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>256</width>
                             <height>256</height>
                         </size>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>256</width>
                             <height>256</height>
@@ -88,7 +88,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -98,7 +98,7 @@
                             <property name="name">
                                 <cstring>ingradient</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>256</width>
                                     <height>20</height>
@@ -107,7 +107,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout5</cstring>
+                                <cstring>tqlayout5</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -134,7 +134,7 @@
                                     <property name="sizeType">
                                         <enum>MinimumExpanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>25</width>
                                             <height>20</height>
@@ -148,7 +148,7 @@
                                     <property name="text">
                                         <string>1.0</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignCenter</set>
                                     </property>
                                 </widget>
@@ -162,7 +162,7 @@
                                     <property name="sizeType">
                                         <enum>MinimumExpanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>25</width>
                                             <height>20</height>
@@ -194,7 +194,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -204,7 +204,7 @@
                             <property name="name">
                                 <cstring>outgradient</cstring>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>256</width>
                                     <height>20</height>
@@ -213,7 +213,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout2</cstring>
+                                <cstring>tqlayout2</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -240,7 +240,7 @@
                                     <property name="sizeType">
                                         <enum>MinimumExpanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>50</width>
                                             <height>20</height>
@@ -274,7 +274,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
@@ -291,7 +291,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>

chalk/plugins/filters/noisefilter/kis_wdg_noise.cpp

@@ -20,7 +20,7 @@
 
 #include "kis_wdg_noise.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <knuminput.h>
 

chalk/plugins/filters/noisefilter/wdgnoiseoptions.ui

@@ -73,7 +73,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
@@ -90,7 +90,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>21</height>

chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc

@@ -124,7 +124,7 @@ void KisRainDropsFilter::rainDrops(KisPaintDeviceSP src, KisPaintDeviceSP dst, c
 
     KisColorSpace * cs = src->colorSpace();
 
-    TQDateTime dt = TQDateTime::currentDateTime();
+    TQDateTime dt = TQDateTime::tqcurrentDateTime();
     TQDateTime Y2000( TQDate(2000, 1, 1), TQTime(0, 0, 0) );
 
     srand ((uint) dt.secsTo(Y2000));

chalk/plugins/filters/randompickfilter/kis_wdg_random_pick.cpp

@@ -20,7 +20,7 @@
 
 #include "kis_wdg_random_pick.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <knuminput.h>
 

chalk/plugins/filters/randompickfilter/wdgrandompickoptions.ui

@@ -37,7 +37,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>50</height>
@@ -98,7 +98,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>20</height>

chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc

@@ -20,7 +20,7 @@
 
 #include "kis_wdg_unsharp.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtoolbutton.h>
 
 #include <kcombobox.h>

chalk/plugins/filters/unsharp/wdgunsharp.ui

@@ -84,7 +84,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
@@ -115,7 +115,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>21</height>

chalk/plugins/filters/wavefilter/kis_wdg_wave.cpp

@@ -20,7 +20,7 @@
 
 #include "kis_wdg_wave.h"
 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kcombobox.h>
 #include <knuminput.h>
@@ -63,7 +63,7 @@ void KisWdgWave::setConfiguration(KisFilterConfiguration* config)
     {
         widget()->intHAmplitude->setValue( value.toUInt() );
     }
-    if (config->getProperty("horizontalshape", value))
+    if (config->getProperty("horizontaltqshape", value))
     {
         widget()->cbHShape->setCurrentItem( value.toUInt() );
     }
@@ -79,7 +79,7 @@ void KisWdgWave::setConfiguration(KisFilterConfiguration* config)
     {
         widget()->intVAmplitude->setValue( value.toUInt() );
     }
-    if (config->getProperty("verticalshape", value))
+    if (config->getProperty("verticaltqshape", value))
     {
         widget()->cbVShape->setCurrentItem( value.toUInt() );
     }

chalk/plugins/filters/wavefilter/wavefilter.cc

@@ -112,11 +112,11 @@ KisFilterConfiguration* KisFilterWave::configuration(TQWidget* w)
         config->setProperty("horizontalwavelength", wN->widget()->intHWavelength->value() );
         config->setProperty("horizontalshift", wN->widget()->intHShift->value() );
         config->setProperty("horizontalamplitude", wN->widget()->intHAmplitude->value() );
-        config->setProperty("horizontalshape", wN->widget()->cbHShape->currentItem() );
+        config->setProperty("horizontaltqshape", wN->widget()->cbHShape->currentItem() );
         config->setProperty("verticalwavelength", wN->widget()->intVWavelength->value() );
         config->setProperty("verticalshift", wN->widget()->intVShift->value() );
         config->setProperty("verticalamplitude", wN->widget()->intVAmplitude->value() );
-        config->setProperty("verticalshape", wN->widget()->cbVShape->currentItem() );
+        config->setProperty("verticaltqshape", wN->widget()->cbVShape->currentItem() );
     }
     return config;
 }
@@ -137,19 +137,19 @@ void KisFilterWave::process(KisPaintDeviceSP src, KisPaintDeviceSP dst, KisFilte
     int horizontalwavelength = (config && config->getProperty("horizontalwavelength", value)) ? value.toInt() : 50;
     int horizontalshift = (config && config->getProperty("horizontalshift", value)) ? value.toInt() : 50;
     int horizontalamplitude = (config && config->getProperty("horizontalamplitude", value)) ? value.toInt() : 4;
-    int horizontalshape = (config && config->getProperty("horizontalshape", value)) ? value.toInt() : 0;
+    int horizontaltqshape = (config && config->getProperty("horizontaltqshape", value)) ? value.toInt() : 0;
     int verticalwavelength = (config && config->getProperty("verticalwavelength", value)) ? value.toInt() : 50;
     int verticalshift = (config && config->getProperty("verticalshift", value)) ? value.toInt() : 50;
     int verticalamplitude = (config && config->getProperty("verticalamplitude", value)) ? value.toInt() : 4;
-    int verticalshape = (config && config->getProperty("verticalshape", value)) ? value.toInt() : 0;
+    int verticaltqshape = (config && config->getProperty("verticaltqshape", value)) ? value.toInt() : 0;
     KisRectIteratorPixel dstIt = dst->createRectIterator(rect.x(), rect.y(), rect.width(), rect.height(), true );
     KisWaveCurve* verticalcurve;
-    if(verticalshape == 1)
+    if(verticaltqshape == 1)
         verticalcurve = new KisTriangleWaveCurve(verticalamplitude, verticalwavelength, verticalshift);
     else
         verticalcurve = new KisSinusoidalWaveCurve(verticalamplitude, verticalwavelength, verticalshift);
     KisWaveCurve* horizontalcurve;
-    if(horizontalshape == 1)
+    if(horizontaltqshape == 1)
         horizontalcurve = new KisTriangleWaveCurve(horizontalamplitude, horizontalwavelength, horizontalshift);
     else
         horizontalcurve = new KisSinusoidalWaveCurve(horizontalamplitude, horizontalwavelength, horizontalshift);

chalk/plugins/filters/wavefilter/wdgwaveoptions.ui

@@ -29,7 +29,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>60</width>
                     <height>20</height>
@@ -46,7 +46,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>60</height>

chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc

@@ -59,18 +59,18 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info
 //
 // Most graphics apps -- especially the simple ones like Kolourpaint
 // and the previous version of this routine in Chalk took a brush
-// shape -- often a simple ellipse -- and filled that shape with a
+// tqshape -- often a simple ellipse -- and filled that tqshape with a
 // random 'spray' of single pixels.
 //
 // Other, more advanced graphics apps, like the Gimp or Photoshop,
-// take the brush shape and paint just as with the brush paint op,
+// take the brush tqshape and paint just as with the brush paint op,
 // only making the initial dab more transparent, and perhaps adding
 // extra transparence near the edges. Then, using a timer, when the
 // cursor stays in place, dab upon dab is positioned in the same
 // place, which makes the result less and less transparent.
 //
 // What I want to do here is create an airbrush that approaches a real
-// one. It won't use brush shapes, instead going for the old-fashioned
+// one. It won't use brush tqshapes, instead going for the old-fashioned
 // circle. Depending upon pressure, both the size of the dab and the
 // rate of paint deposition is determined. The edges of the dab are
 // more transparent than the center, with perhaps even some fully
@@ -91,7 +91,7 @@ void KisAirbrushOp::paintAt(const KisPoint &pos, const KisPaintInformation& info
 
     KisPaintDeviceSP device = m_painter->device();
 
-    // For now: use the current brush shape -- it beats calculating
+    // For now: use the current brush tqshape -- it beats calculating
     // ellipes and cones, and it shows the working of the timer.
     if (!device) return;
 

chalk/plugins/paintops/defaultpaintops/kis_brushop.cc

@@ -24,7 +24,7 @@
 
 #include <tqrect.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqtoolbutton.h>
@@ -68,7 +68,7 @@ KisBrushOpSettings::KisBrushOpSettings(TQWidget *parent)
     m_darken = new TQCheckBox(i18n("Darken"), m_optionsWidget);
     m_curveControl = new WdgBrushCurveControl(m_optionsWidget);
     TQToolButton* moreButton = new TQToolButton(TQt::UpArrow, m_optionsWidget);
-    moreButton->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+    moreButton->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
     moreButton->setMinimumSize(TQSize(24,24)); // Bah, I had hoped the above line would make this unneeded
     connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustomCurves()));
 

chalk/plugins/paintops/defaultpaintops/kis_dlgbrushcurvecontrol.ui

@@ -39,7 +39,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>layout4</cstring>
+                            <cstring>tqlayout4</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -83,7 +83,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>layout3</cstring>
+                            <cstring>tqlayout3</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -127,7 +127,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>layout5</cstring>
+                            <cstring>tqlayout5</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -183,7 +183,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>

chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc

@@ -22,7 +22,7 @@
 
 #include <tqrect.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcheckbox.h>
 #include <tqtabwidget.h>
@@ -77,7 +77,7 @@ KisSmudgeOpSettings::KisSmudgeOpSettings(TQWidget *parent, bool isTablet)
         m_curveControl->tabWidget->setTabToolTip(m_curveControl->tabWidget->page(2),
                 i18n("Modifies the rate. Bottom is 0% of the rate top is 100% of the original rate."));
         TQToolButton* moreButton = new TQToolButton(TQt::UpArrow, m_optionsWidget);
-        moreButton->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+        moreButton->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
         moreButton->setMinimumSize(TQSize(24,24)); // Bah, I had hoped the above line would make this unneeded
         connect(moreButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotCustomCurves()));
     } else {

chalk/plugins/tools/defaulttools/kis_tool_brush.cc

@@ -19,7 +19,7 @@
  */
 #include <tqevent.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 #include <tqtimer.h>
 #include <tqpushbutton.h>

chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc

@@ -19,7 +19,7 @@
 #include <string.h>
 
 #include <tqpoint.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqcombobox.h>
 #include <tqlistview.h>
@@ -180,7 +180,7 @@ void KisToolColorPicker::buttonPress(KisButtonPressEvent *e)
             palette->add(ent);
 
             if (!palette->save()) {
-                KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.").arg(palette->filename()), i18n("Palette"));
+                KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.").tqarg(palette->filename()), i18n("Palette"));
             }
         }
     }
@@ -197,7 +197,7 @@ void KisToolColorPicker::displayPickedColor()
             TQString channelValueText;
 
             if (m_normaliseValues) {
-                channelValueText = i18n("%1%").arg(m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), i));
+                channelValueText = i18n("%1%").tqarg(m_pickedColor.colorSpace()->normalisedChannelValueText(m_pickedColor.data(), i));
             } else {
                 channelValueText = m_pickedColor.colorSpace()->channelValueText(m_pickedColor.data(), i);
             }

chalk/plugins/tools/defaulttools/kis_tool_fill.cc

@@ -25,7 +25,7 @@
 #include <klocale.h>
 #include <kcommand.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 
 #include <tqcolor.h>

chalk/plugins/tools/defaulttools/kis_tool_gradient.cc

@@ -23,7 +23,7 @@
 
 #include <tqpainter.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 
 #include <kdebug.h>
@@ -58,7 +58,7 @@ KisToolGradient::KisToolGradient()
     m_endPos = KisPoint(0, 0);
 
     m_reverse = false;
-    m_shape = KisGradientPainter::GradientShapeLinear;
+    m_tqshape = KisGradientPainter::GradientShapeLinear;
     m_repeat = KisGradientPainter::GradientRepeatNone;
     m_antiAliasThreshold = 0.2;
 }
@@ -157,7 +157,7 @@ void KisToolGradient::buttonRelease(KisButtonReleaseEvent *e)
                 progress->setSubject(&painter, true, true);
             }
 
-            bool painted = painter.paintGradient(m_startPos, m_endPos, m_shape, m_repeat, m_antiAliasThreshold, m_reverse, 0, 0, m_subject->currentImg()->width(), m_subject->currentImg()->height());
+            bool painted = painter.paintGradient(m_startPos, m_endPos, m_tqshape, m_repeat, m_antiAliasThreshold, m_reverse, 0, 0, m_subject->currentImg()->width(), m_subject->currentImg()->height());
 
             if (painted) {
                 // does whole thing at moment
@@ -237,7 +237,7 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent)
     m_ckReverse = new TQCheckBox(i18n("Reverse"), widget, "reverse_check");
     connect(m_ckReverse, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotSetReverse(bool)));
 
-    m_cmbShape = new TQComboBox(false, widget, "shape_combo");
+    m_cmbShape = new TQComboBox(false, widget, "tqshape_combo");
     connect(m_cmbShape, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetShape(int)));
     m_cmbShape->insertItem(i18n("Linear"));
     m_cmbShape->insertItem(i18n("Bi-Linear"));
@@ -270,9 +270,9 @@ TQWidget* KisToolGradient::createOptionWidget(TQWidget* parent)
     return widget;
 }
 
-void KisToolGradient::slotSetShape(int shape)
+void KisToolGradient::slotSetShape(int tqshape)
 {
-    m_shape = static_cast<KisGradientPainter::enumGradientShape>(shape);
+    m_tqshape = static_cast<KisGradientPainter::enumGradientShape>(tqshape);
 }
 
 void KisToolGradient::slotSetRepeat(int repeat)

chalk/plugins/tools/defaulttools/kis_tool_gradient.h

@@ -88,7 +88,7 @@ private:
 
     KisCanvasSubject *m_subject;
 
-    KisGradientPainter::enumGradientShape m_shape;
+    KisGradientPainter::enumGradientShape m_tqshape;
     KisGradientPainter::enumGradientRepeat m_repeat;
 
     bool m_reverse;

chalk/plugins/tools/defaulttools/kis_tool_line.cc

@@ -21,7 +21,7 @@
  */
 
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 
 #include <kdebug.h>

chalk/plugins/tools/defaulttools/kis_tool_text.cc

@@ -19,7 +19,7 @@
 #include <tqfont.h>
 #include <tqrect.h>
 #include <tqimage.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 #include <tqstring.h>
 #include <tqpixmap.h>
@@ -156,7 +156,7 @@ void KisToolText::buttonRelease(KisButtonReleaseEvent *e)
 
 void KisToolText::setFont() {
     KFontDialog::getFont( m_font, false/*, TQWidget* parent! */ );
-    m_lbFontName->setText(TQString(m_font.family() + ", %1").arg(m_font.pointSize()));
+    m_lbFontName->setText(TQString(m_font.family() + ", %1").tqarg(m_font.pointSize()));
 }
 
 TQWidget* KisToolText::createOptionWidget(TQWidget* parent)
@@ -167,7 +167,7 @@ TQWidget* KisToolText::createOptionWidget(TQWidget* parent)
 
     TQHBox *fontBox = new TQHBox(widget);
     m_lbFontName = new KSqueezedTextLabel(TQString(m_font.family() + ", %1")
-        .arg(m_font.pointSize()), fontBox);
+        .tqarg(m_font.pointSize()), fontBox);
     m_btnMoreFonts = new TQPushButton("...", fontBox);
 
     connect(m_btnMoreFonts, TQT_SIGNAL(released()), this, TQT_SLOT(setFont()));

chalk/plugins/tools/defaulttools/wdgcolorpicker.ui

@@ -47,13 +47,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>200</width>
                     <height>0</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>200</width>
                     <height>32767</height>
@@ -70,7 +70,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -101,7 +101,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">

chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc

@@ -20,7 +20,7 @@
 
 #include <tqevent.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 #include <tqrect.h>
 
@@ -152,7 +152,7 @@ TQWidget* KisToolSelectBrush::createOptionWidget(TQWidget* parent)
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Selection Brush"));
 
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
 
     return m_optWidget;

chalk/plugins/tools/selectiontools/kis_tool_select_brush.h

@@ -32,7 +32,7 @@ class KisSelectionOptions;
 
 /**
  * The selection brush creates a selection by painting with the current
- * brush shape. Not sure what kind of an icon could represent this... 
+ * brush tqshape. Not sure what kind of an icon could represent this... 
  * Depends a bit on how we're going to visualize selections.
  */
 class KisToolSelectBrush : public KisToolFreehand {

chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc

@@ -21,7 +21,7 @@
  */
 
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqapplication.h>
 #include <tqcheckbox.h>
@@ -189,7 +189,7 @@ TQWidget* KisToolSelectContiguous::createOptionWidget(TQWidget* parent)
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Contiguous Area Selection"));
 
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     l->setSpacing( 6 );
 
     connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));

chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc

@@ -21,7 +21,7 @@
 #include <tqapplication.h>
 #include <tqpainter.h>
 #include <tqpen.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kdebug.h>
 #include <kaction.h>
@@ -203,12 +203,12 @@ void KisToolSelectElliptical::buttonRelease(KisButtonReleaseEvent *e)
                 rc = rc.normalize();
                 
                 KisSelectionSP tmpSel = new KisSelection(dev);
-                KisAutobrushCircleShape shape(rc.width(),rc.height(), 1, 1);
+                KisAutobrushCircleShape tqshape(rc.width(),rc.height(), 1, 1);
                 TQ_UINT8 value;
                 for (int y = 0; y <= rc.height(); y++)
                     for (int x = 0; x <= rc.width(); x++)
                     {
-                        value = MAX_SELECTED - shape.valueAt(x,y);
+                        value = MAX_SELECTED - tqshape.valueAt(x,y);
                         tmpSel->setSelected( x+rc.x(), y+rc.y(), value);
                     }
                 switch(m_selectAction)
@@ -305,7 +305,7 @@ TQWidget* KisToolSelectElliptical::createOptionWidget(TQWidget* parent)
 
     connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
 
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
 
     return m_optWidget;

chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc

@@ -20,7 +20,7 @@
 
 #include <tqevent.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqwidget.h>
 
 #include <kdebug.h>
@@ -139,7 +139,7 @@ TQWidget* KisToolSelectEraser::createOptionWidget(TQWidget* parent)
     Q_CHECK_PTR(m_optWidget);
     m_optWidget->setCaption(i18n("Selection Eraser"));
 
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
 
     return m_optWidget;

chalk/plugins/tools/selectiontools/kis_tool_select_eraser.h

@@ -30,7 +30,7 @@ class KisSelectionOptions;
 
 /**
  * The selection eraser makes a selection smaller by painting with the
- * current eraser shape. Not sure what kind of an icon could represent
+ * current eraser tqshape. Not sure what kind of an icon could represent
  * this... Depends a bit on how we're going to visualize selections.
  */
 class KisToolSelectEraser : public KisToolFreehand {

chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc

@@ -23,7 +23,7 @@
 #include <tqpainter.h>
 #include <tqregion.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kaction.h>
 #include <kdebug.h>
@@ -275,7 +275,7 @@ TQWidget* KisToolSelectOutline::createOptionWidget(TQWidget* parent)
 
     connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
 
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
 
     return m_optWidget;

chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc

@@ -23,7 +23,7 @@
 #include <tqpainter.h>
 #include <tqregion.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kaction.h>
 #include <kdebug.h>
@@ -294,7 +294,7 @@ TQWidget* KisToolSelectPolygonal::createOptionWidget(TQWidget* parent)
 
     connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
 
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
 
     return m_optWidget;

chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc

@@ -24,7 +24,7 @@
 #include <tqapplication.h>
 #include <tqpainter.h>
 #include <tqpen.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kdebug.h>
 #include <kaction.h>
@@ -306,7 +306,7 @@ TQWidget* KisToolSelectRectangular::createOptionWidget(TQWidget* parent)
 
     connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
 
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
 
     return m_optWidget;

chalk/plugins/tools/tool_crop/kis_tool_crop.cc

@@ -500,7 +500,7 @@ void KisToolCrop::paintOutlineWithHandles(KisCanvasPainter& gc, const TQRect&)
         gc.drawLine(startx,endy + m_handleSize / 2 + 1, startx, controller->kiscanvas()->height());
         gc.drawLine(endx,0,endx,starty - m_handleSize / 2);
         gc.drawLine(endx + m_handleSize / 2 + 1,starty, controller->kiscanvas()->width(), starty);
-        TQMemArray <TQRect> rects = m_handlesRegion.rects ();
+        TQMemArray <TQRect> rects = m_handlesRegion.tqrects ();
         for (TQMemArray <TQRect>::ConstIterator it = rects.begin (); it != rects.end (); ++it)
         {
             gc.fillRect (*it, TQt::black);

chalk/plugins/tools/tool_crop/wdg_tool_crop.ui

@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <grid>
                 <property name="name">
@@ -138,7 +138,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -185,7 +185,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>

chalk/plugins/tools/tool_curves/kis_tool_bezier.cc

@@ -21,7 +21,7 @@
 #include <math.h>
 
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqrect.h>
 
 #include <kaction.h>

chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc

@@ -20,7 +20,7 @@
 
 
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqrect.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>

chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.h

@@ -57,7 +57,7 @@ public:
         t->setup(ac);
         return t;
     }
-    virtual KisID id() { return KisID("beziershape", i18n("Bezier Painting Tool")); }
+    virtual KisID id() { return KisID("beziertqshape", i18n("Bezier Painting Tool")); }
 };
 
 #endif //__KIS_TOOL_CURVE_PAINT_H_

chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc

@@ -20,7 +20,7 @@
 
 
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqrect.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>

chalk/plugins/tools/tool_curves/kis_tool_curve.cc

@@ -23,7 +23,7 @@
 
 #include <tqapplication.h>
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqrect.h>
 
 #include <kaction.h>
@@ -576,7 +576,7 @@ TQWidget* KisToolCurve::createSelectionOptionWidget(TQWidget* parent)
 
     connect (m_optWidget, TQT_SIGNAL(actionChanged(int)), this, TQT_SLOT(slotSetAction(int)));
 
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     l->addItem(new TQSpacerItem(1, 1, TQSizePolicy::Fixed, TQSizePolicy::Expanding));
 
     return m_optWidget;

chalk/plugins/tools/tool_curves/kis_tool_example.cc

@@ -20,7 +20,7 @@
 
 
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqrect.h>
 
 #include <kaction.h>

chalk/plugins/tools/tool_curves/kis_tool_example.h

@@ -60,7 +60,7 @@ public:
         t->setup(ac);
         return t;
     }
-    virtual KisID id() { return KisID("exampleshape", i18n("Example Tool")); }
+    virtual KisID id() { return KisID("exampletqshape", i18n("Example Tool")); }
 };
 
 

chalk/plugins/tools/tool_curves/kis_tool_moutline.cc

@@ -22,7 +22,7 @@
 #include <set>
 
 #include <tqpainter.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqrect.h>
 #include <tqlabel.h>
 #include <tqpushbutton.h>
@@ -762,7 +762,7 @@ void KisToolMagnetic::slotSetDistance (int dist)
 TQWidget* KisToolMagnetic::createOptionWidget(TQWidget* parent)
 {
     m_optWidget = super::createOptionWidget(parent);
-    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->layout());
+    TQVBoxLayout * l = dynamic_cast<TQVBoxLayout*>(m_optWidget->tqlayout());
     TQGridLayout *box = new TQGridLayout(l, 2, 2, 3);
     box->setColStretch(0, 1);
     box->setColStretch(1, 1);

chalk/plugins/tools/tool_curves/wdg_tool_example.ui

@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout8</cstring>
+                <cstring>tqlayout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -59,7 +59,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <hbox>
                 <property name="name">

chalk/plugins/tools/tool_filter/kis_tool_filter.cc

@@ -21,7 +21,7 @@
 #include <tqbitmap.h>
 #include <tqpainter.h>
 #include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 
 #include <kaction.h>

chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc

@@ -23,7 +23,7 @@
 #include <tqpainter.h>
 #include <tqregion.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kaction.h>
 #include <kdebug.h>

chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc

@@ -19,7 +19,7 @@
  */
 
 #include <tqpoint.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>

chalk/plugins/tools/tool_star/kis_tool_star.cc

@@ -23,7 +23,7 @@
 
 #include <tqpainter.h>
 #include <tqspinbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kaction.h>
 #include <kdebug.h>

chalk/plugins/tools/tool_star/kis_tool_star.h

@@ -94,7 +94,7 @@ public:
         t->setup(ac);
         return t;
     }
-    virtual KisID id() { return KisID("starshape", i18n("Star Tool")); }
+    virtual KisID id() { return KisID("startqshape", i18n("Star Tool")); }
 };
 
 

chalk/plugins/tools/tool_star/wdg_tool_star.ui

@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout8</cstring>
+                <cstring>tqlayout8</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -59,7 +59,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <hbox>
                 <property name="name">

chalk/plugins/tools/tool_transform/wdg_tool_transform.ui

@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
-                <cstring>layout11</cstring>
+                <cstring>tqlayout11</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -35,7 +35,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout7</cstring>
+                        <cstring>tqlayout7</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -43,7 +43,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout1</cstring>
+                                <cstring>tqlayout1</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -72,7 +72,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout2</cstring>
+                                <cstring>tqlayout2</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -103,7 +103,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -111,7 +111,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout3</cstring>
+                                <cstring>tqlayout3</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -140,7 +140,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout4</cstring>
+                                <cstring>tqlayout4</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -178,7 +178,7 @@
             <property name="text">
                 <string>Filter:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
         </widget>
@@ -197,7 +197,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>21</height>

chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc

@@ -187,7 +187,7 @@ DlgColorRange::DlgColorRange( KisView * view, KisPaintDeviceSP dev, TQWidget *
 
     setCaption(i18n("Color Range"));
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     if (m_dev->image()->undo()) m_transaction = new KisSelectedTransaction(i18n("Select by Color Range"), m_dev);
 

chalk/plugins/viewplugins/colorrange/wdg_colorrange.ui

@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout10</cstring>
+                <cstring>tqlayout10</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -29,7 +29,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -37,7 +37,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout7</cstring>
+                                <cstring>tqlayout7</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -144,7 +144,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>tqlayout9</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -176,7 +176,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>40</height>
@@ -233,7 +233,7 @@
                     <property name="scaledContents">
                         <bool>false</bool>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignCenter</set>
                     </property>
                 </widget>

chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc

@@ -91,7 +91,7 @@ void ColorSpaceConversion::slotImgColorSpaceConversion()
         if (KMessageBox::warningContinueCancel(m_view,
             i18n("This conversion will convert your %1 image through 16-bit L*a*b* and back.\n"
                     "Watercolor and openEXR colorspaces will even be converted through 8-bit RGB.\n")
-                    .arg(image->colorSpace()->id().name()),
+                    .tqarg(image->colorSpace()->id().name()),
             i18n("Colorspace Conversion"),
             KGuiItem(i18n("Continue")),
             "lab16degradation") != KMessageBox::Continue) return;
@@ -128,7 +128,7 @@ void ColorSpaceConversion::slotLayerColorSpaceConversion()
         if (KMessageBox::warningContinueCancel(m_view,
             i18n("This conversion will convert your %1 layer through 16-bit L*a*b* and back.\n"
                     "Watercolor and openEXR colorspaces will even be converted through 8-bit RGB.\n")
-                    .arg(dev->colorSpace()->id().name()),
+                    .tqarg(dev->colorSpace()->id().name()),
             i18n("Colorspace Conversion"),
             KGuiItem(i18n("Continue")),
             "lab16degradation") != KMessageBox::Continue) return;

chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc

@@ -47,7 +47,7 @@ DlgColorSpaceConversion::DlgColorSpaceConversion( TQWidget *  parent,
     Q_CHECK_PTR(m_page);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     m_page->cmbColorSpaces->setIDList(KisMetaRegistry::instance()->csRegistry()->listKeys());
 

chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc

@@ -46,7 +46,7 @@ DlgDropshadow::DlgDropshadow( const TQString & /*imageCS*/,
     m_page = new WdgDropshadow(this, "dropshadow");
     Q_CHECK_PTR(m_page);
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     KConfig * cfg = KGlobal::config();
     m_page->xOffsetSpinBox->setValue( cfg->readNumEntry("dropshadow_x", 8) );

chalk/plugins/viewplugins/dropshadow/wdg_dropshadow.ui

@@ -116,7 +116,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>200</width>
                     <height>20</height>
@@ -144,7 +144,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>200</width>
                     <height>20</height>
@@ -169,7 +169,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>190</width>
                     <height>20</height>
@@ -194,7 +194,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>120</width>
                     <height>31</height>

chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc

@@ -22,7 +22,7 @@
 #include "kis_dlg_filtersgallery.h"
 
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqdatetime.h>
 
@@ -56,7 +56,7 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const
     connect(m_widget->filtersList , TQT_SIGNAL(selectionChanged(TQIconViewItem*)), this, TQT_SLOT(selectionHasChanged(TQIconViewItem* )));
     // Initialize configWidgetHolder
     m_widget->configWidgetHolder->setColumnLayout ( 0, Qt::Horizontal );
-    //m_widget->configWidgetHolder->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum);
+    //m_widget->configWidgetHolder->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Minimum);
     // Initialize preview widget
     
     if (m_view->canvasSubject()->currentImg() && m_view->canvasSubject()->currentImg()->activeDevice())
@@ -64,10 +64,10 @@ KisDlgFiltersGallery::KisDlgFiltersGallery(KisView* view, TQWidget* parent,const
         m_widget->previewWidget->slotSetDevice( m_view->canvasSubject()->currentImg()->activeDevice().data() );
     }
     connect( m_widget->previewWidget, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview()));
-    resize( minimumSizeHint());
-    m_widget->previewWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding);
+    resize( tqminimumSizeHint());
+    m_widget->previewWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::MinimumExpanding);
     m_labelNoCW = new TQLabel(i18n("No configuration options are available for this filter."), m_widget->configWidgetHolder);
-    m_widget->configWidgetHolder->layout()->add(m_labelNoCW);
+    m_widget->configWidgetHolder->tqlayout()->add(m_labelNoCW);
     m_labelNoCW->hide();
 }
 
@@ -81,7 +81,7 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item )
     m_currentFilter = kisitem->filter();
     if(m_currentConfigWidget != 0)
     {
-        m_widget->configWidgetHolder->layout()->remove(m_currentConfigWidget);
+        m_widget->configWidgetHolder->tqlayout()->remove(m_currentConfigWidget);
         delete m_currentConfigWidget;
         m_currentConfigWidget = 0;
     } else {
@@ -94,8 +94,8 @@ void KisDlgFiltersGallery::selectionHasChanged ( TQIconViewItem * item )
        m_currentConfigWidget = m_currentFilter->createConfigurationWidget(m_widget->configWidgetHolder, activeLayer->paintDevice());
     
     if(m_currentConfigWidget != 0) {
-        //m_currentConfigWidget->setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
-        m_widget->configWidgetHolder->layout()->add(m_currentConfigWidget);
+        //m_currentConfigWidget->tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed);
+        m_widget->configWidgetHolder->tqlayout()->add(m_currentConfigWidget);
         m_currentConfigWidget->show();
         connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged()));
     }

chalk/plugins/viewplugins/filtersgallery/kis_wdg_filtersgallery.ui

@@ -49,7 +49,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>0</width>
                     <height>0</height>

chalk/plugins/viewplugins/histogram/dlg_histogram.cc

@@ -47,7 +47,7 @@ DlgHistogram::DlgHistogram( TQWidget *  parent, const char * name)
 
     setCaption(i18n("Histogram"));
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 }
 
 DlgHistogram::~DlgHistogram()

chalk/plugins/viewplugins/histogram/wdghistogram.ui

@@ -56,7 +56,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -75,7 +75,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>200</width>
                             <height>0</height>
@@ -103,7 +103,7 @@
                     <property name="sizeType">
                         <enum>Preferred</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>21</height>
@@ -124,7 +124,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>256</width>
                     <height>150</height>
@@ -133,7 +133,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <hbox>
                 <property name="name">

chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc

@@ -58,7 +58,7 @@ DlgImageSize::DlgImageSize( TQWidget *  parent,
     m_page->cmbFilterType->setCurrentText("Mitchell");
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     unblockAll();
 

chalk/plugins/viewplugins/imagesize/dlg_layersize.cc

@@ -59,7 +59,7 @@ DlgLayerSize::DlgLayerSize( TQWidget *  parent,
     m_page->cmbFilterType->setCurrentText("Mitchell");
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     unblockAll();
 

chalk/plugins/viewplugins/imagesize/wdg_imagesize.ui

@@ -51,7 +51,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>65</width>
                             <height>20</height>
@@ -68,7 +68,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>65</width>
                             <height>20</height>
@@ -123,7 +123,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>121</width>
                             <height>20</height>
@@ -197,7 +197,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -214,7 +214,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -307,7 +307,7 @@
             <property name="text">
                 <string>Filter:</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter|AlignRight</set>
             </property>
             <property name="buddy" stdset="0">

chalk/plugins/viewplugins/imagesize/wdg_layersize.ui

@@ -76,7 +76,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>
@@ -93,7 +93,7 @@
                     <property name="text">
                         <string></string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>

chalk/plugins/viewplugins/imagesize/wdg_resolution.ui

@@ -96,7 +96,7 @@
                     <property name="text">
                         <string>100</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignVCenter|AlignRight</set>
                     </property>
                 </widget>

chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc

@@ -45,7 +45,7 @@ DlgBorderSelection::DlgBorderSelection( TQWidget *  parent, const char * name) :
     Q_CHECK_PTR(m_page);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked()));
 }

chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc

@@ -45,7 +45,7 @@ DlgGrowSelection::DlgGrowSelection( TQWidget *  parent, const char * name) : sup
     Q_CHECK_PTR(m_page);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked()));
 }

chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc

@@ -45,7 +45,7 @@ DlgShrinkSelection::DlgShrinkSelection( TQWidget *  parent, const char * name) :
     Q_CHECK_PTR(m_page);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     connect(this, TQT_SIGNAL(okClicked()), this, TQT_SLOT(okClicked()));
 }

chalk/plugins/viewplugins/performancetest/dlg_perftest.cc

@@ -49,7 +49,7 @@ DlgPerfTest::DlgPerfTest( TQWidget *  parent,
     Q_CHECK_PTR(m_page);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     connect(this, TQT_SIGNAL(okClicked()),
         this, TQT_SLOT(okClicked()));

chalk/plugins/viewplugins/performancetest/perftest.cc

@@ -27,7 +27,7 @@
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqdatetime.h>
 
 #include <klocale.h>
@@ -140,7 +140,7 @@ void PerfTest::slotPerfTest()
         }
         if (dlgPerfTest->page()->chkShape->isChecked()) {
             kdDebug() << "Shapetest\n";
-            TQString s = shapeTest(testCount);
+            TQString s = tqshapeTest(testCount);
             report = report.append(s);
             kdDebug() << s << "\n";
         }
@@ -293,10 +293,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op,
     p.end();
 
     report = report.append(TQString("   %1 blits of rectangles < tilesize with opacity %2 and composite op %3: %4ms\n")
-                   .arg(testCount)
-                   .arg(opacity)
-                   .arg(op.id().name())
-                   .arg(t.elapsed()));
+                   .tqarg(testCount)
+                   .tqarg(opacity)
+                   .tqarg(op.id().name())
+                   .tqarg(t.elapsed()));
 
 
     // ------------------------------------------------------------------------------
@@ -316,10 +316,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op,
     p.end();
 
     report = report.append(TQString("   %1 blits of rectangles 3 * tilesize with opacity %2 and composite op %3: %4ms\n")
-                   .arg(testCount)
-                   .arg(opacity)
-                   .arg(op.id().name())
-                   .arg(t.elapsed()));
+                   .tqarg(testCount)
+                   .tqarg(opacity)
+                   .tqarg(op.id().name())
+                   .tqarg(t.elapsed()));
 
 
     // ------------------------------------------------------------------------------
@@ -339,10 +339,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op,
     }
     p.end();
     report = report.append(TQString("   %1 blits of rectangles 800 x 800 with opacity %2 and composite op %3: %4ms\n")
-                   .arg(testCount)
-                   .arg(opacity)
-                   .arg(op.id().name())
-                   .arg(t.elapsed()));
+                   .tqarg(testCount)
+                   .tqarg(opacity)
+                   .tqarg(op.id().name())
+                   .tqarg(t.elapsed()));
 
 
     // ------------------------------------------------------------------------------
@@ -362,10 +362,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op,
     }
     p.end();
     report = report.append(TQString("   %1 blits of rectangles 500 x 500 at 600,600 with opacity %2 and composite op %3: %4ms\n")
-                   .arg(testCount)
-                   .arg(opacity)
-                   .arg(op.id().name())
-                   .arg(t.elapsed()));
+                   .tqarg(testCount)
+                   .tqarg(opacity)
+                   .tqarg(op.id().name())
+                   .tqarg(t.elapsed()));
 
     // ------------------------------------------------------------------------------
     // Small with varied source opacity
@@ -387,10 +387,10 @@ TQString PerfTest::doBlit(const KisCompositeOp& op,
     p.end();
 
     report = report.append(TQString("   %1 blits of rectangles < tilesize with source alpha, with opacity %2 and composite op %3: %4ms\n")
-                   .arg(testCount)
-                   .arg(opacity)
-                   .arg(op.id().name())
-                   .arg(t.elapsed()));
+                   .tqarg(testCount)
+                   .tqarg(opacity)
+                   .tqarg(op.id().name())
+                   .tqarg(t.elapsed()));
 
     return report;
 
@@ -418,21 +418,21 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount)
         for (TQ_UINT32 i = 0; i < testCount; ++i) {
             p.eraseRect(0, 0, 1000, 1000);
         }
-        report = report.append(TQString("    Erased 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Erased 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
 
 
         t.restart();
         for (TQ_UINT32 i = 0; i < testCount; ++i) {
             p.eraseRect(50, 50, 500, 500);
         }
-        report = report.append(TQString("    Erased 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Erased 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
 
 
         t.restart();
         for (TQ_UINT32 i = 0; i < testCount; ++i) {
             p.eraseRect(-50, -50, 1100, 1100);
         }
-        report = report.append(TQString("    Erased rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Erased rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
 
 
         // Opaque Rect fill
@@ -440,21 +440,21 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount)
         for (TQ_UINT32 i = 0; i < testCount; ++i) {
             p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()));
         }
-        report = report.append(TQString("    Opaque fill 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Opaque fill 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
 
 
         t.restart();
         for (TQ_UINT32 i = 0; i < testCount; ++i) {
             p.fillRect(50, 50, 500, 500, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()));
         }
-        report = report.append(TQString("    Opaque fill 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Opaque fill 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
 
 
         t.restart();
         for (TQ_UINT32 i = 0; i < testCount; ++i) {
             p.fillRect(-50, -50, 1100, 1100, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()));
         }
-        report = report.append(TQString("    Opaque fill rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Opaque fill rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
 
         // Transparent rect fill
 
@@ -462,21 +462,21 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount)
         for (TQ_UINT32 i = 0; i < testCount; ++i) {
             p.fillRect(0, 0, 1000, 1000, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2);
         }
-        report = report.append(TQString("    Opaque fill 1000 x 1000 layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Opaque fill 1000 x 1000 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
 
 
         t.restart();
         for (TQ_UINT32 i = 0; i < testCount; ++i) {
             p.fillRect(50, 50, 500, 500, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2);
         }
-        report = report.append(TQString("    Opaque fill 500 x 500 layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Opaque fill 500 x 500 layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
 
 
         t.restart();
         for (TQ_UINT32 i = 0; i < testCount; ++i) {
             p.fillRect(-50, -50, 1100, 1100, KisColor(TQt::black, KisMetaRegistry::instance()->csRegistry()->getRGB8()), OPACITY_OPAQUE / 2);
         }
-        report = report.append(TQString("    Opaque fill rect bigger than layer %1 times: %2\n").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Opaque fill rect bigger than layer %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
 
         // Colour fill
 
@@ -489,7 +489,7 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount)
             p.setCompositeOp(COMPOSITE_OVER);
             p.fillColor(0,0);
         }
-        report = report.append(TQString("    Opaque floodfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Opaque floodfill of whole circle (incl. erase and painting of circle) %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
 
 
         // Pattern fill
@@ -505,7 +505,7 @@ TQString PerfTest::fillTest(TQ_UINT32 testCount)
             p.setCompositeOp(COMPOSITE_OVER);
             p.fillPattern(0,0);
         }
-        report = report.append(TQString("    Opaque patternfill  of whole circle (incl. erase and painting of circle) %1 times: %2\n").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    Opaque patternfill  of whole circle (incl. erase and painting of circle) %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
 
 
 
@@ -549,7 +549,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount)
                 }
             }
          }
-        report = report.append(TQString("    read 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    read 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
 
         c= TQt::black;
          t.restart();
@@ -560,7 +560,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount)
                 }
             }
          }
-        report = report.append(TQString("    written 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    written 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
 
     }
 
@@ -571,7 +571,7 @@ TQString PerfTest::pixelTest(TQ_UINT32 testCount)
 
 }
 
-TQString PerfTest::shapeTest(TQ_UINT32 testCount)
+TQString PerfTest::tqshapeTest(TQ_UINT32 testCount)
 {
     return TQString("Shape test\n");
 }
@@ -606,7 +606,7 @@ TQString PerfTest::rotateTest(TQ_UINT32 testCount)
                 delete img;
             }
         }
-        report = report.append(TQString("    rotated  1000 x 1000 pixels over 360 degrees, degree by degree, %1 times: %2\n").arg(testCount).arg(t.elapsed()));
+        report = report.append(TQString("    rotated  1000 x 1000 pixels over 360 degrees, degree by degree, %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
     }
     return report;
 }
@@ -643,7 +643,7 @@ TQString PerfTest::colorConversionTest(TQ_UINT32 testCount)
                 img2->convertTo(KisMetaRegistry::instance()->csRegistry()->getColorSpace(*it2,""));
                 delete img2;
             }
-            report = report.append(TQString("    converted from " + (*it).name() + " to " + (*it2).name() + " 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed()));
+            report = report.append(TQString("    converted from " + (*it).name() + " to " + (*it2).name() + " 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
 
         }
 
@@ -681,7 +681,7 @@ TQString PerfTest::filterTest(TQ_UINT32 testCount)
                 f->process(l.data(), l.data(), f->configuration(f->createConfigurationWidget(m_view, l.data())), TQRect(0, 0, 1000, 1000));
                 f->disableProgress();
             }
-            report = report.append(TQString("    filtered " + (*it).name() + "1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed()));
+            report = report.append(TQString("    filtered " + (*it).name() + "1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
 
         }
 
@@ -709,7 +709,7 @@ TQString PerfTest::readBytesTest(TQ_UINT32 testCount)
         delete[] newData;
     }
 
-    report = report.append(TQString("    read 1000 x 1000 pixels %1 times from empty image: %2\n").arg(testCount).arg(t.elapsed()));
+    report = report.append(TQString("    read 1000 x 1000 pixels %1 times from empty image: %2\n").tqarg(testCount).tqarg(t.elapsed()));
 
     // On tiles with data
 
@@ -726,7 +726,7 @@ TQString PerfTest::readBytesTest(TQ_UINT32 testCount)
         delete[] newData;
     }
 
-    report = report.append(TQString("    read 1000 x 1000 pixels %1 times from filled image: %2\n").arg(testCount).arg(t.elapsed()));
+    report = report.append(TQString("    read 1000 x 1000 pixels %1 times from filled image: %2\n").tqarg(testCount).tqarg(t.elapsed()));
 
     return report;
 }
@@ -755,7 +755,7 @@ TQString PerfTest::writeBytesTest(TQ_UINT32 testCount)
         l->writeBytes(data, 0, 0, 1000, 1000);
     }
     delete[] data;
-    report = report.append(TQString("    written 1000 x 1000 pixels %1 times: %2\n").arg(testCount).arg(t.elapsed()));
+    report = report.append(TQString("    written 1000 x 1000 pixels %1 times: %2\n").tqarg(testCount).tqarg(t.elapsed()));
     return report;
 
 
@@ -788,7 +788,7 @@ TQString hlineRODefault(KisDoc * doc, TQ_UINT32 testCount)
 
     }
 
-    return TQString("    hline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed());
+    return TQString("    hline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
 
 
 }
@@ -820,7 +820,7 @@ TQString hlineRO(KisDoc * doc, TQ_UINT32 testCount)
 
     }
 
-    return TQString("    hline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed());
+    return TQString("    hline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
 
 }
 
@@ -847,7 +847,7 @@ TQString hlineWRDefault(KisDoc * doc, TQ_UINT32 testCount)
 
     }
 
-    return TQString("    hline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed());
+    return TQString("    hline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
 
 }
 
@@ -878,7 +878,7 @@ TQString hlineWR(KisDoc * doc, TQ_UINT32 testCount)
 
     }
 
-    return TQString("    hline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed());
+    return TQString("    hline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
 
 }
 
@@ -903,7 +903,7 @@ TQString vlineRODefault(KisDoc * doc, TQ_UINT32 testCount)
 
     }
 
-    return TQString("    vline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed());
+    return TQString("    vline iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
 
 }
 
@@ -932,7 +932,7 @@ TQString vlineRO(KisDoc * doc, TQ_UINT32 testCount)
 
     }
 
-    return TQString("    vline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed());
+    return TQString("    vline iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
 
 }
 
@@ -957,7 +957,7 @@ TQString vlineWRDefault(KisDoc * doc, TQ_UINT32 testCount)
 
     }
 
-    return TQString("    vline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed());
+    return TQString("    vline iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
 }
 
 TQString vlineWR(KisDoc * doc, TQ_UINT32 testCount)
@@ -985,7 +985,7 @@ TQString vlineWR(KisDoc * doc, TQ_UINT32 testCount)
 
     }
 
-    return TQString("    vline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed());
+    return TQString("    vline iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
 
 }
 
@@ -1005,7 +1005,7 @@ TQString rectRODefault(KisDoc * doc, TQ_UINT32 testCount)
         }
     }
 
-    return TQString("    rect iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed());
+    return TQString("    rect iterated read-only 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
 
 
 }
@@ -1030,7 +1030,7 @@ TQString rectRO(KisDoc * doc, TQ_UINT32 testCount)
         }
     }
 
-    return TQString("    rect iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed());
+    return TQString("    rect iterated read-only 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
 
 }
 
@@ -1052,7 +1052,7 @@ TQString rectWRDefault(KisDoc * doc, TQ_UINT32 testCount)
         }
     }
 
-    return TQString("    rect iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").arg(testCount).arg(t.elapsed());
+    return TQString("    rect iterated writable 1000 x 1000 pixels %1 times over default tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
 
 }
 
@@ -1079,7 +1079,7 @@ TQString rectWR(KisDoc * doc, TQ_UINT32 testCount)
     }
 
 
-    return TQString("    rect iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").arg(testCount).arg(t.elapsed());
+    return TQString("    rect iterated writable 1000 x 1000 pixels %1 times over existing tile: %2\n").tqarg(testCount).tqarg(t.elapsed());
 
 
 }
@@ -1140,7 +1140,7 @@ TQString PerfTest::paintViewTest(TQ_UINT32 testCount)
     CALLGRIND_DUMP_STATS();
 #endif
 
-    report = report.append(TQString("    painted a 512 x 512 image %1 times: %2 ms\n").arg(testCount).arg(t.elapsed()));
+    report = report.append(TQString("    painted a 512 x 512 image %1 times: %2 ms\n").tqarg(testCount).tqarg(t.elapsed()));
 
     img->newLayer("layer 2", OPACITY_OPAQUE);
     l = img->activeDevice();
@@ -1162,7 +1162,7 @@ TQString PerfTest::paintViewTest(TQ_UINT32 testCount)
         m_view->getCanvasController()->updateCanvas(TQRect(0, 0, 512, 512));
     }
 
-    report = report.append(TQString("    painted a 512 x 512 image with 3 layers %1 times: %2 ms\n").arg(testCount).arg(t.elapsed()));
+    report = report.append(TQString("    painted a 512 x 512 image with 3 layers %1 times: %2 ms\n").tqarg(testCount).tqarg(t.elapsed()));
 
     return report;
 }
@@ -1190,7 +1190,7 @@ TQString PerfTest::paintViewFPSTest()
     CALLGRIND_DUMP_STATS();
 #endif
 
-    report = report.append(TQString("    painted current view at %1 frames per second\n").arg(numViewsPainted));
+    report = report.append(TQString("    painted current view at %1 frames per second\n").tqarg(numViewsPainted));
 
     return report;
 }

chalk/plugins/viewplugins/performancetest/perftest.h

@@ -46,7 +46,7 @@ private:
     TQString fillTest(TQ_UINT32 testCount);
     TQString gradientTest(TQ_UINT32 testCount);
     TQString pixelTest(TQ_UINT32 testCount);
-    TQString shapeTest(TQ_UINT32 testCount);
+    TQString tqshapeTest(TQ_UINT32 testCount);
     TQString layerTest(TQ_UINT32 testCount);
     TQString scaleTest(TQ_UINT32 testCount);
     TQString rotateTest(TQ_UINT32 testCount);

chalk/plugins/viewplugins/performancetest/wdg_perftest.ui

@@ -233,7 +233,7 @@
                 </widget>
                 <widget class="TQLayoutWidget" row="18" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">

chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc

@@ -49,7 +49,7 @@ DlgRotateImage::DlgRotateImage( TQWidget *  parent,
     Q_CHECK_PTR(m_page);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     connect(this, TQT_SIGNAL(okClicked()),
         this, TQT_SLOT(okClicked()));

chalk/plugins/viewplugins/rotateimage/wdg_rotateimage.ui

@@ -32,7 +32,7 @@
                 </property>
                 <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -48,7 +48,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -65,7 +65,7 @@
                             <property name="scaledContents">
                                 <bool>false</bool>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignCenter</set>
                             </property>
                         </widget>
@@ -79,7 +79,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>41</width>
                                     <height>20</height>
@@ -96,7 +96,7 @@
                             <property name="scaledContents">
                                 <bool>false</bool>
                             </property>
-                            <property name="alignment">
+                            <property name="tqalignment">
                                 <set>AlignCenter</set>
                             </property>
                         </widget>
@@ -110,7 +110,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>31</width>
                                     <height>20</height>
@@ -177,7 +177,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout1</cstring>
+                        <cstring>tqlayout1</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -219,7 +219,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>91</height>

chalk/plugins/viewplugins/screenshot/ksnapshot.cpp

@@ -25,7 +25,7 @@
 #include <tqbitmap.h>
 #include <tqdragobject.h>
 #include <tqimage.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqvbox.h>
 
 #include <kaccel.h>
@@ -153,7 +153,7 @@ bool KSnapshot::save( const KURL& url )
 
         TQString caption = i18n("Unable to Save Image");
         TQString text = i18n("KSnapshot was unable to save the image to\n%1.")
-            .arg(url.prettyURL());
+            .tqarg(url.prettyURL());
         KMessageBox::error(this, text, caption);
     }
 
@@ -162,7 +162,7 @@ bool KSnapshot::save( const KURL& url )
 
 void KSnapshot::slotCopy()
 {
-    TQClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::tqclipboard();
     cb->setPixmap( snapshot );
 }
 
@@ -320,16 +320,16 @@ Window findRealWindow( Window w, int depth = 0 )
             return w;
     }
     Window root, parent;
-    Window* children;
-    unsigned int nchildren;
+    Window* tqchildren;
+    unsigned int ntqchildren;
     Window ret = None;
-    if( XQueryTree( qt_xdisplay(), w, &root, &parent, &children, &nchildren ) != 0 ) {
+    if( XQueryTree( qt_xdisplay(), w, &root, &parent, &tqchildren, &ntqchildren ) != 0 ) {
         for( unsigned int i = 0;
-             i < nchildren && ret == None;
+             i < ntqchildren && ret == None;
              ++i )
-            ret = findRealWindow( children[ i ], depth + 1 );
-        if( children != NULL )
-            XFree( children );
+            ret = findRealWindow( tqchildren[ i ], depth + 1 );
+        if( tqchildren != NULL )
+            XFree( tqchildren );
     }
     return ret;
 }
@@ -365,12 +365,12 @@ void KSnapshot::performGrab()
         h += 2 * border;
 
         Window parent;
-        Window* children;
-        unsigned int nchildren;
+        Window* tqchildren;
+        unsigned int ntqchildren;
         if( XQueryTree( qt_xdisplay(), child, &root, &parent,
-                &children, &nchildren ) != 0 ) {
-            if( children != NULL )
-                XFree( children );
+                &tqchildren, &ntqchildren ) != 0 ) {
+            if( tqchildren != NULL )
+                XFree( tqchildren );
             int newx, newy;
             Window dummy;
             if( XTranslateCoordinates( qt_xdisplay(), parent, qt_xrootwin(),
@@ -390,7 +390,7 @@ void KSnapshot::performGrab()
             int count, order;
             XRectangle* rects = XShapeGetRectangles( qt_xdisplay(), child,
                                  ShapeBounding, &count, &order);
-            //The ShapeBounding region is the outermost shape of the window;
+            //The ShapeBounding region is the outermost tqshape of the window;
             //ShapeBounding - ShapeClipping is defined to be the border.
             //Since the border area is part of the window, we use bounding
             // to limit our work region

chalk/plugins/viewplugins/screenshot/ksnapshot.h

@@ -44,7 +44,7 @@ public:
     KSnapshotThumb(TQWidget *parent, const char *name = 0)
         : TQLabel(parent, name)
         {
-            setAlignment(AlignHCenter | AlignVCenter);
+            tqsetAlignment(AlignHCenter | AlignVCenter);
         }
     virtual ~KSnapshotThumb() {}
 

chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui

@@ -23,7 +23,7 @@
             <property name="name">
                 <cstring>lblImage</cstring>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>200</width>
                     <height>130</height>
@@ -76,7 +76,7 @@ The image can be dragged to another application or document to copy the full scr
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>16</width>
                     <height>16</height>
@@ -167,7 +167,7 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>156</width>
                     <height>16</height>
@@ -225,7 +225,7 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>31</height>

chalk/plugins/viewplugins/screenshot/regiongrabber.cpp

@@ -21,7 +21,7 @@
 #include "regiongrabber.h"
 
 #include <tqpainter.h>
-#include <palette.h>
+#include <tqpalette.h>
 #include <tqstyle.h>
 #include <tqtimer.h>
 #include <tqtooltip.h>
@@ -41,8 +41,8 @@ SizeTip::SizeTip( TQWidget *parent, const char *name )
 
 void SizeTip::setTip( const TQRect &rect )
 {
-  TQString tip = TQString( "%1x%2" ).arg( rect.width() )
-      .arg( rect.height() );
+  TQString tip = TQString( "%1x%2" ).tqarg( rect.width() )
+      .tqarg( rect.height() );
 
   setText( tip );
   adjustSize();
@@ -52,7 +52,7 @@ void SizeTip::setTip( const TQRect &rect )
 
 void SizeTip::positionTip( const TQRect &rect )
 {
-  TQRect tipRect = geometry();
+  TQRect tipRect = tqgeometry();
   tipRect.moveTopLeft( TQPoint( 0, 0 ) );
 
   if ( rect.intersects( tipRect ) )
@@ -61,7 +61,7 @@ void SizeTip::positionTip( const TQRect &rect )
 
     tipRect.moveCenter( TQPoint( deskR.width()/2, deskR.height()/2 ) );
     if ( !rect.contains( tipRect, true ) && rect.intersects( tipRect ) )
-      tipRect.moveBottomRight( geometry().bottomRight() );
+      tipRect.moveBottomRight( tqgeometry().bottomRight() );
   }
 
   move( tipRect.topLeft() );
@@ -161,8 +161,8 @@ void RegionGrabber::drawRubber()
   p.setPen( TQPen( color0, 1 ) );
   p.setBrush( NoBrush );
 
-  tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, colorGroup(),
-      TQStyle::Style_Default, TQStyleOption( colorGroup().base() ) );
+  tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, grabRect, tqcolorGroup(),
+      TQStyle::Style_Default, TQStyleOption( tqcolorGroup().base() ) );
 
   p.end();
 }

chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.cpp

@@ -209,7 +209,7 @@ Kross::Api::Object::Ptr ChalkCoreFactory::newImage(Kross::Api::List::Ptr args)
     KisColorSpace * cs = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID(csname, ""), "");
     if(!cs)
     {
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").arg(csname ) ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").tqarg(csname ) ) );
         return 0;
     }
 
@@ -225,9 +225,9 @@ ChalkCoreModule::ChalkCoreModule(Kross::Api::Manager* manager)
     : Kross::Api::Module("chalkcore") , m_manager(manager), m_factory(0)
 {
 
-    TQMap<TQString, Object::Ptr> children = manager->getChildren();
-    kdDebug(41011) << " there are " << children.size() << endl;
-    for(TQMap<TQString, Object::Ptr>::const_iterator it = children.begin(); it != children.end(); it++)
+    TQMap<TQString, Object::Ptr> tqchildren = manager->getChildren();
+    kdDebug(41011) << " there are " << tqchildren.size() << endl;
+    for(TQMap<TQString, Object::Ptr>::const_iterator it = tqchildren.begin(); it != tqchildren.end(); it++)
     {
         kdDebug(41011) << it.key() << " " << it.data() << endl;
     }

chalk/plugins/viewplugins/scripting/chalkcore/chalkcoremodule.h

@@ -108,7 +108,7 @@ namespace Kross { namespace ChalkCore {
              */
             Kross::Api::Object::Ptr getBrush(Kross::Api::List::Ptr);
             /**
-             * This function return a Brush with a circular shape
+             * This function return a Brush with a circular tqshape
              * It takes at least two arguments :
              *  - width
              *  - height
@@ -127,7 +127,7 @@ namespace Kross { namespace ChalkCore {
              */
             Kross::Api::Object::Ptr newCircleBrush(Kross::Api::List::Ptr);
             /**
-             * This function return a Brush with a rectangular shape
+             * This function return a Brush with a rectangular tqshape
              * It takes at least two arguments :
              *  - width
              *  - height

chalk/plugins/viewplugins/scripting/chalkcore/krs_filter.cpp

@@ -53,7 +53,7 @@ Kross::Api::Object::Ptr Filter::process(Kross::Api::List::Ptr args)
     PaintLayer* src = (PaintLayer*)args->item(0).data();
     if(!m_filter->workWith( src->paintLayer()->paintDevice()->colorSpace()))
     {
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("process") ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("process") ) );
     }
     TQRect rect;
     if( args->count() >1)

chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp

@@ -80,7 +80,7 @@ Kross::Api::Object::Ptr Image::convertToColorspace(Kross::Api::List::Ptr args)
     KisColorSpace * dstCS = KisMetaRegistry::instance()->csRegistry()->getColorSpace(KisID(Kross::Api::Variant::toString(args->item(0)), ""), "");
     if(!dstCS)
     {
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").arg(Kross::Api::Variant::toString(args->item(0))) ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("Colorspace %0 is not available, please check your installation.").tqarg(Kross::Api::Variant::toString(args->item(0))) ) );
         return 0;
     }
     m_image->convertTo(dstCS);

chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h

@@ -246,7 +246,7 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem
                         pixel.push_back( *((float*) data) );
                         break;
                     default:
-                        kdDebug(41011) << i18n("An error has occurred in %1").arg("getPixel") << endl;
+                        kdDebug(41011) << i18n("An error has occurred in %1").tqarg("getPixel") << endl;
                         kdDebug(41011) << i18n("unsupported data format in scripts") << endl;
                         break;
                 }
@@ -274,7 +274,7 @@ class Iterator : public Kross::Api::Class<Iterator<_T_It> >, private IteratorMem
                         *((float*) data) = pixel[i].toDouble();
                         break;
                     default:
-                        kdDebug(41011) << i18n("An error has occurred in %1").arg("setPixel") << endl;
+                        kdDebug(41011) << i18n("An error has occurred in %1").tqarg("setPixel") << endl;
                         kdDebug(41011) << i18n("unsupported data format in scripts") << endl;
                         break;
                 }

chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp

@@ -130,7 +130,7 @@ Kross::Api::Object::Ptr PaintLayer::createHistogram(Kross::Api::List::Ptr args)
     {
         return new Histogram( paintLayer().data(), factory->generate() , type);
     } else {
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("createHistogram") + "\n" + i18n("The histogram %1 is not available").arg(histoname) ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("createHistogram") + "\n" + i18n("The histogram %1 is not available").tqarg(histoname) ) );
     }
     return 0;
 }
@@ -172,7 +172,7 @@ Kross::Api::Object::Ptr PaintLayer::convertToColorspace(Kross::Api::List::Ptr ar
     if(!dstCS)
     {
         // FIXME: inform user
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("convertToColorspace") + "\n" + i18n("Colorspace %1 is not available, please check your installation.").arg(Kross::Api::Variant::toString(args->item(0))) ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("convertToColorspace") + "\n" + i18n("Colorspace %1 is not available, please check your installation.").tqarg(Kross::Api::Variant::toString(args->item(0))) ) );
         return 0;
     }
     paintLayer()->paintDevice()->convertTo(dstCS);

chalk/plugins/viewplugins/scripting/chalkcore/krs_painter.cpp

@@ -110,7 +110,7 @@ Kross::Api::Object::Ptr Painter::convolve(Kross::Api::List::Ptr args)
     TQVariant firstlineVariant = *kernelH.begin();
     if(firstlineVariant.type() != TQVariant::List)
     {
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) );
     }
     
     TQValueList<TQVariant> firstline = firstlineVariant.toList();
@@ -126,12 +126,12 @@ Kross::Api::Object::Ptr Painter::convolve(Kross::Api::List::Ptr args)
         TQVariant lineVariant = *kernelH.begin();
         if(lineVariant.type() != TQVariant::List)
         {
-            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) );
         }
         TQValueList<TQVariant> line = firstlineVariant.toList();
         if(line.size() != kernel.width)
         {
-            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").arg("applyConvolution")) );
+            throw Kross::Api::Exception::Ptr( new Kross::Api::Exception(i18n("An error has occured in %1").tqarg("applyConvolution")) );
         }
         uint j = 0;
         for(TQValueList<TQVariant>::iterator itLine = line.begin(); itLine != line.end(); itLine++, j ++ )

chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp

@@ -52,7 +52,7 @@ Kross::Api::Object::Ptr Wavelet::getNCoeff(Kross::Api::List::Ptr args)
     TQ_UINT32 n = Kross::Api::Variant::toUInt(args->item(0));
     if( n > m_numCoeff)
     {
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("getNCoeff") + "\n" + i18n("Index out of bound") ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("getNCoeff") + "\n" + i18n("Index out of bound") ) );
     }
     return new Kross::Api::Variant(*(m_wavelet->coeffs + n ));
 }
@@ -63,7 +63,7 @@ Kross::Api::Object::Ptr Wavelet::setNCoeff(Kross::Api::List::Ptr args)
     double v = Kross::Api::Variant::toDouble(args->item(1));
     if( n > m_numCoeff)
     {
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("setNCoeff") + "\n" + i18n("Index out of bound") ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("setNCoeff") + "\n" + i18n("Index out of bound") ) );
     }
     *(m_wavelet->coeffs + n ) = v;
     return 0;
@@ -75,7 +75,7 @@ Kross::Api::Object::Ptr Wavelet::getXYCoeff(Kross::Api::List::Ptr args)
     TQ_UINT32 y = Kross::Api::Variant::toUInt(args->item(1));
     if( x > m_wavelet->size && y > m_wavelet->size)
     {
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("getXYCoeff") + "\n" + i18n("Index out of bound") ) );
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("getXYCoeff") + "\n" + i18n("Index out of bound") ) );
     }
     return new Kross::Api::Variant(*(m_wavelet->coeffs  + (x + y * m_wavelet->size ) * m_wavelet->depth ));
 }
@@ -87,7 +87,7 @@ Kross::Api::Object::Ptr Wavelet::setXYCoeff(Kross::Api::List::Ptr args)
     double v = Kross::Api::Variant::toDouble(args->item(2));
     if( x > m_wavelet->size && y > m_wavelet->size)
     {
-        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").arg("setXYCoeff") + "\n" + i18n("Index out of bound") ));
+        throw Kross::Api::Exception::Ptr( new Kross::Api::Exception( i18n("An error has occured in %1").tqarg("setXYCoeff") + "\n" + i18n("Index out of bound") ));
     }
     *(m_wavelet->coeffs + (x + y * m_wavelet->size ) * m_wavelet->depth ) = v;
     return 0;

chalk/plugins/viewplugins/scripting/samples/ruby/randompaint.rb

@@ -60,11 +60,11 @@ for i in 1..100
         painter.setBrush( Krosschalkcore::newCircleBrush(rand*20,rand*20,rand*10,rand*10) )
     end
     # paint a point
-    shape = rand * 7
+    tqshape = rand * 7
     painter.setStrokeStyle(1)
-    if( shape < 1 )
+    if( tqshape < 1 )
         painter.paintAt(rand * width , rand * height,1.1)
-    elsif(shape < 2 )
+    elsif(tqshape < 2 )
         xs = Array.new
         ys = Array.new
         for i in 0..6
@@ -72,14 +72,14 @@ for i in 1..100
             ys[i] = rand*height
         end
         painter.paintPolyline(xs,ys)
-    elsif(shape < 3)
+    elsif(tqshape < 3)
         painter.paintLine(rand * width, rand * height, 1.1, rand * width, rand * height,1.1)
-    elsif(shape < 4)
+    elsif(tqshape < 4)
         painter.paintBezierCurve(rand * width, rand * height, 1.1, rand * width, rand * height, rand * width , rand * height, rand * width, rand * height, 1.1)
-    elsif(shape < 5)
+    elsif(tqshape < 5)
         randomizeStyle(painter)
         painter.paintEllipse(rand * width, rand * height, rand * width, rand * height, 1.1)
-    elsif(shape < 6)
+    elsif(tqshape < 6)
         xs = Array.new
         ys = Array.new
         for i in 0..6
@@ -88,7 +88,7 @@ for i in 1..100
         end
         randomizeStyle(painter)
         painter.paintPolygon(xs, ys)
-    elsif(shape < 7)
+    elsif(tqshape < 7)
         randomizeStyle(painter)
         painter.paintRect(rand * width, rand * height, rand * width, rand * height, 1.1)
     end

chalk/plugins/viewplugins/scripting/samples/ruby/torture-painting.rb

@@ -91,11 +91,11 @@ class TorturePainting
                 painter.setBrush( Krosschalkcore::newCircleBrush(rand*20,rand*20,rand*10,rand*10) )
             end
             # paint a point
-            shape = rand * 7
+            tqshape = rand * 7
             painter.setStrokeStyle(1)
-            if( shape < 1 )
+            if( tqshape < 1 )
                 painter.paintAt(rand * @width , rand * @height,1.1)
-            elsif(shape < 2 )
+            elsif(tqshape < 2 )
                 xs = Array.new
                 ys = Array.new
                 for i in 0..6
@@ -103,14 +103,14 @@ class TorturePainting
                     ys[i] = rand*@height
                 end
                 painter.paintPolyline(xs,ys)
-            elsif(shape < 3)
+            elsif(tqshape < 3)
                 painter.paintLine(rand * @width, rand * @height, 1.1, rand * @width, rand * @height,1.1)
-            elsif(shape < 4)
+            elsif(tqshape < 4)
                 painter.paintBezierCurve(rand * @width, rand * @height, 1.1, rand * @width, rand * @height, rand * @width , rand * @height, rand * @width, rand * @height, 1.1)
-            elsif(shape < 5)
+            elsif(tqshape < 5)
                 randomizeStyle(painter)
                 painter.paintEllipse(rand * @width, rand * @height, rand * @width, rand * @height, 1.1)
-            elsif(shape < 6)
+            elsif(tqshape < 6)
                 xs = Array.new
                 ys = Array.new
                 for i in 0..6
@@ -119,7 +119,7 @@ class TorturePainting
                 end
                 randomizeStyle(painter)
                 painter.paintPolygon(xs, ys)
-            elsif(shape < 7)
+            elsif(tqshape < 7)
                 randomizeStyle(painter)
                 painter.paintRect(rand * @width, rand * @height, rand * @width, rand * @height, 1.1)
             end

chalk/plugins/viewplugins/separate_channels/dlg_separate.cc

@@ -43,7 +43,7 @@ DlgSeparate::DlgSeparate( const TQString & imageCS,
     m_page = new WdgSeparations(this, "separate_image");
     Q_CHECK_PTR(m_page);
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     m_page->lblColormodel->setText(layerCS);
     m_page->grpOutput->hide();

chalk/plugins/viewplugins/separate_channels/wdg_separations.ui

@@ -82,7 +82,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>

chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc

@@ -29,7 +29,7 @@ using namespace std;
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include <knuminput.h>
@@ -46,11 +46,11 @@ DlgShearImage::DlgShearImage( TQWidget *  parent,
     m_lock = false;
 
     m_page = new WdgShearImage(this, "shear_image");
-    m_page->layout()->setMargin(0);
+    m_page->tqlayout()->setMargin(0);
     Q_CHECK_PTR(m_page);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     connect(this, TQT_SIGNAL(okClicked()),
         this, TQT_SLOT(okClicked()));

chalk/plugins/viewplugins/shearimage/wdg_shearimage.ui

@@ -56,7 +56,7 @@
                     <property name="name">
                         <cstring>shearAngleY</cstring>
                     </property>
-                    <property name="maximumSize">
+                    <property name="tqmaximumSize">
                         <size>
                             <width>32767</width>
                             <height>100</height>

chalk/plugins/viewplugins/substrate/wdgsubstrate.ui

@@ -29,7 +29,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout3</cstring>
+                        <cstring>tqlayout3</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -92,7 +92,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout2</cstring>
+                        <cstring>tqlayout2</cstring>
                     </property>
                     <grid>
                         <property name="name">

chalk/plugins/viewplugins/variations/wdg_variations.ui

@@ -64,13 +64,13 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="minimumSize">
+                <property name="tqminimumSize">
                     <size>
                         <width>150</width>
                         <height>150</height>
                     </size>
                 </property>
-                <property name="maximumSize">
+                <property name="tqmaximumSize">
                     <size>
                         <width>150</width>
                         <height>150</height>
@@ -95,13 +95,13 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="minimumSize">
+                <property name="tqminimumSize">
                     <size>
                         <width>150</width>
                         <height>150</height>
                     </size>
                 </property>
-                <property name="maximumSize">
+                <property name="tqmaximumSize">
                     <size>
                         <width>150</width>
                         <height>150</height>
@@ -121,7 +121,7 @@
                 <property name="text">
                     <string>Current Pick</string>
                 </property>
-                <property name="alignment">
+                <property name="tqalignment">
                     <set>AlignCenter</set>
                 </property>
             </widget>
@@ -132,7 +132,7 @@
                 <property name="text">
                     <string>Original</string>
                 </property>
-                <property name="alignment">
+                <property name="tqalignment">
                     <set>AlignCenter</set>
                 </property>
             </widget>
@@ -228,7 +228,7 @@
     </widget>
     <widget class="TQLayoutWidget">
         <property name="name">
-            <cstring>layout5</cstring>
+            <cstring>tqlayout5</cstring>
         </property>
         <property name="geometry">
             <rect>
@@ -268,7 +268,7 @@
                 <property name="sizeType">
                     <enum>Expanding</enum>
                 </property>
-                <property name="sizeHint">
+                <property name="tqsizeHint">
                     <size>
                         <width>20</width>
                         <height>187</height>
@@ -287,7 +287,7 @@
                         <verstretch>0</verstretch>
                     </sizepolicy>
                 </property>
-                <property name="maximumSize">
+                <property name="tqmaximumSize">
                     <size>
                         <width>32767</width>
                         <height>556</height>
@@ -322,13 +322,13 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>150</width>
                                 <height>150</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>150</width>
                                 <height>150</height>
@@ -348,7 +348,7 @@
                         <property name="text">
                             <string>Lighter</string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -364,13 +364,13 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>150</width>
                                 <height>150</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>150</width>
                                 <height>150</height>
@@ -390,7 +390,7 @@
                         <property name="text">
                             <string>Current Pick</string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -406,13 +406,13 @@
                                 <verstretch>0</verstretch>
                             </sizepolicy>
                         </property>
-                        <property name="minimumSize">
+                        <property name="tqminimumSize">
                             <size>
                                 <width>150</width>
                                 <height>150</height>
                             </size>
                         </property>
-                        <property name="maximumSize">
+                        <property name="tqmaximumSize">
                             <size>
                                 <width>150</width>
                                 <height>150</height>
@@ -432,7 +432,7 @@
                         <property name="text">
                             <string>Darker</string>
                         </property>
-                        <property name="alignment">
+                        <property name="tqalignment">
                             <set>AlignCenter</set>
                         </property>
                     </widget>
@@ -460,13 +460,13 @@
                 <verstretch>0</verstretch>
             </sizepolicy>
         </property>
-        <property name="minimumSize">
+        <property name="tqminimumSize">
             <size>
                 <width>540</width>
                 <height>556</height>
             </size>
         </property>
-        <property name="maximumSize">
+        <property name="tqmaximumSize">
             <size>
                 <width>540</width>
                 <height>556</height>
@@ -497,13 +497,13 @@
                     <height>150</height>
                 </rect>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
@@ -531,7 +531,7 @@
             <property name="text">
                 <string>More Red</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -550,7 +550,7 @@
             <property name="text">
                 <string>More Cyan</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -574,13 +574,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
@@ -608,7 +608,7 @@
             <property name="text">
                 <string>More Green</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -632,13 +632,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
@@ -671,13 +671,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
@@ -710,13 +710,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
@@ -744,7 +744,7 @@
             <property name="text">
                 <string>Current Pick</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -763,7 +763,7 @@
             <property name="text">
                 <string>More Yellow</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -787,13 +787,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
@@ -829,13 +829,13 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
                 </size>
             </property>
-            <property name="maximumSize">
+            <property name="tqmaximumSize">
                 <size>
                     <width>150</width>
                     <height>150</height>
@@ -863,7 +863,7 @@
             <property name="text">
                 <string>More Magenta</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>
@@ -882,7 +882,7 @@
             <property name="text">
                 <string>More Blue</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignCenter</set>
             </property>
         </widget>

chalk/sdk/kis_canvas_controller.h

@@ -68,19 +68,19 @@ public:
     virtual void scrollTo(TQ_INT32 x, TQ_INT32 y) = 0;
     
     /**
-     * Tell all of the canvas to repaint itself.
+     * Tell all of the canvas to tqrepaint itself.
      */
     virtual void updateCanvas() = 0;
 
 
     /**
-     * Tell the canvas to repaint the rectangle defined by x, y, w and h.
+     * Tell the canvas to tqrepaint the rectangle defined by x, y, w and h.
      * The coordinates are image coordinates.
      */
     virtual void updateCanvas(TQ_INT32 x, TQ_INT32 y, TQ_INT32 w, TQ_INT32 h) = 0;
 
     /**
-     * Tell the canvas repaint the specified rectangle. The coordinates
+     * Tell the canvas tqrepaint the specified rectangle. The coordinates
      * are image coordinates, not view coordinates.
      */
     virtual void updateCanvas(const TQRect& rc) = 0;

chalk/ui/imageviewer.cc

@@ -35,7 +35,7 @@ ImageViewer::ImageViewer(TQWidget *widget, const char * name)
     , m_image(TQPixmap())
 {
     m_label = new TQLabel( viewport());
-    setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
+    tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding);
     setCursor(KisCursor::handCursor());
     addChild(m_label);
 }

chalk/ui/kcurve.cc

@@ -73,21 +73,21 @@ void KCurve::reset(void)
 {
     m_grab_point   = NULL;    
     m_guideVisible = false;
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KCurve::setCurveGuide(TQColor color)
 {
     m_guideVisible = true;
     m_colorGuide   = color;
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KCurve::setPixmap(TQPixmap pix)
 {
     if (m_pix) delete m_pix;
     m_pix = new TQPixmap(pix);
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KCurve::keyPressEvent(TQKeyEvent *e)
@@ -113,7 +113,7 @@ void KCurve::keyPressEvent(TQKeyEvent *e)
             m_points.remove(m_grab_point);
         }
         m_grab_point = closest_point;
-        repaint(false);
+        tqrepaint(false);
     }
     else
         TQWidget::keyPressEvent(e);
@@ -133,7 +133,7 @@ void KCurve::paintEvent(TQPaintEvent *)
     
     TQPixmap pm(size());
     TQPainter p1;
-    p1.begin(TQT_TQPAINTDEVICE(&pm), this);
+    p1.tqbegin(TQT_TQPAINTDEVICE(&pm), this);
     
     //  draw background
     if(m_pix)
@@ -281,7 +281,7 @@ void KCurve::mousePressEvent ( TQMouseEvent * e )
         }
         p = m_points.next();
     }
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KCurve::mouseReleaseEvent ( TQMouseEvent * e )
@@ -293,7 +293,7 @@ void KCurve::mouseReleaseEvent ( TQMouseEvent * e )
     
     setCursor( KCursor::arrowCursor() );    
     m_dragging = false;
-    repaint(false);
+    tqrepaint(false);
     emit modified();
 }
 
@@ -304,7 +304,7 @@ void KCurve::mouseMoveEvent ( TQMouseEvent * e )
     double x = e->pos().x() / (float)width();
     double y = 1.0 - e->pos().y() / (float)height();
     
-    if (m_dragging == false)   // If no point is selected set the the cursor shape if on top
+    if (m_dragging == false)   // If no point is selected set the the cursor tqshape if on top
     {
         double distance = 1000;
         double ydistance = 1000;
@@ -349,7 +349,7 @@ void KCurve::mouseMoveEvent ( TQMouseEvent * e )
         emit modified();
     }
         
-    repaint(false);
+    tqrepaint(false);
 }
 
 double KCurve::getCurveValue(double x)

chalk/ui/kis_autogradient.cc

@@ -113,7 +113,7 @@ void KisAutogradient::slotChangedRightColor( const TQColor& color)
     KisGradientSegment* segment = gradientSlider->selectedSegment();
     if(segment)
         segment->setEndColor( Color( color, segment->endColor().alpha() ) );
-    gradientSlider->repaint();
+    gradientSlider->tqrepaint();
 
     paramChanged();
 }
@@ -123,7 +123,7 @@ void KisAutogradient::slotChangedLeftOpacity( int value )
     KisGradientSegment* segment = gradientSlider->selectedSegment();
     if(segment)
         segment->setStartColor( Color( segment->startColor().color(), (double)value / 100 ) );
-    gradientSlider->repaint(false);
+    gradientSlider->tqrepaint(false);
 
     paramChanged();
 }
@@ -133,7 +133,7 @@ void KisAutogradient::slotChangedRightOpacity( int value )
     KisGradientSegment* segment = gradientSlider->selectedSegment();
     if(segment)
         segment->setEndColor( Color( segment->endColor().color(), (double)value / 100 ) );
-    gradientSlider->repaint(false);
+    gradientSlider->tqrepaint(false);
 
     paramChanged();
 }

chalk/ui/kis_birdeye_box.cc

@@ -17,7 +17,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include "layout.h"
+#include "tqlayout.h"
 #include "tqlabel.h"
 #include "tqpixmap.h"
 #include "tqpainter.h"
@@ -203,7 +203,7 @@ KisBirdEyeBox::KisBirdEyeBox(KisView * view, TQWidget* parent, const char* name)
     hl->addWidget(m_exposureLabel);
 
     m_exposureDoubleWidget = new KisDoubleWidget(-10, 10, this);
-    m_exposureDoubleWidget->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
+    m_exposureDoubleWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed);
     hl->addWidget(m_exposureDoubleWidget);
     TQToolTip::add(m_exposureDoubleWidget, i18n("Select the exposure (stops) for HDR images"));
     l->addItem(new TQSpacerItem(0, 1, TQSizePolicy::Minimum, TQSizePolicy::MinimumExpanding));

chalk/ui/kis_brush_chooser.cc

@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 #include <klocale.h>
 #include <koIconChooser.h>
@@ -41,7 +41,7 @@ KisBrushChooser::KisBrushChooser(TQWidget *parent, const char *name)
 
     m_lbName = new TQLabel(this);
 
-    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout");
+    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout");
 
     mainLayout->addWidget(m_lbName);
     mainLayout->addWidget(chooserWidget(), 10);
@@ -89,7 +89,7 @@ void KisBrushChooser::update(KoIconItem *item)
     if (kisItem) {
         KisBrush *brush = static_cast<KisBrush *>(kisItem->resource());
 
-        TQString text = TQString("%1 (%2 x %3)").arg(brush->name()).arg(brush->width()).arg(brush->height());
+        TQString text = TQString("%1 (%2 x %3)").tqarg(brush->name()).tqarg(brush->width()).tqarg(brush->height());
 
         m_lbName->setText(text);
         m_slSpacing->setValue(brush->spacing());

chalk/ui/kis_canvas.cc

@@ -1235,34 +1235,34 @@ void KisCanvas::update(int x, int y, int width, int height)
     dynamic_cast<TQWidget *>(m_canvasWidget)->update(x, y, width, height);
 }
 
-void KisCanvas::repaint()
+void KisCanvas::tqrepaint()
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint();
+    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint();
 }
 
-void KisCanvas::repaint(bool erase)
+void KisCanvas::tqrepaint(bool erase)
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(erase);
+    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(erase);
 }
 
-void KisCanvas::repaint(int x, int y, int width, int height, bool erase)
+void KisCanvas::tqrepaint(int x, int y, int width, int height, bool erase)
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(x, y, width, height, erase);
+    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(x, y, width, height, erase);
 }
 
-void KisCanvas::repaint(const TQRect& r, bool erase)
+void KisCanvas::tqrepaint(const TQRect& r, bool erase)
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(r, erase);
+    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(r, erase);
 }
 
-void KisCanvas::repaint(const TQRegion& r, bool erase)
+void KisCanvas::tqrepaint(const TQRegion& r, bool erase)
 {
     Q_ASSERT(m_canvasWidget);
-    dynamic_cast<TQWidget *>(m_canvasWidget)->repaint(r, erase);
+    dynamic_cast<TQWidget *>(m_canvasWidget)->tqrepaint(r, erase);
 }
 
 bool KisCanvas::isUpdatesEnabled() const

chalk/ui/kis_canvas.h

@@ -313,11 +313,11 @@ public:
     void update();
     void update(const TQRect& r);
     void update(int x, int y, int width, int height);
-    void repaint();
-    void repaint(bool erase);
-    void repaint(int x, int y, int width, int height, bool erase = true);
-    void repaint(const TQRect& r, bool erase = true);
-    void repaint(const TQRegion& r, bool erase = true);
+    void tqrepaint();
+    void tqrepaint(bool erase);
+    void tqrepaint(int x, int y, int width, int height, bool erase = true);
+    void tqrepaint(const TQRect& r, bool erase = true);
+    void tqrepaint(const TQRegion& r, bool erase = true);
 
     void updateGeometry();
 

chalk/ui/kis_canvas_painter.cc

@@ -184,7 +184,7 @@ void KisCanvasWidgetPainter::setWorldXForm(bool /*enable*/)
 {
 }
 
-const TQWMatrix& KisCanvasWidgetPainter::worldMatrix() const
+const TQWMatrix& KisCanvasWidgetPainter::tqworldMatrix() const
 {
     return m_defaultWorldMatrix;
 }
@@ -501,11 +501,11 @@ void KisCanvasWidgetPainter::drawText(const TQRect& /*r*/, int /*flags*/, const
 {
 }
 
-void KisCanvasWidgetPainter::drawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
+void KisCanvasWidgetPainter::tqdrawTextItem(int /*x*/, int /*y*/, const TQTextItem& /*ti*/, int /*textflags*/)
 {
 }
 
-void KisCanvasWidgetPainter::drawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
+void KisCanvasWidgetPainter::tqdrawTextItem(const TQPoint& /*p*/, const TQTextItem& /*ti*/, int /*textflags*/)
 {
 }
 
@@ -833,10 +833,10 @@ void KisCanvasPainter::setWorldXForm(bool enable)
     }
 }
 
-const TQWMatrix& KisCanvasPainter::worldMatrix() const
+const TQWMatrix& KisCanvasPainter::tqworldMatrix() const
 {
     if (m_canvasWidgetPainter != 0) {
-        return m_canvasWidgetPainter->worldMatrix();
+        return m_canvasWidgetPainter->tqworldMatrix();
     }
     return m_defaultWorldMatrix;
 }
@@ -1378,17 +1378,17 @@ void KisCanvasPainter::drawText(const TQRect& r, int flags, const TQString& text
     }
 }
 
-void KisCanvasPainter::drawTextItem(int x, int y, const TQTextItem& ti, int textflags)
+void KisCanvasPainter::tqdrawTextItem(int x, int y, const TQTextItem& ti, int textflags)
 {
     if (m_canvasWidgetPainter != 0) {
-        m_canvasWidgetPainter->drawTextItem(x, y, ti, textflags);
+        m_canvasWidgetPainter->tqdrawTextItem(x, y, ti, textflags);
     }
 }
 
-void KisCanvasPainter::drawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags)
+void KisCanvasPainter::tqdrawTextItem(const TQPoint& p, const TQTextItem& ti, int textflags)
 {
     if (m_canvasWidgetPainter != 0) {
-        m_canvasWidgetPainter->drawTextItem(p, ti, textflags);
+        m_canvasWidgetPainter->tqdrawTextItem(p, ti, textflags);
     }
 }
 

chalk/ui/kis_canvas_painter.h

@@ -78,7 +78,7 @@ public:
     virtual void setViewport(int x, int y, int w, int h);
 
     virtual void setWorldXForm(bool);
-    virtual const TQWMatrix&worldMatrix() const;
+    virtual const TQWMatrix&tqworldMatrix() const;
     virtual void setWorldMatrix(const TQWMatrix&, bool combine=FALSE);
 
     virtual void saveWorldMatrix();
@@ -168,8 +168,8 @@ public:
     virtual void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
     virtual void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
 
-    virtual void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
-    virtual void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
+    virtual void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
+    virtual void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
 
     virtual TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
     virtual TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
@@ -241,7 +241,7 @@ public:
     void setViewport(int x, int y, int w, int h);
 
     void setWorldXForm(bool);
-    const TQWMatrix&worldMatrix() const;
+    const TQWMatrix&tqworldMatrix() const;
     void setWorldMatrix(const TQWMatrix&, bool combine=FALSE);
 
     void saveWorldMatrix();
@@ -331,8 +331,8 @@ public:
     void drawText(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
     void drawText(const TQRect&, int flags, const TQString&, int len = -1, TQRect *br=0, TQTextParag **intern=0);
 
-    void drawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
-    void drawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
+    void tqdrawTextItem(int x, int y, const TQTextItem&ti, int textflags = 0);
+    void tqdrawTextItem(const TQPoint& p, const TQTextItem&ti, int textflags = 0);
 
     TQRect boundingRect(int x, int y, int w, int h, int flags, const TQString&, int len = -1, TQTextParag **intern=0);
     TQRect boundingRect(const TQRect&, int flags, const TQString&, int len = -1, TQTextParag **intern=0);

chalk/ui/kis_clipboard.cc

@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqobject.h>
 #include <tqimage.h>
 #include <tqmessagebox.h>
@@ -52,7 +52,7 @@ KisClipboard::KisClipboard()
     clipboardDataChanged();
 
     // Make sure we are notified when clipboard changes
-    connect( TQApplication::clipboard(), TQT_SIGNAL( dataChanged() ),
+    connect( TQApplication::tqclipboard(), TQT_SIGNAL( dataChanged() ),
          this, TQT_SLOT( clipboardDataChanged() ) );
 }
 
@@ -132,20 +132,20 @@ void KisClipboard::setClip(KisPaintDeviceSP selection)
     multiDrag->addDragObject( storeDrag );
 
 
-    TQClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::tqclipboard();
     cb->setData(multiDrag);
     m_pushedClipboard = true;
 }
 
 KisPaintDeviceSP KisClipboard::clip()
 {
-    TQClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::tqclipboard();
     TQCString mimeType("application/x-chalk-selection");
     TQMimeSource *cbData = cb->data();
 
     if(cbData && cbData->provides(mimeType))
     {
-        TQBuffer buffer(cbData->encodedData(mimeType));
+        TQBuffer buffer(cbData->tqencodedData(mimeType));
         KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read, mimeType );
         KisProfile *profile=0;
 
@@ -211,7 +211,7 @@ void KisClipboard::clipboardDataChanged()
 {
     if (!m_pushedClipboard) {
         m_hasClip = false;
-        TQClipboard *cb = TQApplication::clipboard();
+        TQClipboard *cb = TQApplication::tqclipboard();
         TQImage qimg = cb->image();
         TQMimeSource *cbData = cb->data();
         TQCString mimeType("application/x-chalk-selection");
@@ -235,7 +235,7 @@ bool KisClipboard::hasClip()
 TQSize KisClipboard::clipSize()
 {
 
-    TQClipboard *cb = TQApplication::clipboard();
+    TQClipboard *cb = TQApplication::tqclipboard();
     TQCString mimeType("application/x-chalk-selection");
     TQMimeSource *cbData = cb->data();
 
@@ -243,7 +243,7 @@ TQSize KisClipboard::clipSize()
     
     if(cbData && cbData->provides(mimeType)) {
         
-        TQBuffer buffer(cbData->encodedData(mimeType));
+        TQBuffer buffer(cbData->tqencodedData(mimeType));
         KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read, mimeType );
         KisProfile *profile=0;
 

chalk/ui/kis_color_cup.cc

@@ -21,12 +21,12 @@
 
 #include <tqpushbutton.h>
 #include <tqapplication.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqcolor.h>
 #include <tqdrawutil.h>
 #include <tqhbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqspinbox.h>
 #include <tqstyle.h>
@@ -81,7 +81,7 @@ void KisColorCup::slotClicked()
     emit changed(m_color);
 }
 
-TQSize KisColorCup::sizeHint() const
+TQSize KisColorCup::tqsizeHint() const
 {
     return tqstyle().tqsizeFromContents(TQStyle::CT_PushButton, this, TQSize(24, 24)).
             expandedTo(TQApplication::globalStrut());
@@ -93,24 +93,24 @@ void KisColorCup::drawButtonLabel( TQPainter *painter )
     TQRect r = tqstyle().subRect( TQStyle::SR_PushButtonContents, this );
     r.rect(&x, &y, &w, &h);
 
-    int margin = 2; //tqstyle().pixelMetric( TQStyle::PM_ButtonMargin, this );
+    int margin = 2; //tqstyle().tqpixelMetric( TQStyle::PM_ButtonMargin, this );
     x += margin;
     y += margin;
     w -= 2*margin;
     h -= 2*margin;
 
     if (isOn() || isDown()) {
-        x += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
-        y += tqstyle().pixelMetric( TQStyle::PM_ButtonShiftVertical, this );
+        x += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftHorizontal, this );
+        y += tqstyle().tqpixelMetric( TQStyle::PM_ButtonShiftVertical, this );
     }
 
-    qDrawShadePanel( painter, x, y, w, h, colorGroup(), true, 1, NULL);
+    qDrawShadePanel( painter, x, y, w, h, tqcolorGroup(), true, 1, NULL);
     if ( m_color.isValid() )
         painter->fillRect( x+1, y+1, w-2, h-2, m_color );
 
     if ( hasFocus() ) {
         TQRect focusRect = tqstyle().subRect( TQStyle::SR_PushButtonFocusRect, this );
-        tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, colorGroup() );
+        tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, painter, focusRect, tqcolorGroup() );
     }
 
 }

chalk/ui/kis_color_cup.h

@@ -72,7 +72,7 @@ signals:
 
 public:
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
 public slots:
 

chalk/ui/kis_controlframe.cc

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 
 #include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtabwidget.h>
 #include <tqframe.h>
 #include <tqwidget.h>
@@ -218,7 +218,7 @@ void KisControlFrame::createBrushesChooser(KisView * view)
 
     m_brushChooserPopup = new KisPopupFrame(m_brushWidget, "brush_chooser_popup");
 
-    TQHBoxLayout * l = new TQHBoxLayout(m_brushChooserPopup, 2, 2, "brushpopuplayout");
+    TQHBoxLayout * l = new TQHBoxLayout(m_brushChooserPopup, 2, 2, "brushpopuptqlayout");
 
     TQTabWidget * m_brushesTab = new TQTabWidget(m_brushChooserPopup, "brushestab");
     m_brushesTab->setTabShape(TQTabWidget::Triangular);
@@ -270,7 +270,7 @@ void KisControlFrame::createPatternsChooser(KisView * view)
 {
     m_patternChooserPopup = new KisPopupFrame(m_patternWidget, "pattern_chooser_popup");
 
-    TQHBoxLayout * l2 = new TQHBoxLayout(m_patternChooserPopup, 2, 2, "patternpopuplayout");
+    TQHBoxLayout * l2 = new TQHBoxLayout(m_patternChooserPopup, 2, 2, "patternpopuptqlayout");
 
     TQTabWidget * m_patternsTab = new TQTabWidget(m_patternChooserPopup, "patternstab");
     m_patternsTab->setTabShape(TQTabWidget::Triangular);
@@ -311,7 +311,7 @@ void KisControlFrame::createGradientsChooser(KisView * view)
 {
     m_gradientChooserPopup = new KisPopupFrame(m_gradientWidget, "gradient_chooser_popup");
 
-    TQHBoxLayout * l2 = new TQHBoxLayout(m_gradientChooserPopup, 2, 2, "gradientpopuplayout");
+    TQHBoxLayout * l2 = new TQHBoxLayout(m_gradientChooserPopup, 2, 2, "gradientpopuptqlayout");
 
     TQTabWidget * m_gradientTab = new TQTabWidget(m_gradientChooserPopup, "gradientstab");
     m_gradientTab->setTabShape(TQTabWidget::Triangular);

chalk/ui/kis_custom_image_widget.cc

@@ -35,7 +35,7 @@
 #include <kdebug.h>
 #include <tqpushbutton.h>
 #include <tqslider.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <KoUnitWidgets.h>
 #include <tqlabel.h>
 

chalk/ui/kis_custom_palette.cc

@@ -136,7 +136,7 @@ void KisCustomPalette::slotAddPredefined() {
 
     if (!m_palette->save()) {
         KMessageBox::error(0, i18n("Cannot write to palette file %1. Maybe it is read-only.")
-                                   .arg(m_palette->filename()), i18n("Palette"));
+                                   .tqarg(m_palette->filename()), i18n("Palette"));
         return;
     }
 

chalk/ui/kis_dlg_adj_layer_props.cc

@@ -20,7 +20,7 @@
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klineedit.h>
 #include <klocale.h>
@@ -85,16 +85,16 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer,
     }
     setCaption(caption);
     TQWidget * page = new TQWidget(this, "page widget");
-    TQHBoxLayout * layout = new TQHBoxLayout(page, 0, 6);
+    TQHBoxLayout * tqlayout = new TQHBoxLayout(page, 0, 6);
     setMainWidget(page);
 
     m_preview = new KisPreviewWidget(page, "dlgadjustment.preview");
     m_preview->slotSetDevice( dev );
 
     connect( m_preview, TQT_SIGNAL(updated()), this, TQT_SLOT(refreshPreview()));
-    layout->addWidget(m_preview, 1, 1);
+    tqlayout->addWidget(m_preview, 1, 1);
 
-    TQVBoxLayout *v1 = new TQVBoxLayout( layout );
+    TQVBoxLayout *v1 = new TQVBoxLayout( tqlayout );
     TQHBoxLayout *hl = new TQHBoxLayout( v1 );
 
     TQLabel * lblName = new TQLabel(i18n("Layer name:"), page, "lblName");
@@ -102,7 +102,7 @@ KisDlgAdjLayerProps::KisDlgAdjLayerProps(KisAdjustmentLayerSP layer,
 
     m_layerName = new KLineEdit(page, "m_layerName");
     m_layerName->setText(layerName);
-    m_layerName->setSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
+    m_layerName->tqsetSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed);
     hl->addWidget(m_layerName, 0, 1);
     connect( m_layerName, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotNameChanged( const TQString & ) ) );
 

chalk/ui/kis_dlg_adjustment_layer.cc

@@ -20,7 +20,7 @@
 
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klineedit.h>
 #include <klocale.h>
@@ -102,10 +102,10 @@ KisDlgAdjustmentLayer::KisDlgAdjustmentLayer(KisImage * img,
 
     m_labelNoConfigWidget = new TQLabel(i18n("No configuration options are available for this filter"),
                                         m_configWidgetHolder);
-    m_configWidgetHolder->layout()->add(m_labelNoConfigWidget);
+    m_configWidgetHolder->tqlayout()->add(m_labelNoConfigWidget);
     m_labelNoConfigWidget->hide();
 
-    resize( TQSize(600, 480).expandedTo(minimumSizeHint()) );
+    resize( TQSize(600, 480).expandedTo(tqminimumSizeHint()) );
 
     m_currentConfigWidget = 0;
 
@@ -156,7 +156,7 @@ void KisDlgAdjustmentLayer::selectionHasChanged ( TQIconViewItem * item )
 
     if ( m_currentConfigWidget != 0 )
     {
-        m_configWidgetHolder->layout()->remove(m_currentConfigWidget);
+        m_configWidgetHolder->tqlayout()->remove(m_currentConfigWidget);
 
         delete m_currentConfigWidget;
         m_currentConfigWidget = 0;
@@ -173,7 +173,7 @@ void KisDlgAdjustmentLayer::selectionHasChanged ( TQIconViewItem * item )
 
     if (m_currentConfigWidget != 0)
     {
-        m_configWidgetHolder->layout()->add(m_currentConfigWidget);
+        m_configWidgetHolder->tqlayout()->add(m_currentConfigWidget);
         m_currentConfigWidget->show();
         connect(m_currentConfigWidget, TQT_SIGNAL(sigPleaseUpdatePreview()), this, TQT_SLOT(slotConfigChanged()));
     } else {

chalk/ui/kis_dlg_apply_profile.cc

@@ -42,7 +42,7 @@ KisDlgApplyProfile::KisDlgApplyProfile(TQWidget *parent, const char *name)
     m_page = new WdgApplyProfile(this);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     // XXX: This is BAD! (bsar)
     fillCmbProfiles(KisID("RGBA", ""));

chalk/ui/kis_dlg_image_properties.cc

@@ -19,11 +19,11 @@
 #include <tqpushbutton.h>
 #include <tqradiobutton.h>
 #include <tqgroupbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
 #include <tqslider.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <tqcheckbox.h>
 
 #include <klocale.h>
@@ -58,7 +58,7 @@ KisDlgImageProperties::KisDlgImageProperties(KisImageSP image, TQWidget *parent,
     m_image = image;
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     m_page->txtName->setText(image->name());
     m_page->m_createButton->hide();

chalk/ui/kis_dlg_layer_properties.cc

@@ -17,7 +17,7 @@
  */
 #include <limits.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <tqslider.h>
 #include <tqstring.h>
@@ -43,7 +43,7 @@ KisDlgLayerProperties::KisDlgLayerProperties(const TQString& deviceName,
     : super(parent, name, f, name, Ok | Cancel)
 {
     m_page = new WdgLayerProperties(this);
-    m_page->layout()->setMargin(0);
+    m_page->tqlayout()->setMargin(0);
 
     opacity = int((opacity * 100.0) / 255 + 0.5);
 

chalk/ui/kis_dlg_new_layer.cc

@@ -20,7 +20,7 @@
  */
 #include <tqgroupbox.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klineedit.h>
 #include <klocale.h>
@@ -48,7 +48,7 @@ NewLayerDialog::NewLayerDialog(const KisID colorSpaceID,
     : super(parent, name, true, "", Ok | Cancel)
 {
     m_page = new WdgLayerProperties(this);
-    m_page->layout()->setMargin(0);
+    m_page->tqlayout()->setMargin(0);
 
     setCaption(i18n("New Layer"));
 

chalk/ui/kis_dlg_preferences.cc

@@ -27,7 +27,7 @@
 #include <tqcheckbox.h>
 #include <tqcursor.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpixmap.h>
 #include <tqpushbutton.h>
@@ -77,7 +77,7 @@ GeneralTab::GeneralTab( TQWidget *_parent, const char *_name )
 
     KisConfig cfg;
 
-    m_cmbCursorShape->setCurrentItem(cfg.cursorStyle());
+    m_cmbtqCursorShape->setCurrentItem(cfg.cursorStyle());
     grpDockability->setButton(cfg.dockability());
     numDockerFontSize->setValue((int)cfg.dockerFontSize());
 }
@@ -86,14 +86,14 @@ void GeneralTab::setDefault()
 {
     KisConfig cfg;
 
-    m_cmbCursorShape->setCurrentItem( cfg.getDefaultCursorStyle());
+    m_cmbtqCursorShape->setCurrentItem( cfg.getDefaultCursorStyle());
     grpDockability->setButton(cfg.getDefaultDockability());
     numDockerFontSize->setValue((int)(cfg.getDefaultDockerFontSize()));
 }
 
 enumCursorStyle GeneralTab::cursorStyle()
 {
-    return (enumCursorStyle)m_cmbCursorShape->currentItem();
+    return (enumCursorStyle)m_cmbtqCursorShape->currentItem();
 }
 
 enumKoDockability GeneralTab::dockability()
@@ -383,12 +383,12 @@ TabletSettingsTab::TabletDeviceSettingsDialog::TabletDeviceSettingsDialog(const
                                                                           TQWidget *parent, const char *name)
     : super(parent, name, true, "", Ok | Cancel)
 {
-    setCaption(i18n("Configure %1").arg(deviceName));
+    setCaption(i18n("Configure %1").tqarg(deviceName));
 
     m_page = new WdgTabletDeviceSettings(this);
 
     setMainWidget(m_page);
-    resize(m_page->sizeHint());
+    resize(m_page->tqsizeHint());
 
     for (TQ_INT32 axis = 0; axis < settings.numAxes(); axis++) {
         TQString axisString;

chalk/ui/kis_doc.cc

@@ -347,7 +347,7 @@ bool KisDoc::loadXML(TQIODevice *, const TQDomDocument& doc)
 }
 
 bool KisDoc::loadChildren(KoStore* store) {
-    TQPtrListIterator<KoDocumentChild> it(children());
+    TQPtrListIterator<KoDocumentChild> it(tqchildren());
     for( ; it.current(); ++it ) {
         if (!it.current()->loadDocument(store)) {
             return false;

chalk/ui/kis_double_widget.cc

@@ -20,7 +20,7 @@
  */
 
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqslider.h>
 
 #include <knuminput.h>
@@ -53,7 +53,7 @@ void KisDoubleWidget::init(double min, double max)
     connect(m_slider, TQT_SIGNAL(sliderPressed()), TQT_SIGNAL(sliderPressed()));
     connect(m_slider, TQT_SIGNAL(sliderReleased()), TQT_SIGNAL(sliderReleased()));
 
-    m_layout = new TQHBoxLayout(this, 0, -1, "hbox layout");
+    m_layout = new TQHBoxLayout(this, 0, -1, "hbox tqlayout");
 
     m_layout->addWidget(m_slider);
     m_layout->addSpacing(5);

chalk/ui/kis_filter_manager.cc

@@ -18,7 +18,7 @@
  */
 
 #include "tqsignalmapper.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqframe.h>
 #include <tqcursor.h>
 #include <tqapplication.h>
@@ -168,7 +168,7 @@ void KisFilterManager::setup(KActionCollection * ac)
 
         // Create action
         KAction * a = new KAction(f->menuEntry(), 0, m_filterMapper, TQT_SLOT(map()), ac,
-                                  TQString("chalk_filter_%1").arg((*it) . id()).ascii());
+                                  TQString("chalk_filter_%1").tqarg((*it) . id()).ascii());
 
         // Add action to the right submenu
         KActionMenu * m = m_filterActionMenus.find( f->menuCategory() );
@@ -320,8 +320,8 @@ void KisFilterManager::slotApplyFilter(int i)
         if (m_lastFilter->colorSpaceIndependence() == TO_LAB16) {
             if (KMessageBox::warningContinueCancel(m_view,
                                                i18n("The %1 filter will convert your %2 data to 16-bit L*a*b* and vice versa. ")
-                                                       .arg(m_lastFilter->id().name())
-                                                       .arg(dev->colorSpace()->id().name()),
+                                                       .tqarg(m_lastFilter->id().name())
+                                                       .tqarg(dev->colorSpace()->id().name()),
                                                i18n("Filter Will Convert Your Layer Data"),
                                                KGuiItem(i18n("Continue")),
                                                "lab16degradation") != KMessageBox::Continue) return;
@@ -330,8 +330,8 @@ void KisFilterManager::slotApplyFilter(int i)
         else if (m_lastFilter->colorSpaceIndependence() == TO_RGBA8) {
             if (KMessageBox::warningContinueCancel(m_view,
                                                i18n("The %1 filter will convert your %2 data to 8-bit RGBA and vice versa. ")
-                                                       .arg(m_lastFilter->id().name())
-                                                       .arg(dev->colorSpace()->id().name()),
+                                                       .tqarg(m_lastFilter->id().name())
+                                                       .tqarg(dev->colorSpace()->id().name()),
                                                i18n("Filter Will Convert Your Layer Data"),
                                                KGuiItem(i18n("Continue")),
                                                "rgba8degradation") != KMessageBox::Continue) return;
@@ -359,7 +359,7 @@ void KisFilterManager::slotApplyFilter(int i)
 
         widgetLayout->addWidget(m_lastWidget, 0 , 0);
 
-        m_lastDialog->container()->setMinimumSize(m_lastWidget->minimumSize());
+        m_lastDialog->container()->setMinimumSize(m_lastWidget->tqminimumSize());
 
         refreshPreview();
 

chalk/ui/kis_filters_listview.cc

@@ -154,7 +154,7 @@ void KisFiltersListView::init()
     setCaption(i18n("Filters List"));
     setItemsMovable(false);
     setSelectionMode(TQIconView::Single);
-    setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding ));
+    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding ));
     setMinimumWidth(160);
 
 }

chalk/ui/kis_gradient_chooser.cc

@@ -17,7 +17,7 @@
  */
 #include <klocale.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 
 #include <kdialogbase.h>
@@ -49,7 +49,7 @@ KisGradientChooser::KisGradientChooser(KisView * view, TQWidget *parent, const c
     KisCustomGradientDialog * autogradient = new KisCustomGradientDialog(view, this, "autogradient");
     connect(m_customGradient, TQT_SIGNAL(clicked()), autogradient, TQT_SLOT(show()));
     
-    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main layout");
+    TQVBoxLayout *mainLayout = new TQVBoxLayout(this, 2, -1, "main tqlayout");
     
     mainLayout->addWidget(m_lbName);
     mainLayout->addWidget(chooserWidget(), 10);

chalk/ui/kis_gradient_slider_widget.cc

@@ -57,7 +57,7 @@ void KisGradientSliderWidget::paintEvent ( TQPaintEvent* pe )
 {
     TQWidget::paintEvent( pe );
     TQPixmap pixmap( width(), height() );
-    pixmap.fill( colorGroup().background() );
+    pixmap.fill( tqcolorGroup().background() );
     TQPainter painter( &pixmap );
     painter.setPen( TQt::black );
     painter.drawRect( MARGIN, MARGIN, width() - 2 * MARGIN, height()- 2 * MARGIN - HANDLE_SIZE );
@@ -77,7 +77,7 @@ void KisGradientSliderWidget::paintEvent ( TQPaintEvent* pe )
                     height()- HANDLE_SIZE - MARGIN,
                     tqRound( ( m_selectedSegment->endOffset() - m_selectedSegment->startOffset() )*(double)(width()-12) ),
                     HANDLE_SIZE );
-            painter.fillRect( selection, TQBrush( colorGroup().highlight() ) );
+            painter.fillRect( selection, TQBrush( tqcolorGroup().highlight() ) );
         }
 
         TQPointArray triangle(3);
@@ -155,7 +155,7 @@ void KisGradientSliderWidget::mousePressEvent( TQMouseEvent * e )
             emit sigSelectedSegment( m_selectedSegment );
         }
     }
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KisGradientSliderWidget::mouseReleaseEvent ( TQMouseEvent * e )
@@ -186,7 +186,7 @@ void KisGradientSliderWidget::mouseMoveEvent( TQMouseEvent * e )
     if ( m_drag != NO_DRAG)
         emit sigChangedSegment( m_currentSegment );
 
-    repaint(false);
+    tqrepaint(false);
 }
 
 void KisGradientSliderWidget::contextMenuEvent( TQContextMenuEvent * e )
@@ -213,7 +213,7 @@ void KisGradientSliderWidget::slotMenuAction( int id )
             break;
     }
     emit sigSelectedSegment( m_selectedSegment );
-    repaint(false);
+    tqrepaint(false);
 }
 
 #include "kis_gradient_slider_widget.moc"