From 11191ef0b9908604d1d7aaca382b011ef22c454c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 18 Dec 2011 18:12:30 -0600
Subject: Rename old tq methods that no longer need a unique name

---
 filters/chalk/gmagick/magickexport.cpp       | 2 +-
 filters/chalk/gmagick/magickexport.h         | 2 +-
 filters/chalk/gmagick/magickimport.cpp       | 2 +-
 filters/chalk/gmagick/magickimport.h         | 2 +-
 filters/chalk/jpeg/kis_jpeg_export.cc        | 2 +-
 filters/chalk/jpeg/kis_jpeg_export.h         | 2 +-
 filters/chalk/jpeg/kis_jpeg_import.cc        | 2 +-
 filters/chalk/jpeg/kis_jpeg_import.h         | 2 +-
 filters/chalk/jpeg/kis_wdg_options_jpeg.ui   | 2 +-
 filters/chalk/magick/magickexport.cpp        | 2 +-
 filters/chalk/magick/magickexport.h          | 2 +-
 filters/chalk/magick/magickimport.cpp        | 2 +-
 filters/chalk/magick/magickimport.h          | 2 +-
 filters/chalk/openexr/kis_openexr_export.cpp | 2 +-
 filters/chalk/openexr/kis_openexr_export.h   | 2 +-
 filters/chalk/openexr/kis_openexr_import.cpp | 2 +-
 filters/chalk/openexr/kis_openexr_import.h   | 2 +-
 filters/chalk/pdf/kis_pdf_import.cpp         | 2 +-
 filters/chalk/pdf/kis_pdf_import.h           | 2 +-
 filters/chalk/pdf/pdfimportwidgetbase.ui     | 8 ++++----
 filters/chalk/png/kis_png_export.cc          | 2 +-
 filters/chalk/png/kis_png_export.h           | 2 +-
 filters/chalk/png/kis_png_import.cc          | 2 +-
 filters/chalk/png/kis_png_import.h           | 2 +-
 filters/chalk/png/kis_wdg_options_png.ui     | 2 +-
 filters/chalk/raw/kis_raw_import.cpp         | 2 +-
 filters/chalk/raw/kis_raw_import.h           | 2 +-
 filters/chalk/raw/wdgrawimport.ui            | 8 ++++----
 filters/chalk/tiff/kis_dlg_options_tiff.cpp  | 2 +-
 filters/chalk/tiff/kis_tiff_export.cc        | 2 +-
 filters/chalk/tiff/kis_tiff_export.h         | 2 +-
 filters/chalk/tiff/kis_tiff_import.cc        | 2 +-
 filters/chalk/tiff/kis_tiff_import.h         | 2 +-
 filters/chalk/tiff/kis_wdg_options_tiff.ui   | 2 +-
 filters/chalk/xcf/xcfexport.cpp              | 2 +-
 filters/chalk/xcf/xcfexport.h                | 2 +-
 filters/chalk/xcf/xcfimport.cpp              | 2 +-
 filters/chalk/xcf/xcfimport.h                | 2 +-
 38 files changed, 44 insertions(+), 44 deletions(-)

(limited to 'filters/chalk')

diff --git a/filters/chalk/gmagick/magickexport.cpp b/filters/chalk/gmagick/magickexport.cpp
index e56f53d2..2c49532a 100644
--- a/filters/chalk/gmagick/magickexport.cpp
+++ b/filters/chalk/gmagick/magickexport.cpp
@@ -39,7 +39,7 @@ MagickExport::~MagickExport()
 {
 }
 
-KoFilter::ConversiontqStatus MagickExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversionStatus 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 46a080f4..b1b73bb5 100644
--- a/filters/chalk/gmagick/magickexport.h
+++ b/filters/chalk/gmagick/magickexport.h
@@ -30,7 +30,7 @@ public:
     virtual ~MagickExport();
 
 public:
-    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversionStatus 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 dbfe6da8..9400c5bd 100644
--- a/filters/chalk/gmagick/magickimport.cpp
+++ b/filters/chalk/gmagick/magickimport.cpp
@@ -41,7 +41,7 @@ MagickImport::~MagickImport()
 {
 }
 
-KoFilter::ConversiontqStatus MagickImport::convert(const TQCString&, const TQCString& to)
+KoFilter::ConversionStatus 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 22bf3002..6ade3a20 100644
--- a/filters/chalk/gmagick/magickimport.h
+++ b/filters/chalk/gmagick/magickimport.h
@@ -30,7 +30,7 @@ public:
     virtual ~MagickImport();
 
 public:
-    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // MAGICKIMPORT_H_
diff --git a/filters/chalk/jpeg/kis_jpeg_export.cc b/filters/chalk/jpeg/kis_jpeg_export.cc
index edfbbc02..c0eef02d 100644
--- a/filters/chalk/jpeg/kis_jpeg_export.cc
+++ b/filters/chalk/jpeg/kis_jpeg_export.cc
@@ -85,7 +85,7 @@ KisJPEGExport::~KisJPEGExport()
 {
 }
 
-KoFilter::ConversiontqStatus KisJPEGExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversionStatus 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 ea55c12c..918c44b5 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::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversionStatus 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 2ca7c4c2..bacec679 100644
--- a/filters/chalk/jpeg/kis_jpeg_import.cc
+++ b/filters/chalk/jpeg/kis_jpeg_import.cc
@@ -41,7 +41,7 @@ KisJPEGImport::~KisJPEGImport()
 {
 }
 
-KoFilter::ConversiontqStatus KisJPEGImport::convert(const TQCString&, const TQCString& to)
+KoFilter::ConversionStatus 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 a32c367f..9db52292 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::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversionStatus 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 cb405324..40a6c32a 100644
--- a/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
+++ b/filters/chalk/jpeg/kis_wdg_options_jpeg.ui
@@ -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="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>61</height>
diff --git a/filters/chalk/magick/magickexport.cpp b/filters/chalk/magick/magickexport.cpp
index 09f351c1..8c1e3365 100644
--- a/filters/chalk/magick/magickexport.cpp
+++ b/filters/chalk/magick/magickexport.cpp
@@ -39,7 +39,7 @@ MagickExport::~MagickExport()
 {
 }
 
-KoFilter::ConversiontqStatus MagickExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversionStatus 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 46a080f4..b1b73bb5 100644
--- a/filters/chalk/magick/magickexport.h
+++ b/filters/chalk/magick/magickexport.h
@@ -30,7 +30,7 @@ public:
     virtual ~MagickExport();
 
 public:
-    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversionStatus 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 b5f73d19..d3e5bbb9 100644
--- a/filters/chalk/magick/magickimport.cpp
+++ b/filters/chalk/magick/magickimport.cpp
@@ -41,7 +41,7 @@ MagickImport::~MagickImport()
 {
 }
 
-KoFilter::ConversiontqStatus MagickImport::convert(const TQCString&, const TQCString& to)
+KoFilter::ConversionStatus 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 22bf3002..6ade3a20 100644
--- a/filters/chalk/magick/magickimport.h
+++ b/filters/chalk/magick/magickimport.h
@@ -30,7 +30,7 @@ public:
     virtual ~MagickImport();
 
 public:
-    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversionStatus 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 4859f5d9..062a072f 100644
--- a/filters/chalk/openexr/kis_openexr_export.cpp
+++ b/filters/chalk/openexr/kis_openexr_export.cpp
@@ -57,7 +57,7 @@ KisOpenEXRExport::~KisOpenEXRExport()
 {
 }
 
-KoFilter::ConversiontqStatus KisOpenEXRExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversionStatus 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 7f0c71f9..ea62421c 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::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversionStatus 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 974d4a67..8546edb2 100644
--- a/filters/chalk/openexr/kis_openexr_import.cpp
+++ b/filters/chalk/openexr/kis_openexr_import.cpp
@@ -62,7 +62,7 @@ KisOpenEXRImport::~KisOpenEXRImport()
 {
 }
 
-KoFilter::ConversiontqStatus KisOpenEXRImport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversionStatus 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 8bddb4f5..8654df54 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::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversionStatus 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 2cef93e9..be3af8ad 100644
--- a/filters/chalk/pdf/kis_pdf_import.cpp
+++ b/filters/chalk/pdf/kis_pdf_import.cpp
@@ -63,7 +63,7 @@ KisPDFImport::~KisPDFImport()
 {
 }
 
-KisPDFImport::ConversiontqStatus KisPDFImport::convert(const TQCString& , const TQCString& )
+KisPDFImport::ConversionStatus KisPDFImport::convert(const TQCString& , const TQCString& )
 {
     TQString filename = m_chain -> inputFile();
     kdDebug(41008) << "Importing using PDFImport!" << filename << endl;
diff --git a/filters/chalk/pdf/kis_pdf_import.h b/filters/chalk/pdf/kis_pdf_import.h
index 06e22288..ffb9c79e 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::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif
diff --git a/filters/chalk/pdf/pdfimportwidgetbase.ui b/filters/chalk/pdf/pdfimportwidgetbase.ui
index 697a3e30..c91ecd99 100644
--- a/filters/chalk/pdf/pdfimportwidgetbase.ui
+++ b/filters/chalk/pdf/pdfimportwidgetbase.ui
@@ -56,7 +56,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -141,7 +141,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>31</width>
                                     <height>20</height>
@@ -176,7 +176,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -235,7 +235,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>51</width>
                                     <height>20</height>
diff --git a/filters/chalk/png/kis_png_export.cc b/filters/chalk/png/kis_png_export.cc
index 8154866a..ace65954 100644
--- a/filters/chalk/png/kis_png_export.cc
+++ b/filters/chalk/png/kis_png_export.cc
@@ -49,7 +49,7 @@ KisPNGExport::~KisPNGExport()
 {
 }
 
-KoFilter::ConversiontqStatus KisPNGExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversionStatus 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 433b68e3..562628a9 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::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversionStatus 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 ccfe4388..dc2a6325 100644
--- a/filters/chalk/png/kis_png_import.cc
+++ b/filters/chalk/png/kis_png_import.cc
@@ -41,7 +41,7 @@ KisPNGImport::~KisPNGImport()
 {
 }
 
-KoFilter::ConversiontqStatus KisPNGImport::convert(const TQCString&, const TQCString& to)
+KoFilter::ConversionStatus 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 3487d24d..0412e7bd 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::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversionStatus 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 ec5e0ba8..a635c293 100644
--- a/filters/chalk/png/kis_wdg_options_png.ui
+++ b/filters/chalk/png/kis_wdg_options_png.ui
@@ -137,7 +137,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <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 f006f913..a5b86364 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::ConversiontqStatus KisRawImport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversionStatus KisRawImport::convert(const TQCString& from, const TQCString& to)
 {
     if (from != "image/x-raw" || to != "application/x-chalk") {
         return KoFilter::NotImplemented;
diff --git a/filters/chalk/raw/kis_raw_import.h b/filters/chalk/raw/kis_raw_import.h
index 17fd576c..e02caeed 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::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
 
 
 private slots:
diff --git a/filters/chalk/raw/wdgrawimport.ui b/filters/chalk/raw/wdgrawimport.ui
index 26115762..ffd7c59d 100644
--- a/filters/chalk/raw/wdgrawimport.ui
+++ b/filters/chalk/raw/wdgrawimport.ui
@@ -36,7 +36,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>200</width>
                     <height>150</height>
@@ -304,7 +304,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>500</width>
                     <height>20</height>
@@ -321,7 +321,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>120</height>
@@ -408,7 +408,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <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 7a6ad9ca..59784009 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();
-    tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) );
+    setSizePolicy(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 bcd3f22e..28495ff4 100644
--- a/filters/chalk/tiff/kis_tiff_export.cc
+++ b/filters/chalk/tiff/kis_tiff_export.cc
@@ -50,7 +50,7 @@ KisTIFFExport::~KisTIFFExport()
 {
 }
 
-KoFilter::ConversiontqStatus KisTIFFExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversionStatus 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 9efeb940..bb78fd4f 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::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversionStatus 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 89d1763f..8c785ffe 100644
--- a/filters/chalk/tiff/kis_tiff_import.cc
+++ b/filters/chalk/tiff/kis_tiff_import.cc
@@ -41,7 +41,7 @@ KisTIFFImport::~KisTIFFImport()
 {
 }
 
-KoFilter::ConversiontqStatus KisTIFFImport::convert(const TQCString&, const TQCString& to)
+KoFilter::ConversionStatus 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 b9e33d06..77cfd0de 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::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+        virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif
diff --git a/filters/chalk/tiff/kis_wdg_options_tiff.ui b/filters/chalk/tiff/kis_wdg_options_tiff.ui
index d840dc8d..b86d88ab 100644
--- a/filters/chalk/tiff/kis_wdg_options_tiff.ui
+++ b/filters/chalk/tiff/kis_wdg_options_tiff.ui
@@ -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="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
diff --git a/filters/chalk/xcf/xcfexport.cpp b/filters/chalk/xcf/xcfexport.cpp
index b26fdba8..06bcf96f 100644
--- a/filters/chalk/xcf/xcfexport.cpp
+++ b/filters/chalk/xcf/xcfexport.cpp
@@ -41,7 +41,7 @@ XCFExport::~XCFExport()
 {
 }
 
-KoFilter::ConversiontqStatus XCFExport::convert(const TQCString& from, const TQCString& to)
+KoFilter::ConversionStatus 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 b8f260fb..34595b06 100644
--- a/filters/chalk/xcf/xcfexport.h
+++ b/filters/chalk/xcf/xcfexport.h
@@ -30,7 +30,7 @@ public:
     virtual ~XCFExport();
 
 public:
-    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversionStatus 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 6f07ebcf..6b81ec67 100644
--- a/filters/chalk/xcf/xcfimport.cpp
+++ b/filters/chalk/xcf/xcfimport.cpp
@@ -39,7 +39,7 @@ XCFImport::~XCFImport()
 {
 }
 
-KoFilter::ConversiontqStatus XCFImport::convert(const TQCString&, const TQCString& to)
+KoFilter::ConversionStatus 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 434566ba..27f2cbfe 100644
--- a/filters/chalk/xcf/xcfimport.h
+++ b/filters/chalk/xcf/xcfimport.h
@@ -30,7 +30,7 @@ public:
     virtual ~XCFImport();
 
 public:
-    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // XCFIMPORT_H_
-- 
cgit v1.2.1