8 files changed, 15 insertions, 15 deletions
diff --git a/filters/kword/latex/export/config.h b/filters/kword/latex/export/config.h
index 7a81b168d..1a87267cb 100644
--- a/filters/kword/latex/export/config.h
+++ b/filters/kword/latex/export/config.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/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc
index 28bb48bf4..145b30ed2 100644
--- a/filters/kword/latex/export/kwordlatexexportdia.cc
+++ b/filters/kword/latex/export/kwordlatexexportdia.cc
@@ -101,7 +101,7 @@ KWordLatexExportDia::KWordLatexExportDia(KoStore* in, TQWidget* parent,
   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/kword/latex/export/layout.h b/filters/kword/latex/export/layout.h
index 298b08ff4..f09ccb1c6 100644
--- a/filters/kword/latex/export/layout.h
+++ b/filters/kword/latex/export/layout.h
@@ -93,7 +93,7 @@ class Layout: public TextFormat
 		 * Nothing to do.
 		 */
 		virtual ~Layout() {
-			kdDebug(30522) << "Destruction of a tqlayout." << endl;
+			kdDebug(30522) << "Destruction of a layout." << endl;
 		}
 
 		/**
diff --git a/filters/kword/latex/export/para.cc b/filters/kword/latex/export/para.cc
index 4264d9c6c..9cc829b57 100644
--- a/filters/kword/latex/export/para.cc
+++ b/filters/kword/latex/export/para.cc
@@ -210,7 +210,7 @@ void Para::analyseInfo(const TQDomNode balise)
 /*******************************************/
 /* AnalyseLayoutPara                       */
 /*******************************************/
-/* Analyse the tqlayout of a para.           */
+/* Analyse the layout of a para.           */
 /* For each format, keep the type (picture,*/
 /* text, variable, footnote) and put the   */
 /* zone in a list.                         */
diff --git a/filters/kword/latex/export/textFrame.cc b/filters/kword/latex/export/textFrame.cc
index cdcbba6a6..d6141e966 100644
--- a/filters/kword/latex/export/textFrame.cc
+++ b/filters/kword/latex/export/textFrame.cc
@@ -217,7 +217,7 @@ void TextFrame::generate(TQTextStream &out)
 			lastPara->closeList(out, currentPara);
 			_lastTypeEnum = TL_NONE;
 		}
-		/* tqlayout management (left, center, justify, right) */
+		/* layout management (left, center, justify, right) */
 		if((!lastPara->isChapter() && _lastEnv != getNextEnv(_parags, _parags.at()) &&
 			lastPara->notEmpty()) ||
 			_lastEnv != getNextEnv(_parags, _parags.at()))
diff --git a/filters/kword/latex/export/textzone.cc b/filters/kword/latex/export/textzone.cc
index a4beb8757..0bf4e436e 100644
--- a/filters/kword/latex/export/textzone.cc
+++ b/filters/kword/latex/export/textzone.cc
@@ -1,4 +1,4 @@
-/* MEMO: to see the tqunicode table
+/* MEMO: to see the unicode table
  * xset +fp /usr/X11R6/lib/X11/fonts/ucs/
  * xfd -fn '-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1'
  */
@@ -85,7 +85,7 @@ bool TextZone::useFormat() const
 /*******************************************/
 /* escapeLatin1                            */
 /*******************************************/
-/* Convert special caracters (tqunicode) in  */
+/* Convert special caracters (unicode) in  */
 /* latex usable caracters.                 */
 /*******************************************/
 TQString TextZone::escapeLatin1(TQString text)
@@ -114,7 +114,7 @@ TQString TextZone::escapeLatin1(TQString text)
 	};
 
 	TQString escapedText;
-	int tqunicode;         /* the character to be escaped */
+	int unicode;         /* the character to be escaped */
 
 	escapedText = text;  /* copy input text */
 	
@@ -185,8 +185,8 @@ TQString TextZone::escapeLatin1(TQString text)
 
 	for(int index = 0; index < 64; index++)
 	{
-		tqunicode = CSTART + index;
-		convert(escapedText, tqunicode, escapes[index]);
+		unicode = CSTART + index;
+		convert(escapedText, unicode, escapes[index]);
 	}
 
 	convert(escapedText, 0X2020, "\\textdied{}");		/* textcomp */
@@ -259,12 +259,12 @@ TQString TextZone::escapeLatin1(TQString text)
 /* Convert all the instance of one         */
 /* character in latex usable caracter.     */
 /*******************************************/
-void TextZone::convert(TQString& text, int tqunicode, const char* escape)
+void TextZone::convert(TQString& text, int unicode, const char* escape)
 {
 	TQString expression;
 	TQString value;
 
-	expression = TQString("\\x") + value.setNum(tqunicode, 16);
+	expression = TQString("\\x") + value.setNum(unicode, 16);
 
 	if( !TQString(escape).isEmpty() )
 	{
diff --git a/filters/kword/latex/export/textzone.h b/filters/kword/latex/export/textzone.h
index fbc09280b..1d28c73f1 100644
--- a/filters/kword/latex/export/textzone.h
+++ b/filters/kword/latex/export/textzone.h
@@ -81,7 +81,7 @@ class TextZone: public TextFormat
 		/* ==== Helpfull functions ==== */
 
 		/**
-		 * convert a tqunicode text in latin1 enconding ala latex.
+		 * convert a unicode text in latin1 enconding ala latex.
 		 */
 		TQString escapeLatin1(TQString);
 		
diff --git a/filters/kword/latex/export/variablezone.cc b/filters/kword/latex/export/variablezone.cc
index 09a16635a..b73788b3e 100644
--- a/filters/kword/latex/export/variablezone.cc
+++ b/filters/kword/latex/export/variablezone.cc
@@ -1,4 +1,4 @@
-/* MEMO: to see the tqunicode table
+/* MEMO: to see the unicode table
  * xset +fp /usr/X11R6/lib/X11/fonts/ucs/
  * xfd -fn '-misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1'
  */