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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

45 files changed, 91 insertions, 91 deletions

diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc
index 5bce37b2..2194831a 100644
--- a/filters/chalk/gmagick/kis_image_magick_converter.cc
+++ b/filters/chalk/gmagick/kis_image_magick_converter.cc
@@ -202,7 +202,7 @@ namespace {
             rawdata.resize(len);
             memcpy(rawdata.data(), imgAttr -> value, len);
             
-            KisAnnotation* annotation = new KisAnnotation( TQString("chalk_attribute:%1").arg(TQString(imgAttr -> key)), "", rawdata );
+            KisAnnotation* annotation = new KisAnnotation( TQString("chalk_attribute:%1").tqarg(TQString(imgAttr -> key)), "", rawdata );
             Q_CHECK_PTR(annotation);
 
             image -> addAnnotation(annotation);
@@ -258,7 +258,7 @@ namespace {
                 memcpy(rawdata.data(), attr -> value, len);
 
                 annotation = new KisAnnotation(
-                    TQString("chalk_attribute:%1").arg(TQString(attr -> key)), "", rawdata);
+                    TQString("chalk_attribute:%1").tqarg(TQString(attr -> key)), "", rawdata);
                 Q_CHECK_PTR(annotation);
 
                 image -> addAnnotation(annotation);
diff --git a/filters/chalk/gmagick/magickexport.cpp b/filters/chalk/gmagick/magickexport.cpp
index 2c49532a..e56f53d2 100644
--- a/filters/chalk/gmagick/magickexport.cpp
+++ b/filters/chalk/gmagick/magickexport.cpp
@@ -39,7 +39,7 @@ MagickExport::~MagickExport()
 {
 }
 
-KoFilter::ConversionStatus MagickExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus MagickExport::convert(const TQCString& from, const TQCString& to)
 {
     kdDebug(41008) << "magick export! From: " << from << ", To: " << to << "\n";
     
diff --git a/filters/chalk/gmagick/magickexport.h b/filters/chalk/gmagick/magickexport.h
index b1b73bb5..46a080f4 100644
--- a/filters/chalk/gmagick/magickexport.h
+++ b/filters/chalk/gmagick/magickexport.h
@@ -30,7 +30,7 @@ public:
     virtual ~MagickExport();
 
 public:
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // MAGICKEXPORT_H_
diff --git a/filters/chalk/gmagick/magickimport.cpp b/filters/chalk/gmagick/magickimport.cpp
index 9400c5bd..dbfe6da8 100644
--- a/filters/chalk/gmagick/magickimport.cpp
+++ b/filters/chalk/gmagick/magickimport.cpp
@@ -41,7 +41,7 @@ MagickImport::~MagickImport()
 {
 }
 
-KoFilter::ConversionStatus MagickImport::convert(const TQCString&, const TQCString& to)
+KoFilter::ConversiontqStatus MagickImport::convert(const TQCString&, const TQCString& to)
 {
     kdDebug(41008) << "Importing using MagickImport!\n";
 
diff --git a/filters/chalk/gmagick/magickimport.h b/filters/chalk/gmagick/magickimport.h
index 6ade3a20..22bf3002 100644
--- a/filters/chalk/gmagick/magickimport.h
+++ b/filters/chalk/gmagick/magickimport.h
@@ -30,7 +30,7 @@ public:
     virtual ~MagickImport();
 
 public:
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // MAGICKIMPORT_H_
diff --git a/filters/chalk/jpeg/kis_jpeg_converter.cc b/filters/chalk/jpeg/kis_jpeg_converter.cc
index c9772d9a..5fa8e78a 100644
--- a/filters/chalk/jpeg/kis_jpeg_converter.cc
+++ b/filters/chalk/jpeg/kis_jpeg_converter.cc
@@ -73,7 +73,7 @@ namespace {
         {
             return JCS_CMYK;
         }
-        KMessageBox::error(0, i18n("Cannot export images in %1.\n").arg(cs->id().name()) ) ;
+        KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(cs->id().name()) ) ;
         return JCS_UNKNOWN;
     }
 
diff --git a/filters/chalk/jpeg/kis_jpeg_export.cc b/filters/chalk/jpeg/kis_jpeg_export.cc
index c0eef02d..edfbbc02 100644
--- a/filters/chalk/jpeg/kis_jpeg_export.cc
+++ b/filters/chalk/jpeg/kis_jpeg_export.cc
@@ -85,7 +85,7 @@ KisJPEGExport::~KisJPEGExport()
 {
 }
 
-KoFilter::ConversionStatus KisJPEGExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus KisJPEGExport::convert(const TQCString& from, const TQCString& to)
 {
     kdDebug(41008) << "JPEG export! From: " << from << ", To: " << to << "\n";
     
diff --git a/filters/chalk/jpeg/kis_jpeg_export.h b/filters/chalk/jpeg/kis_jpeg_export.h
index 918c44b5..ea55c12c 100644
--- a/filters/chalk/jpeg/kis_jpeg_export.h
+++ b/filters/chalk/jpeg/kis_jpeg_export.h
@@ -29,7 +29,7 @@ class KisJPEGExport : public KoFilter {
         KisJPEGExport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisJPEGExport();
     public:
-        virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif
diff --git a/filters/chalk/jpeg/kis_jpeg_import.cc b/filters/chalk/jpeg/kis_jpeg_import.cc
index bacec679..2ca7c4c2 100644
--- a/filters/chalk/jpeg/kis_jpeg_import.cc
+++ b/filters/chalk/jpeg/kis_jpeg_import.cc
@@ -41,7 +41,7 @@ KisJPEGImport::~KisJPEGImport()
 {
 }
 
-KoFilter::ConversionStatus KisJPEGImport::convert(const TQCString&, const TQCString& to)
+KoFilter::ConversiontqStatus KisJPEGImport::convert(const TQCString&, const TQCString& to)
 {
     kdDebug(41008) << "Importing using JPEGImport!\n";
 
diff --git a/filters/chalk/jpeg/kis_jpeg_import.h b/filters/chalk/jpeg/kis_jpeg_import.h
index 9db52292..a32c367f 100644
--- a/filters/chalk/jpeg/kis_jpeg_import.h
+++ b/filters/chalk/jpeg/kis_jpeg_import.h
@@ -28,7 +28,7 @@ class KisJPEGImport : public KoFilter {
         KisJPEGImport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisJPEGImport();
     public:
-        virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif
diff --git a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
index 456fc67a..cb405324 100644
--- a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
+++ b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -34,13 +34,13 @@
                     <property name="text">
                         <string>Quality:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignTop</set>
                     </property>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -80,7 +80,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout4</cstring>
+                                <cstring>tqlayout4</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -101,7 +101,7 @@
                                     <property name="text">
                                         <string>Best</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                 </widget>
@@ -136,7 +136,7 @@ Enabling progressive will cause the image to be displayed by the browser even wh
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>61</height>
diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc
index 880a52c6..dd16dd0e 100644
--- a/filters/chalk/magick/kis_image_magick_converter.cc
+++ b/filters/chalk/magick/kis_image_magick_converter.cc
@@ -206,7 +206,7 @@ namespace {
                 memcpy(rawdata.data(), attr -> value, len);
 
                 annotation = new KisAnnotation(
-                    TQString("chalk_attribute:%1").arg(TQString(attr -> key)), "", rawdata);
+                    TQString("chalk_attribute:%1").tqarg(TQString(attr -> key)), "", rawdata);
                 Q_CHECK_PTR(annotation);
 
                 image -> addAnnotation(annotation);
diff --git a/filters/chalk/magick/magickexport.cpp b/filters/chalk/magick/magickexport.cpp
index 8c1e3365..09f351c1 100644
--- a/filters/chalk/magick/magickexport.cpp
+++ b/filters/chalk/magick/magickexport.cpp
@@ -39,7 +39,7 @@ MagickExport::~MagickExport()
 {
 }
 
-KoFilter::ConversionStatus MagickExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus MagickExport::convert(const TQCString& from, const TQCString& to)
 {
     kdDebug(41008) << "magick export! From: " << from << ", To: " << to << "\n";
     
diff --git a/filters/chalk/magick/magickexport.h b/filters/chalk/magick/magickexport.h
index b1b73bb5..46a080f4 100644
--- a/filters/chalk/magick/magickexport.h
+++ b/filters/chalk/magick/magickexport.h
@@ -30,7 +30,7 @@ public:
     virtual ~MagickExport();
 
 public:
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // MAGICKEXPORT_H_
diff --git a/filters/chalk/magick/magickimport.cpp b/filters/chalk/magick/magickimport.cpp
index d3e5bbb9..b5f73d19 100644
--- a/filters/chalk/magick/magickimport.cpp
+++ b/filters/chalk/magick/magickimport.cpp
@@ -41,7 +41,7 @@ MagickImport::~MagickImport()
 {
 }
 
-KoFilter::ConversionStatus MagickImport::convert(const TQCString&, const TQCString& to)
+KoFilter::ConversiontqStatus MagickImport::convert(const TQCString&, const TQCString& to)
 {
     kdDebug(41008) << "Importing using MagickImport!\n";
 
diff --git a/filters/chalk/magick/magickimport.h b/filters/chalk/magick/magickimport.h
index 6ade3a20..22bf3002 100644
--- a/filters/chalk/magick/magickimport.h
+++ b/filters/chalk/magick/magickimport.h
@@ -30,7 +30,7 @@ public:
     virtual ~MagickImport();
 
 public:
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // MAGICKIMPORT_H_
diff --git a/filters/chalk/openexr/kis_openexr_export.cpp b/filters/chalk/openexr/kis_openexr_export.cpp
index 062a072f..4859f5d9 100644
--- a/filters/chalk/openexr/kis_openexr_export.cpp
+++ b/filters/chalk/openexr/kis_openexr_export.cpp
@@ -57,7 +57,7 @@ KisOpenEXRExport::~KisOpenEXRExport()
 {
 }
 
-KoFilter::ConversionStatus KisOpenEXRExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus KisOpenEXRExport::convert(const TQCString& from, const TQCString& to)
 {
     if (to != "image/x-exr" || from != "application/x-chalk") {
         return KoFilter::NotImplemented;
diff --git a/filters/chalk/openexr/kis_openexr_export.h b/filters/chalk/openexr/kis_openexr_export.h
index ea62421c..7f0c71f9 100644
--- a/filters/chalk/openexr/kis_openexr_export.h
+++ b/filters/chalk/openexr/kis_openexr_export.h
@@ -31,7 +31,7 @@ public:
     virtual ~KisOpenEXRExport();
 
 public:
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // KIS_OPENEXR_EXPORT_H_
diff --git a/filters/chalk/openexr/kis_openexr_import.cpp b/filters/chalk/openexr/kis_openexr_import.cpp
index 8546edb2..974d4a67 100644
--- a/filters/chalk/openexr/kis_openexr_import.cpp
+++ b/filters/chalk/openexr/kis_openexr_import.cpp
@@ -62,7 +62,7 @@ KisOpenEXRImport::~KisOpenEXRImport()
 {
 }
 
-KoFilter::ConversionStatus KisOpenEXRImport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus KisOpenEXRImport::convert(const TQCString& from, const TQCString& to)
 {
     if (from != "image/x-exr" || to != "application/x-chalk") {
         return KoFilter::NotImplemented;
diff --git a/filters/chalk/openexr/kis_openexr_import.h b/filters/chalk/openexr/kis_openexr_import.h
index 8654df54..8bddb4f5 100644
--- a/filters/chalk/openexr/kis_openexr_import.h
+++ b/filters/chalk/openexr/kis_openexr_import.h
@@ -31,7 +31,7 @@ public:
     virtual ~KisOpenEXRImport();
 
 public:
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // KIS_OPENEXR_IMPORT_H_
diff --git a/filters/chalk/pdf/kis_pdf_import.cpp b/filters/chalk/pdf/kis_pdf_import.cpp
index ed504f67..2cef93e9 100644
--- a/filters/chalk/pdf/kis_pdf_import.cpp
+++ b/filters/chalk/pdf/kis_pdf_import.cpp
@@ -63,7 +63,7 @@ KisPDFImport::~KisPDFImport()
 {
 }
 
-KisPDFImport::ConversionStatus KisPDFImport::convert(const TQCString& , const TQCString& )
+KisPDFImport::ConversiontqStatus KisPDFImport::convert(const TQCString& , const TQCString& )
 {
     TQString filename = m_chain -> inputFile();
     kdDebug(41008) << "Importing using PDFImport!" << filename << endl;
@@ -141,7 +141,7 @@ KisPDFImport::ConversionStatus KisPDFImport::convert(const TQCString& , const TQ
     TQValueList<int> pages = wdg->pages();
     for(TQValueList<int>::const_iterator it = pages.begin(); it != pages.end(); ++it)
     {
-        KisPaintLayer* layer = new KisPaintLayer(img, TQString(i18n("Page %1")).arg( TQString::number(*it) + 1), TQ_UINT8_MAX);
+        KisPaintLayer* layer = new KisPaintLayer(img, TQString(i18n("Page %1")).tqarg( TQString::number(*it) + 1), TQ_UINT8_MAX);
         layer->paintDevice()->convertFromTQImage( pdoc->getPage( *it )->renderToImage(wdg->intHorizontal->value(), wdg->intVertical->value() ), "");
         img->addLayer(layer, img->rootLayer(), 0);
     }
diff --git a/filters/chalk/pdf/kis_pdf_import.h b/filters/chalk/pdf/kis_pdf_import.h
index ffb9c79e..06e22288 100644
--- a/filters/chalk/pdf/kis_pdf_import.h
+++ b/filters/chalk/pdf/kis_pdf_import.h
@@ -29,7 +29,7 @@ class KisPDFImport : public KoFilter{
         KisPDFImport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisPDFImport();
     public:
-        virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif
diff --git a/filters/chalk/pdf/pdfimportwidgetbase.ui b/filters/chalk/pdf/pdfimportwidgetbase.ui
index 88d24dc6..697a3e30 100644
--- a/filters/chalk/pdf/pdfimportwidgetbase.ui
+++ b/filters/chalk/pdf/pdfimportwidgetbase.ui
@@ -40,7 +40,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -56,7 +56,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -65,7 +65,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout2</cstring>
+                                <cstring>tqlayout2</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -141,7 +141,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>31</width>
                                     <height>20</height>
@@ -160,7 +160,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -176,7 +176,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -185,7 +185,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout3</cstring>
+                                <cstring>tqlayout3</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -235,7 +235,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>51</width>
                                     <height>20</height>
diff --git a/filters/chalk/png/kis_png_converter.cc b/filters/chalk/png/kis_png_converter.cc
index d5c4a080..d3cce618 100644
--- a/filters/chalk/png/kis_png_converter.cc
+++ b/filters/chalk/png/kis_png_converter.cc
@@ -62,7 +62,7 @@ namespace {
             return alpha ? PNG_COLOR_TYPE_RGB_ALPHA : PNG_COLOR_TYPE_RGB;
         }
 
-        KMessageBox::error(0, i18n("Cannot export images in %1.\n").arg(cs->id().name()) ) ;
+        KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(cs->id().name()) ) ;
         return -1;
 
     }
diff --git a/filters/chalk/png/kis_png_export.cc b/filters/chalk/png/kis_png_export.cc
index ace65954..8154866a 100644
--- a/filters/chalk/png/kis_png_export.cc
+++ b/filters/chalk/png/kis_png_export.cc
@@ -49,7 +49,7 @@ KisPNGExport::~KisPNGExport()
 {
 }
 
-KoFilter::ConversionStatus KisPNGExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus KisPNGExport::convert(const TQCString& from, const TQCString& to)
 {
     kdDebug(41008) << "Png export! From: " << from << ", To: " << to << "\n";
     
diff --git a/filters/chalk/png/kis_png_export.h b/filters/chalk/png/kis_png_export.h
index 562628a9..433b68e3 100644
--- a/filters/chalk/png/kis_png_export.h
+++ b/filters/chalk/png/kis_png_export.h
@@ -29,7 +29,7 @@ class KisPNGExport : public KoFilter {
         KisPNGExport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisPNGExport();
     public:
-        virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif
diff --git a/filters/chalk/png/kis_png_import.cc b/filters/chalk/png/kis_png_import.cc
index dc2a6325..ccfe4388 100644
--- a/filters/chalk/png/kis_png_import.cc
+++ b/filters/chalk/png/kis_png_import.cc
@@ -41,7 +41,7 @@ KisPNGImport::~KisPNGImport()
 {
 }
 
-KoFilter::ConversionStatus KisPNGImport::convert(const TQCString&, const TQCString& to)
+KoFilter::ConversiontqStatus KisPNGImport::convert(const TQCString&, const TQCString& to)
 {
     kdDebug(41008) << "Importing using PNGImport!\n";
 
diff --git a/filters/chalk/png/kis_png_import.h b/filters/chalk/png/kis_png_import.h
index 0412e7bd..3487d24d 100644
--- a/filters/chalk/png/kis_png_import.h
+++ b/filters/chalk/png/kis_png_import.h
@@ -28,7 +28,7 @@ class KisPNGImport : public KoFilter {
         KisPNGImport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisPNGImport();
     public:
-        virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif
diff --git a/filters/chalk/png/kis_wdg_options_png.ui b/filters/chalk/png/kis_wdg_options_png.ui
index 5797c407..ec5e0ba8 100644
--- a/filters/chalk/png/kis_wdg_options_png.ui
+++ b/filters/chalk/png/kis_wdg_options_png.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout6</cstring>
+                <cstring>tqlayout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -37,7 +37,7 @@
                     <property name="text">
                         <string>Compress:</string>
                     </property>
-                    <property name="alignment">
+                    <property name="tqalignment">
                         <set>AlignTop</set>
                     </property>
                     <property name="toolTip" stdset="0">
@@ -50,7 +50,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -88,7 +88,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout4</cstring>
+                                <cstring>tqlayout4</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -113,7 +113,7 @@
                                     <property name="text">
                                         <string>Small</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                     <property name="whatsThis" stdset="0">
@@ -137,7 +137,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>5</height>
diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp
index 4ec8f028..f006f913 100644
--- a/filters/chalk/raw/kis_raw_import.cpp
+++ b/filters/chalk/raw/kis_raw_import.cpp
@@ -103,7 +103,7 @@ KisRawImport::~KisRawImport()
     delete m_process;
 }
 
-KoFilter::ConversionStatus KisRawImport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus KisRawImport::convert(const TQCString& from, const TQCString& to)
 {
     if (from != "image/x-raw" || to != "application/x-chalk") {
         return KoFilter::NotImplemented;
@@ -458,7 +458,7 @@ void KisRawImport::slotReceivedStdout(KProcess *, char *buffer, int buflen)
     //kdDebug(41008) << "stdout received " << buflen << " bytes on stdout.\n";
     //kdDebug(41008) << TQString::fromAscii(buffer, buflen) << "\n";
     int oldSize = m_data->size();
-    m_data->resize(oldSize + buflen, TQGArray::SpeedOptim);
+    m_data->tqresize(oldSize + buflen, TQGArray::SpeedOptim);
     memcpy(m_data->data() + oldSize, buffer, buflen);
 }
 
diff --git a/filters/chalk/raw/kis_raw_import.h b/filters/chalk/raw/kis_raw_import.h
index e02caeed..17fd576c 100644
--- a/filters/chalk/raw/kis_raw_import.h
+++ b/filters/chalk/raw/kis_raw_import.h
@@ -37,7 +37,7 @@ public:
     virtual ~KisRawImport();
 
 public:
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 
 
 private slots:
diff --git a/filters/chalk/raw/wdgrawimport.ui b/filters/chalk/raw/wdgrawimport.ui
index 59d9642e..26115762 100644
--- a/filters/chalk/raw/wdgrawimport.ui
+++ b/filters/chalk/raw/wdgrawimport.ui
@@ -36,7 +36,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>200</width>
                     <height>150</height>
@@ -45,7 +45,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout2</cstring>
+                <cstring>tqlayout2</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -304,7 +304,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>500</width>
                     <height>20</height>
@@ -321,7 +321,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>120</height>
@@ -330,7 +330,7 @@
         </spacer>
         <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>layout4</cstring>
+                <cstring>tqlayout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -355,7 +355,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout10</cstring>
+                        <cstring>tqlayout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -408,7 +408,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>41</width>
                             <height>20</height>
diff --git a/filters/chalk/tiff/kis_dlg_options_tiff.cpp b/filters/chalk/tiff/kis_dlg_options_tiff.cpp
index 59784009..7a6ad9ca 100644
--- a/filters/chalk/tiff/kis_dlg_options_tiff.cpp
+++ b/filters/chalk/tiff/kis_dlg_options_tiff.cpp
@@ -39,7 +39,7 @@ KisDlgOptionsTIFF::KisDlgOptionsTIFF(TQWidget *parent, const char *name)
     connect(optionswdg->flatten, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(flattenToggled( bool) ) );
     setMainWidget(optionswdg);
     kapp->restoreOverrideCursor();
-    setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) );
+    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) );
 }
 
 KisDlgOptionsTIFF::~KisDlgOptionsTIFF()
diff --git a/filters/chalk/tiff/kis_tiff_export.cc b/filters/chalk/tiff/kis_tiff_export.cc
index 28495ff4..bcd3f22e 100644
--- a/filters/chalk/tiff/kis_tiff_export.cc
+++ b/filters/chalk/tiff/kis_tiff_export.cc
@@ -50,7 +50,7 @@ KisTIFFExport::~KisTIFFExport()
 {
 }
 
-KoFilter::ConversionStatus KisTIFFExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus KisTIFFExport::convert(const TQCString& from, const TQCString& to)
 {
     kdDebug(41008) << "Tiff export! From: " << from << ", To: " << to << "\n";
     
diff --git a/filters/chalk/tiff/kis_tiff_export.h b/filters/chalk/tiff/kis_tiff_export.h
index bb78fd4f..9efeb940 100644
--- a/filters/chalk/tiff/kis_tiff_export.h
+++ b/filters/chalk/tiff/kis_tiff_export.h
@@ -29,7 +29,7 @@ class KisTIFFExport : public KoFilter {
         KisTIFFExport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisTIFFExport();
     public:
-        virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif
diff --git a/filters/chalk/tiff/kis_tiff_import.cc b/filters/chalk/tiff/kis_tiff_import.cc
index 8c785ffe..89d1763f 100644
--- a/filters/chalk/tiff/kis_tiff_import.cc
+++ b/filters/chalk/tiff/kis_tiff_import.cc
@@ -41,7 +41,7 @@ KisTIFFImport::~KisTIFFImport()
 {
 }
 
-KoFilter::ConversionStatus KisTIFFImport::convert(const TQCString&, const TQCString& to)
+KoFilter::ConversiontqStatus KisTIFFImport::convert(const TQCString&, const TQCString& to)
 {
     kdDebug(41008) << "Importing using TIFFImport!\n";
 
diff --git a/filters/chalk/tiff/kis_tiff_import.h b/filters/chalk/tiff/kis_tiff_import.h
index 77cfd0de..b9e33d06 100644
--- a/filters/chalk/tiff/kis_tiff_import.h
+++ b/filters/chalk/tiff/kis_tiff_import.h
@@ -28,7 +28,7 @@ class KisTIFFImport : public KoFilter {
         KisTIFFImport(KoFilter *parent, const char *name, const TQStringList&);
         virtual ~KisTIFFImport();
     public:
-        virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif
diff --git a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp
index da399a53..681e66b7 100644
--- a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp
+++ b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp
@@ -63,7 +63,7 @@ namespace {
             return true;
         }
 
-        KMessageBox::error(0, i18n("Cannot export images in %1.\n").arg(cs->id().name()) ) ;
+        KMessageBox::error(0, i18n("Cannot export images in %1.\n").tqarg(cs->id().name()) ) ;
         return false;
 
     }
diff --git a/filters/chalk/tiff/kis_wdg_options_tiff.ui b/filters/chalk/tiff/kis_wdg_options_tiff.ui
index 29038890..d840dc8d 100644
--- a/filters/chalk/tiff/kis_wdg_options_tiff.ui
+++ b/filters/chalk/tiff/kis_wdg_options_tiff.ui
@@ -51,7 +51,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout10</cstring>
+                        <cstring>tqlayout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -119,7 +119,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout7</cstring>
+                        <cstring>tqlayout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -283,13 +283,13 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                 <property name="text">
                                     <string>Quality:</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop</set>
                                 </property>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout5</cstring>
+                                    <cstring>tqlayout5</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -329,7 +329,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout4_2</cstring>
+                                            <cstring>tqlayout4_2</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -350,7 +350,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                                 <property name="text">
                                                     <string>Best</string>
                                                 </property>
-                                                <property name="alignment">
+                                                <property name="tqalignment">
                                                     <set>AlignVCenter|AlignRight</set>
                                                 </property>
                                             </widget>
@@ -405,7 +405,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                 <property name="text">
                                     <string>Compress:</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop</set>
                                 </property>
                                 <property name="toolTip" stdset="0">
@@ -418,7 +418,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout5_2</cstring>
+                                    <cstring>tqlayout5_2</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -456,7 +456,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout4</cstring>
+                                            <cstring>tqlayout4</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -481,7 +481,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                                 <property name="text">
                                                     <string>Small</string>
                                                 </property>
-                                                <property name="alignment">
+                                                <property name="tqalignment">
                                                     <set>AlignVCenter|AlignRight</set>
                                                 </property>
                                                 <property name="whatsThis" stdset="0">
@@ -608,7 +608,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                 <property name="text">
                                     <string>Compress:</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>AlignTop</set>
                                 </property>
                                 <property name="toolTip" stdset="0">
@@ -621,7 +621,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout5_2_2</cstring>
+                                    <cstring>tqlayout5_2_2</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -659,7 +659,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                     </widget>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>layout4_3</cstring>
+                                            <cstring>tqlayout4_3</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -684,7 +684,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
                                                 <property name="text">
                                                     <string>Small</string>
                                                 </property>
-                                                <property name="alignment">
+                                                <property name="tqalignment">
                                                     <set>AlignVCenter|AlignRight</set>
                                                 </property>
                                                 <property name="whatsThis" stdset="0">
@@ -711,7 +711,7 @@ You can uncheck the box if you are not using transparancy and you want to make t
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/filters/chalk/xcf/xcf/xcf-load.cc b/filters/chalk/xcf/xcf/xcf-load.cc
index 3209e181..90d61755 100644
--- a/filters/chalk/xcf/xcf/xcf-load.cc
+++ b/filters/chalk/xcf/xcf/xcf-load.cc
@@ -173,7 +173,7 @@ xcf_load_image (XcfInfo * info)
         /* add the layer to the image if its not the floating selection */
         if (layer != info->floating_sel)
             gimp_image_add_layer (gimage, layer,
-                                  gimp_container_num_children (gimage->layers));
+                                  gimp_container_num_tqchildren (gimage->layers));
 
         /* restore the saved position so we'll be ready to
          *  read the next offset.
@@ -1494,7 +1494,7 @@ xcf_load_old_path (XcfInfo * info, KisImage * gimage)
         GIMP_ITEM (vectors)->tattoo = tattoo;
 
     gimp_image_add_vectors (gimage, vectors,
-                            gimp_container_num_children (gimage->vectors));
+                            gimp_container_num_tqchildren (gimage->vectors));
 
     return TRUE;
 }
@@ -1674,7 +1674,7 @@ xcf_load_vector (XcfInfo * info, KisImage * gimage)
     }
 
     gimp_image_add_vectors (gimage, vectors,
-                            gimp_container_num_children (gimage->vectors));
+                            gimp_container_num_tqchildren (gimage->vectors));
 
     return TRUE;
 }
diff --git a/filters/chalk/xcf/xcf/xcf-save.cc b/filters/chalk/xcf/xcf/xcf-save.cc
index a0dbb9b5..3544baf4 100644
--- a/filters/chalk/xcf/xcf/xcf-save.cc
+++ b/filters/chalk/xcf/xcf/xcf-save.cc
@@ -289,8 +289,8 @@ xcf_save_image (XcfInfo   *info,
     xcf_write_int32_print_error (info, (TQ_INT32 *) &gimage->base_type, 1);
 
     /* determine the number of layers and channels in the image */
-    nlayers   = (TQ_UINT32) gimp_container_num_children (gimage->layers);
-    nchannels = (TQ_UINT32) gimp_container_num_children (gimage->channels);
+    nlayers   = (TQ_UINT32) gimp_container_num_tqchildren (gimage->layers);
+    nchannels = (TQ_UINT32) gimp_container_num_tqchildren (gimage->channels);
 
     /* check and see if we have to save out the selection */
     have_selection = gimp_channel_bounds (gimp_image_get_mask (gimage),
@@ -442,7 +442,7 @@ xcf_save_image_props (XcfInfo   *info,
     if (unit < _gimp_unit_get_number_of_built_in_units (gimage->gimp))
         xcf_check_error (xcf_save_prop (info, gimage, PROP_UNIT, error, unit));
 
-    if (gimp_container_num_children (gimage->vectors) > 0)
+    if (gimp_container_num_tqchildren (gimage->vectors) > 0)
     {
         if (gimp_vectors_compat_is_compatible (gimage))
             xcf_check_error (xcf_save_prop (info, gimage, PROP_PATHS, error));
@@ -1581,7 +1581,7 @@ xcf_save_old_paths (XcfInfo    *info,
      * then each path:-
      */
 
-    num_paths = gimp_container_num_children (gimage->vectors);
+    num_paths = gimp_container_num_tqchildren (gimage->vectors);
 
     active_vectors = gimp_image_get_active_vectors (gimage);
 
@@ -1696,7 +1696,7 @@ xcf_save_vectors (XcfInfo    *info,
         active_index = gimp_container_get_child_index (gimage->vectors,
                                                        GIMP_OBJECT (active_vectors));
 
-    num_paths = gimp_container_num_children (gimage->vectors);
+    num_paths = gimp_container_num_tqchildren (gimage->vectors);
 
     xcf_write_int32_check_error (info, &version,      1);
     xcf_write_int32_check_error (info, &active_index, 1);
diff --git a/filters/chalk/xcf/xcfexport.cpp b/filters/chalk/xcf/xcfexport.cpp
index 06bcf96f..b26fdba8 100644
--- a/filters/chalk/xcf/xcfexport.cpp
+++ b/filters/chalk/xcf/xcfexport.cpp
@@ -41,7 +41,7 @@ XCFExport::~XCFExport()
 {
 }
 
-KoFilter::ConversionStatus XCFExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversiontqStatus XCFExport::convert(const TQCString& from, const TQCString& to)
 {
     kdDebug(41008) << "xcf export! From: " << from << ", To: " << to << "\n";
     
diff --git a/filters/chalk/xcf/xcfexport.h b/filters/chalk/xcf/xcfexport.h
index 34595b06..b8f260fb 100644
--- a/filters/chalk/xcf/xcfexport.h
+++ b/filters/chalk/xcf/xcfexport.h
@@ -30,7 +30,7 @@ public:
     virtual ~XCFExport();
 
 public:
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // XCFEXPORT_H_
diff --git a/filters/chalk/xcf/xcfimport.cpp b/filters/chalk/xcf/xcfimport.cpp
index 6b81ec67..6f07ebcf 100644
--- a/filters/chalk/xcf/xcfimport.cpp
+++ b/filters/chalk/xcf/xcfimport.cpp
@@ -39,7 +39,7 @@ XCFImport::~XCFImport()
 {
 }
 
-KoFilter::ConversionStatus XCFImport::convert(const TQCString&, const TQCString& to)
+KoFilter::ConversiontqStatus XCFImport::convert(const TQCString&, const TQCString& to)
 {
     kdDebug(41008) << "Importing using XCFImport!\n";
 
diff --git a/filters/chalk/xcf/xcfimport.h b/filters/chalk/xcf/xcfimport.h
index 27f2cbfe..434566ba 100644
--- a/filters/chalk/xcf/xcfimport.h
+++ b/filters/chalk/xcf/xcfimport.h
@@ -30,7 +30,7 @@ public:
     virtual ~XCFImport();
 
 public:
-    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // XCFIMPORT_H_