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

14 files changed, 25 insertions, 25 deletions

diff --git a/filters/kspread/latex/export/config.h b/filters/kspread/latex/export/config.h
index 6e35bd1c..969d021d 100644
--- a/filters/kspread/latex/export/config.h
+++ b/filters/kspread/latex/export/config.h
@@ -22,7 +22,7 @@
 #ifndef __LATEX_CONFIG_H__
 #define __LATEX_CONFIG_H__
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstringlist.h>
 
 /***********************************************************************/
@@ -84,8 +84,8 @@ class Config
 		bool convertPictures() const { return _convertPictures; }
 		TQString getPicturesDir() const { return _picturesDir; }
 		
-		bool mustUseUnicode() const { return (_encoding == "tqunicode"); }
-		bool mustUseLatin1() const { return (_encoding != "tqunicode"); }
+		bool mustUseUnicode() const { return (_encoding == "unicode"); }
+		bool mustUseLatin1() const { return (_encoding != "unicode"); }
 		TQString getEncoding() const { return _encoding; }
 		TQStringList getLanguagesList() const { return _languagesList; }
 		TQString getDefaultLanguage() const { return _defaultLanguage; }
diff --git a/filters/kspread/latex/export/document.h b/filters/kspread/latex/export/document.h
index b8f0296c..733310bc 100644
--- a/filters/kspread/latex/export/document.h
+++ b/filters/kspread/latex/export/document.h
@@ -24,7 +24,7 @@
 #define __KSPREAD_LATEX_DOCUMENT_H__
 
 #include <tqfile.h>			/* for TQFile class */
-#include <tqtextstream.h>	/* for TQTextStream class */
+#include <textstream.h>	/* for TQTextStream class */
 #include <tqstring.h>		/* for TQString class */
 
 #include "xmlparser.h"
diff --git a/filters/kspread/latex/export/fileheader.cc b/filters/kspread/latex/export/fileheader.cc
index 8ee9eee0..07b1fbe4 100644
--- a/filters/kspread/latex/export/fileheader.cc
+++ b/filters/kspread/latex/export/fileheader.cc
@@ -79,7 +79,7 @@ void FileHeader::analysePaper(const TQDomNode balise)
 	analysePaperParam(balise);
 
 	//setTokenCurrent(balise_initiale->pContent);
-	// Analyse tqchildren markups --> PAPERBORDERS
+	// Analyse children markups --> PAPERBORDERS
 	TQDomNode fils = getChild(balise, "PAPERSBORDERS");
 	_leftBorder = getAttr(fils, "left").toInt();
 	_rightBorder = getAttr(fils, "right").toInt();
@@ -282,7 +282,7 @@ void FileHeader::generatePackage(TQTextStream &out)
 	if(Config::instance()->mustUseUnicode())
 		out << "\\usepackage{omega}" << endl;
 	if(getFormat() == TF_A4)
-		out << "\\usepackage[a4paper]{tqgeometry}" << endl;
+		out << "\\usepackage[a4paper]{geometry}" << endl;
 	if(hasFooter() || hasHeader())
 		out << "\\usepackage{fancyhdr}" << endl;
 	if(hasColor())
diff --git a/filters/kspread/latex/export/fileheader.h b/filters/kspread/latex/export/fileheader.h
index 5c4e7774..1d9b6025 100644
--- a/filters/kspread/latex/export/fileheader.h
+++ b/filters/kspread/latex/export/fileheader.h
@@ -22,7 +22,7 @@
 #ifndef __KSPREAD_LATEX_FILEHEADER_H__
 #define __KSPREAD_LATEX_FILEHEADER_H__
 
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "xmlparser.h"
 
diff --git a/filters/kspread/latex/export/format.h b/filters/kspread/latex/export/format.h
index 7025c371..9b03a258 100644
--- a/filters/kspread/latex/export/format.h
+++ b/filters/kspread/latex/export/format.h
@@ -23,7 +23,7 @@
 #ifndef __KSPREAD_LATEX_FORMAT_H__
 #define __KSPREAD_LATEX_FORMAT_H__
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstring.h>
 #include <tqcolor.h>
 #include "xmlparser.h"
diff --git a/filters/kspread/latex/export/formula.h b/filters/kspread/latex/export/formula.h
index 03ba4bd6..b023cdf6 100644
--- a/filters/kspread/latex/export/formula.h
+++ b/filters/kspread/latex/export/formula.h
@@ -25,7 +25,7 @@
 
 #include "element.h"
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 /***********************************************************************/
 /* Class: Formula                                                      */
diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
index a7f03f60..7a058550 100644
--- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
+++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
@@ -69,7 +69,7 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare
 	TQString value;
 	while(i < 10)
 	{
-		/*value = _config->readPathEntry( TQString("Recent%1").tqarg(i) );
+		/*value = _config->readPathEntry( TQString("Recent%1").arg(i) );
 		kdDebug(30522) << "recent : " << value << endl;
 		if(!value.isEmpty())
 		{
@@ -99,7 +99,7 @@ KSpreadLatexExportDiaImpl::KSpreadLatexExportDiaImpl(KoStore* in, TQWidget* pare
   classComboBox->insertItem("report");
   classComboBox->insertItem("slides");
 
-	encodingComboBox->insertItem("tqunicode");
+	encodingComboBox->insertItem("unicode");
   encodingComboBox->insertItem("ansinew");
   encodingComboBox->insertItem("applemac");
   encodingComboBox->insertItem("ascii");
diff --git a/filters/kspread/latex/export/latexexport.cc b/filters/kspread/latex/export/latexexport.cc
index 66927728..c1cdd389 100644
--- a/filters/kspread/latex/export/latexexport.cc
+++ b/filters/kspread/latex/export/latexexport.cc
@@ -24,7 +24,7 @@
 #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <klocale.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include "kspreadlatexexportdiaImpl.h"
 
 typedef KGenericFactory<LATEXExport, KoFilter> LATEXExportFactory;
@@ -35,7 +35,7 @@ LATEXExport::LATEXExport(KoFilter *, const char *, const TQStringList&) :
                      KoFilter() {
 }
 
-KoFilter::ConversiontqStatus LATEXExport::convert( const TQCString& from, const TQCString& to )
+KoFilter::ConversionStatus LATEXExport::convert( const TQCString& from, const TQCString& to )
 {
     TQString config;
 
diff --git a/filters/kspread/latex/export/latexexport.h b/filters/kspread/latex/export/latexexport.h
index e7c0312b..4d34e0f0 100644
--- a/filters/kspread/latex/export/latexexport.h
+++ b/filters/kspread/latex/export/latexexport.h
@@ -21,7 +21,7 @@
 #define __LATEXEXPORT_H__
 
 #include <tqstring.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqfile.h>
 #include <tqobject.h>
 
@@ -38,7 +38,7 @@ class LATEXExport : public KoFilter
 		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/kspread/latex/export/latexexportdia.ui b/filters/kspread/latex/export/latexexportdia.ui
index 8c3835ed..741a9c7e 100644
--- a/filters/kspread/latex/export/latexexportdia.ui
+++ b/filters/kspread/latex/export/latexexportdia.ui
@@ -593,7 +593,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>0</height>
diff --git a/filters/kspread/latex/export/map.cc b/filters/kspread/latex/export/map.cc
index a2256d5e..886f6c11 100644
--- a/filters/kspread/latex/export/map.cc
+++ b/filters/kspread/latex/export/map.cc
@@ -46,7 +46,7 @@ void Map::analyse(const TQDomNode balise)
 	/* Analyse of the parameters */
 	kdDebug(30522) << "ANALYSE A MAP" << endl;
 
-	/* Analyse of the tqchildren markups */
+	/* Analyse of the children markups */
 	for(int index = 0; index < getNbChild(balise); index++)
 	{
 		// Only tables
diff --git a/filters/kspread/latex/export/pen.h b/filters/kspread/latex/export/pen.h
index 49da17e0..54792205 100644
--- a/filters/kspread/latex/export/pen.h
+++ b/filters/kspread/latex/export/pen.h
@@ -23,7 +23,7 @@
 #ifndef __KSPREAD_LATEX_PEN_H__
 #define __KSPREAD_LATEX_PEN_H__
 
-#include <tqtextstream.h>
+#include <textstream.h>
 #include <tqstring.h>
 #include <tqcolor.h>
 #include "xmlparser.h"
diff --git a/filters/kspread/latex/export/spreadsheet.h b/filters/kspread/latex/export/spreadsheet.h
index 03984105..dfc2f092 100644
--- a/filters/kspread/latex/export/spreadsheet.h
+++ b/filters/kspread/latex/export/spreadsheet.h
@@ -23,7 +23,7 @@
 #define __KSPREAD_LATEX_SPREADSHEET_H__
 
 #include <tqptrlist.h>
-#include <tqtextstream.h>
+#include <textstream.h>
 
 #include "map.h"
 #include "config.h"
diff --git a/filters/kspread/latex/export/xmlparser.cc b/filters/kspread/latex/export/xmlparser.cc
index 6b85f243..fb2c8e1f 100644
--- a/filters/kspread/latex/export/xmlparser.cc
+++ b/filters/kspread/latex/export/xmlparser.cc
@@ -89,18 +89,18 @@ bool XmlParser::isChild(TQDomNode balise, TQString name)
 TQDomNode XmlParser::getChild(TQDomNode balise, TQString name, int index)
 {
 	if(balise.isElement()) {
-		TQDomNodeList tqchildren = balise.toElement().elementsByTagName(name);
-		if ( tqchildren.count() )
-			return tqchildren.item(index);
+		TQDomNodeList children = balise.toElement().elementsByTagName(name);
+		if ( children.count() )
+			return children.item(index);
 	}
 	return TQDomNode();
 }
 
 TQDomNode XmlParser::getChild(TQDomNode balise, int index)
 {
-	TQDomNodeList tqchildren = balise.childNodes();
-	if ( tqchildren.count() )
-		return tqchildren.item(index);
+	TQDomNodeList children = balise.childNodes();
+	if ( children.count() )
+		return children.item(index);
 	return TQDomNode();
 }