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

11 files changed, 31 insertions, 31 deletions

diff --git a/filters/kformula/latex/latexexport.cc b/filters/kformula/latex/latexexport.cc
index 77488fa9..3f184674 100644
--- a/filters/kformula/latex/latexexport.cc
+++ b/filters/kformula/latex/latexexport.cc
@@ -18,7 +18,7 @@
 */
 
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 
 #include <kapplication.h>
@@ -46,7 +46,7 @@ LATEXExport::LATEXExport( KoFilter */*parent*/, const char */*name*/, const TQSt
 }
 
 
-KoFilter::ConversiontqStatus LATEXExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus LATEXExport::convert( const TQCString& from, const TQCString& to )
 {
     if ( to != "text/x-tex" || from != "application/x-kformula" )
         return KoFilter::NotImplemented;
diff --git a/filters/kformula/latex/latexexport.h b/filters/kformula/latex/latexexport.h
index 091ed125..83672fae 100644
--- a/filters/kformula/latex/latexexport.h
+++ b/filters/kformula/latex/latexexport.h
@@ -33,7 +33,7 @@ public:
     LATEXExport( KoFilter *parent, const char *name, const TQStringList& );
     virtual ~LATEXExport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // LATEXEXPORT_H
diff --git a/filters/kformula/mathml/mathmlexport.cc b/filters/kformula/mathml/mathmlexport.cc
index 507c13a2..6103da18 100644
--- a/filters/kformula/mathml/mathmlexport.cc
+++ b/filters/kformula/mathml/mathmlexport.cc
@@ -18,7 +18,7 @@
 */
 
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 
 #include <kapplication.h>
@@ -46,7 +46,7 @@ MathMLExport::MathMLExport( KoFilter */*parent*/, const char */*name*/, const TQ
 }
 
 
-KoFilter::ConversiontqStatus MathMLExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus MathMLExport::convert( const TQCString& from, const TQCString& to )
 {
     if ( to != "application/mathml+xml" || from != "application/x-kformula" )
         return KoFilter::NotImplemented;
diff --git a/filters/kformula/mathml/mathmlexport.h b/filters/kformula/mathml/mathmlexport.h
index a49b837b..2a442a22 100644
--- a/filters/kformula/mathml/mathmlexport.h
+++ b/filters/kformula/mathml/mathmlexport.h
@@ -33,7 +33,7 @@ public:
     MathMLExport( KoFilter *parent, const char *name, const TQStringList& );
     virtual ~MathMLExport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // MATHMLEXPORT_H
diff --git a/filters/kformula/mathml/mathmlimport.cc b/filters/kformula/mathml/mathmlimport.cc
index 87ce2182..6900c61b 100644
--- a/filters/kformula/mathml/mathmlimport.cc
+++ b/filters/kformula/mathml/mathmlimport.cc
@@ -25,7 +25,7 @@
 #include <kmessagebox.h>
 #include <KoFilterChain.h>
 
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 #include <kformuladocument.h>
 #include <kformulacontainer.h>
@@ -44,7 +44,7 @@ MathMLImport::MathMLImport(KoFilter *, const char *, const TQStringList&)
 {
 }
 
-KoFilter::ConversiontqStatus MathMLImport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus MathMLImport::convert( const TQCString& from, const TQCString& to )
 {
     kdDebug( KFormula::DEBUGID ) << "From: " << from << endl;
     kdDebug( KFormula::DEBUGID ) << "To:   " << to << endl;
@@ -68,7 +68,7 @@ KoFilter::ConversiontqStatus MathMLImport::convert( const TQCString& from, const
     const TQString filename( m_chain->inputFile() );
     TQFile f( filename );
     if ( !f.open( IO_ReadOnly ) ) {
-        KMessageBox::error( 0, i18n( "Failed to open input file: %1" ).tqarg( filename ), i18n( "MathML Import Error" ) );
+        KMessageBox::error( 0, i18n( "Failed to open input file: %1" ).arg( filename ), i18n( "MathML Import Error" ) );
         delete wrapper;
         return KoFilter::FileNotFound;
     }
@@ -84,7 +84,7 @@ KoFilter::ConversiontqStatus MathMLImport::convert( const TQCString& from, const
             << " In line: " << errorLine << ", column: " << errorColumn << endl
             << " Error message: " << errorMsg << endl;
         KMessageBox::error( 0, i18n( "Parsing error in MathML file %4 at line %1, column %2\nError message: %3" )
-                              .tqarg( errorLine ).tqarg( errorColumn ).tqarg( i18n ( "TQXml", errorMsg.utf8() ).tqarg( filename ) ), i18n( "MathML Import Error" ) );
+                              .arg( errorLine ).arg( errorColumn ).arg( i18n ( "TQXml", errorMsg.utf8() ).arg( filename ) ), i18n( "MathML Import Error" ) );
         return KoFilter::WrongFormat;
     }
     f.close();
diff --git a/filters/kformula/mathml/mathmlimport.h b/filters/kformula/mathml/mathmlimport.h
index a4a28e18..4835b69b 100644
--- a/filters/kformula/mathml/mathmlimport.h
+++ b/filters/kformula/mathml/mathmlimport.h
@@ -21,7 +21,7 @@
 #define MATHMLIMPORT_H
 
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 #include <tqobject.h>
 
@@ -36,7 +36,7 @@ public:
     MathMLImport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~MathMLImport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif /* MATHMLIMPORT_H */
diff --git a/filters/kformula/png/pngexport.cc b/filters/kformula/png/pngexport.cc
index c6d3611e..764cfc2b 100644
--- a/filters/kformula/png/pngexport.cc
+++ b/filters/kformula/png/pngexport.cc
@@ -18,7 +18,7 @@
 */
 
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 #include <tqobject.h>
 
@@ -46,7 +46,7 @@ PNGExport::PNGExport( KoFilter */*parent*/, const char */*name*/, const TQString
 }
 
 
-KoFilter::ConversiontqStatus PNGExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus PNGExport::convert( const TQCString& from, const TQCString& to )
 {
     if ( to != "image/png" || from != "application/x-kformula" )
         return KoFilter::NotImplemented;
diff --git a/filters/kformula/png/pngexport.h b/filters/kformula/png/pngexport.h
index 8dd3de34..eb71df94 100644
--- a/filters/kformula/png/pngexport.h
+++ b/filters/kformula/png/pngexport.h
@@ -33,7 +33,7 @@ public:
     PNGExport( KoFilter *parent, const char *name, const TQStringList& );
     virtual ~PNGExport() {}
 
-    virtual KoFilter::ConversiontqStatus convert( const TQCString& from, const TQCString& to );
+    virtual KoFilter::ConversionStatus convert( const TQCString& from, const TQCString& to );
 };
 
 #endif // PNGEXPORT_H
diff --git a/filters/kformula/png/pngexportdia.cc b/filters/kformula/png/pngexportdia.cc
index fb0407e0..36741fa2 100644
--- a/filters/kformula/png/pngexportdia.cc
+++ b/filters/kformula/png/pngexportdia.cc
@@ -20,7 +20,7 @@
 #include <tqcheckbox.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlineedit.h>
 #include <tqpaintdevice.h>
 #include <tqrect.h>
@@ -190,13 +190,13 @@ void PNGExportDia::setupGUI()
     width->setText( i18n( "Width" ) );
     heightEdit = new KIntNumInput( page, "heightEdit" );
 
-    TQGridLayout* tqlayout1 = new TQGridLayout;
-    tqlayout1->addWidget( height, 1, 0 );
-    tqlayout1->addWidget( widthEdit, 0, 1 );
-    tqlayout1->addWidget( width, 0, 0 );
-    tqlayout1->addWidget( heightEdit, 1, 1 );
+    TQGridLayout* layout1 = new TQGridLayout;
+    layout1->addWidget( height, 1, 0 );
+    layout1->addWidget( widthEdit, 0, 1 );
+    layout1->addWidget( width, 0, 0 );
+    layout1->addWidget( heightEdit, 1, 1 );
 
-    mainLayout->addLayout( tqlayout1 );
+    mainLayout->addLayout( layout1 );
 
     TQLabel* percentHeight = new TQLabel( page, "PercentHeight" );
     percentHeight->setText( i18n( "Height (%)" ) );
@@ -205,15 +205,15 @@ void PNGExportDia::setupGUI()
     percWidthEdit = new KDoubleNumInput( page, "percWidthEdit" );
     percHeightEdit = new KDoubleNumInput( page, "percHeightEdit" );
 
-    TQGridLayout* tqlayout2 = new TQGridLayout;
-    tqlayout2->addWidget( percWidthEdit, 0, 1 );
-    tqlayout2->addWidget( percHeightEdit, 1, 1 );
-    tqlayout2->addWidget( percentHeight, 1, 0 );
-    tqlayout2->addWidget( percentWidth, 0, 0 );
+    TQGridLayout* layout2 = new TQGridLayout;
+    layout2->addWidget( percWidthEdit, 0, 1 );
+    layout2->addWidget( percHeightEdit, 1, 1 );
+    layout2->addWidget( percentHeight, 1, 0 );
+    layout2->addWidget( percentWidth, 0, 0 );
 
-    mainLayout->addLayout( tqlayout2 );
+    mainLayout->addLayout( layout2 );
 
-    /* Display the main tqlayout */
+    /* Display the main layout */
     mainLayout->addStretch( 5 );
     mainLayout->activate();
 }
diff --git a/filters/kformula/svg/svgexport.cc b/filters/kformula/svg/svgexport.cc
index 25758e82..328f1518 100644
--- a/filters/kformula/svg/svgexport.cc
+++ b/filters/kformula/svg/svgexport.cc
@@ -48,7 +48,7 @@ SvgExport::~SvgExport()
 }
 
 
-KoFilter::ConversiontqStatus
+KoFilter::ConversionStatus
 SvgExport::convert(const TQCString& from, const TQCString& to)
 {
     // Check for proper conversion.
diff --git a/filters/kformula/svg/svgexport.h b/filters/kformula/svg/svgexport.h
index 65a5cef1..0296e574 100644
--- a/filters/kformula/svg/svgexport.h
+++ b/filters/kformula/svg/svgexport.h
@@ -32,7 +32,7 @@ public:
     SvgExport(KoFilter *parent, const char *name, const TQStringList&);
     virtual ~SvgExport();
 
-    virtual KoFilter::ConversiontqStatus convert(const TQCString& from, const TQCString& to);
+    virtual KoFilter::ConversionStatus convert(const TQCString& from, const TQCString& to);
 };
 
 #endif // __SVGEXPORT_H__