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

This reverts commit ca82971624269719d487c6f7980d7237f9420036.

25 files changed, 193 insertions, 193 deletions

diff --git a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
index 1ff5408..fc3bd57 100644
--- a/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
+++ b/kate/cppsymbolviewer/plugin_katesymbolviewer.cpp
@@ -47,7 +47,7 @@
 #include <kgenericfactory.h>
 #include <kfiledialog.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 
 K_EXPORT_COMPONENT_FACTORY( katecppsymbolviewerplugin, KGenericFactory<KatePluginSymbolViewer>( "katesymbolviewer" ) )
diff --git a/kate/filelistloader/katefll_initplugin.cpp b/kate/filelistloader/katefll_initplugin.cpp
index b98c308..882ff70 100644
--- a/kate/filelistloader/katefll_initplugin.cpp
+++ b/kate/filelistloader/katefll_initplugin.cpp
@@ -83,7 +83,7 @@ int InitPluginKateFileListLoader::initKate()
 			updateInit();
 			disconnect(this,TQT_SIGNAL(updateInit()),pl,TQT_SLOT(updateInit()));
 			
-/*      		int id = pl->metaObject()->findSlot( TQT_SLOT(updateInit()) );
+/*      		int id = pl->tqmetaObject()->findSlot( TQT_SLOT(updateInit()) );
 	        if ( id != -1 )
 		{
         		kdDebug()<<"Action slot was found, it will be called now"<<endl;
diff --git a/kate/filelistloader/katefll_plugin.cpp b/kate/filelistloader/katefll_plugin.cpp
index 5d59d5e..a499ef2 100644
--- a/kate/filelistloader/katefll_plugin.cpp
+++ b/kate/filelistloader/katefll_plugin.cpp
@@ -190,7 +190,7 @@ void PluginKateFileListLoader::slotSaveList()
     {
     /*  if (m_oldInitURL!=application()->initPluginManager()->initScript())
       {
-	switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Since the last time you saved the file list, Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").arg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()))
+	switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Since the last time you saved the file list, Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").tqarg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()))
         {
           case KMessageBox::Yes: save(); break;
           case KMessageBox::No: slotSaveListAs(); break;
@@ -203,7 +203,7 @@ void PluginKateFileListLoader::slotSaveList()
     {
       /*if (m_saveURL!=application()->initPluginManager()->initScript())
       {
-	switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").arg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()))
+	switch (KMessageBox::questionYesNoCancel(0,i18n("<qt>Kate has been reinitialized by another plugin other than the <B>File List Loader</B>. Do you still want to save the list to %1?</qt>").tqarg(m_saveURL.prettyURL()),TQString(),KStdGuiItem::save(),KStdGuiItem::discard()))
         {
           case KMessageBox::Yes: save(); break;
           case KMessageBox::No: slotSaveListAs(); break;
diff --git a/kate/filetemplates/plugin/filetemplates.cpp b/kate/filetemplates/plugin/filetemplates.cpp
index 5d1b4be..6f51e9b 100644
--- a/kate/filetemplates/plugin/filetemplates.cpp
+++ b/kate/filetemplates/plugin/filetemplates.cpp
@@ -55,7 +55,7 @@
 #include <tqdatetime.h>
 #include <tqdict.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqpopupmenu.h>
 #include <tqpushbutton.h>
@@ -381,7 +381,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
     if ( ! file.open( IO_ReadOnly ) )
     {
       KMessageBox::sorry( application()->activeMainWindow()->viewManager()->activeView(),
-                          i18n("<qt>Error opening the file<br><strong>%1</strong><br>for reading. The document will not be created.</qt>").arg(filename),
+                          i18n("<qt>Error opening the file<br><strong>%1</strong><br>for reading. The document will not be created.</qt>").tqarg(filename),
                           i18n("Template Plugin"), 0 );
       KIO::NetAccess::removeTempFile( tmpfile );
       return;
@@ -479,7 +479,7 @@ void KateFileTemplates::slotOpenTemplate( const KURL &url )
         count++;
 
     if ( docname.contains( "%1" ) )
-      docname = docname.arg( count );
+      docname = docname.tqarg( count );
 
     doc->setDocName( docname );
 
@@ -795,12 +795,12 @@ KateTemplateWizard::KateTemplateWizard( TQWidget *parent, KateFileTemplates *kft
       "edit the data in the KDE email information."), page ) );
 
   cbRRealname = new TQCheckBox( i18n("Replace full name '%1' with the "
-    "'%{fullname}' macro").arg( sFullname ), page );
+    "'%{fullname}' macro").tqarg( sFullname ), page );
   cbRRealname->setEnabled( ! sFullname.isEmpty() );
   lo->addWidget( cbRRealname );
 
   cbREmail = new TQCheckBox( i18n("Replace email address '%1' with the "
-      "'%email' macro").arg( sEmail ), page);
+      "'%email' macro").tqarg( sEmail ), page);
   cbREmail->setEnabled( ! sEmail.isEmpty() );
   lo->addWidget( cbREmail );
 
@@ -922,7 +922,7 @@ void KateTemplateWizard::accept()
       if ( KMessageBox::warningContinueCancel( this, i18n(
           "<p>The file <br><strong>'%1'</strong><br> already exists; if you "
           "do not want to overwrite it, change the template file name to "
-          "something else.").arg( templateUrl.prettyURL() ),
+          "something else.").tqarg( templateUrl.prettyURL() ),
       i18n("File Exists"), i18n("Overwrite") )
            == KMessageBox::Cancel )
         return;
@@ -976,7 +976,7 @@ void KateTemplateWizard::accept()
       {
         KMessageBox::sorry( this, i18n(
             "<qt>Error opening the file<br><strong>%1</strong><br>for reading. "
-            "The document will not be created</qt>").arg(u.prettyURL()),
+            "The document will not be created</qt>").tqarg(u.prettyURL()),
             i18n("Template Plugin"), 0 );
 
         KIO::NetAccess::removeTempFile( tmpfile );
@@ -1055,7 +1055,7 @@ void KateTemplateWizard::accept()
   {
     KMessageBox::sorry( this, i18n(
         "Unable to save the template to '%1'.\n\nThe template will be opened, "
-        "so you can save it from the editor.").arg( templateUrl.prettyURL() ),
+        "so you can save it from the editor.").tqarg( templateUrl.prettyURL() ),
         i18n("Save Failed") );
 
     kft->application()->activeMainWindow()->viewManager()->openURL( KURL() );
diff --git a/kate/insertcommand/plugin_kateinsertcommand.cpp b/kate/insertcommand/plugin_kateinsertcommand.cpp
index 9687b5e..813b36a 100644
--- a/kate/insertcommand/plugin_kateinsertcommand.cpp
+++ b/kate/insertcommand/plugin_kateinsertcommand.cpp
@@ -23,7 +23,7 @@
 #include <tqdir.h>
 #include <tqfile.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 #include <tqspinbox.h>
 #include <tqstringlist.h>
@@ -208,7 +208,7 @@ void PluginKateInsertCommand::slotShowWaitDlg()
 {
     if ( sh->isRunning() ) {
       wdlg = new WaitDlg( (TQWidget*)kv, i18n(
-        "Executing command:\n%1\n\nPress 'Cancel' to abort.").arg(cmd)  );
+        "Executing command:\n%1\n\nPress 'Cancel' to abort.").tqarg(cmd)  );
       connect(wdlg, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotAbort()) );
     }
     if ( sh->isRunning() )    // we may have finished while creating the dialog.
@@ -352,7 +352,7 @@ WaitDlg::WaitDlg(TQWidget* parent, const TQString& text, const TQString& title)
   setMainWidget( page );
   TQHBoxLayout *lo = new TQHBoxLayout( page, 0, spacingHint() );
 
-  KAnimWidget *aw = new KAnimWidget( TQString::fromLatin1("kde"), 48, page );
+  KAnimWidget *aw = new KAnimWidget( TQString::tqfromLatin1("kde"), 48, page );
   lo->addWidget(aw);
   TQLabel *l = new TQLabel( text, page );
   lo->addWidget( l );
diff --git a/kate/kjswrapper/bindings.cpp b/kate/kjswrapper/bindings.cpp
index 34bd1b0..9f49bcb 100644
--- a/kate/kjswrapper/bindings.cpp
+++ b/kate/kjswrapper/bindings.cpp
@@ -178,7 +178,7 @@ KJS::Value DocumentManager::call( KJS::ExecState *exec, KJS::Object &self, const
 		kdDebug()<<"calling illegal method of DocumentManager"<<endl;
 		return KJS::Null(); 
 	}
-            TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc);
+            TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc);
             KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() );
             exec->setException( err );
 	    return KJS::Undefined();
@@ -310,7 +310,7 @@ KJS::Value Kate::JS::Application::call( KJS::ExecState *exec, KJS::Object &self,
 
 
 	}
-            TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc);
+            TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc);
             KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() );
             exec->setException( err );
             return KJS::Undefined();
@@ -458,7 +458,7 @@ KJS::Value Kate::JS::MainWindow::call( KJS::ExecState *exec, KJS::Object &self,
 		default:
 		return KJS::Undefined();
 	}
-            TQString msg = i18n("Method %1 called with wrong signature").arg(mdesc);
+            TQString msg = i18n("Method %1 called with wrong signature").tqarg(mdesc);
             KJS::Object err = KJS::Error::create( exec, KJS::GeneralError, msg.utf8() );
             exec->setException( err );
             return KJS::Undefined();
diff --git a/kate/kjswrapper/plugin_katekjswrapper.cpp b/kate/kjswrapper/plugin_katekjswrapper.cpp
index e0d7056..d0cd8e5 100644
--- a/kate/kjswrapper/plugin_katekjswrapper.cpp
+++ b/kate/kjswrapper/plugin_katekjswrapper.cpp
@@ -29,7 +29,7 @@
 #include <kjs/object.h>
 #include <kgenericfactory.h>
 #include <kdebug.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kstandarddirs.h>
 #include <kate/mainwindow.h>
 #include <kate/toolviewmanager.h>
@@ -86,7 +86,7 @@ PluginKateKJSWrapper::PluginKateKJSWrapper( TQObject* parent, const char* name,
     w->show();
     //w->show();*/
     kdDebug()<<"m_scriptname="<<m_scriptname<<endl;
-    m_part->runFile(locate("appdata",TQString("plugins/%1/%2.js").arg(m_scriptname).arg(m_scriptname)));
+    m_part->runFile(locate("appdata",TQString("plugins/%1/%2.js").tqarg(m_scriptname).tqarg(m_scriptname)));
 //"/home/jowenn/development/kde/cvs/tdeaddons/kate/kjswrapper/samples/test1.js");
 }
 
@@ -343,7 +343,7 @@ void PluginKateKJSWrapper::addView(Kate::MainWindow *win)
     if (exec->hadException()) kdDebug()<<"void PluginKateKJSWrapper::addView(Kate::MainWindow *win): exec had an exception - 2"<<endl;
 
     view->setInstance (new KInstance("kate"));
-    view->setXMLFile(TQString("plugins/%1/%2.rc").arg(m_scriptname).arg(m_scriptname));
+    view->setXMLFile(TQString("plugins/%1/%2.rc").tqarg(m_scriptname).tqarg(m_scriptname));
     win->guiFactory()->addClient (view);
 }
 
diff --git a/kate/kpybrowser/kpybrowser.cpp b/kate/kpybrowser/kpybrowser.cpp
index 183e1e7..3ee96e5 100644
--- a/kate/kpybrowser/kpybrowser.cpp
+++ b/kate/kpybrowser/kpybrowser.cpp
@@ -286,7 +286,7 @@ KPyBrowser::parseText (TQString & pytext)
       line = &(*iter);
       if (class_rx.search(*line) >= 0)
 	{
-	  //KMessageBox::information(this, *line, TQString("Found class on line %1").arg(line_no));
+	  //KMessageBox::information(this, *line, TQString("Found class on line %1").tqarg(line_no));
 	  //strip out the beginning class and ending colon
 	  class_sig = line->stripWhiteSpace ().mid (6);
 	  class_sig = class_sig.left (class_sig.length () - 1);
@@ -318,7 +318,7 @@ KPyBrowser::parseText (TQString & pytext)
 	}
       if ((function_rx.search(*line) >= 0))
 	{
-	  //KMessageBox::information(this, *line, TQString("Found function on line %1").arg(line_no));
+	  //KMessageBox::information(this, *line, TQString("Found function on line %1").tqarg(line_no));
 	  function_sig = line->stripWhiteSpace ().mid (4);
 	  function_sig = function_sig.left (function_sig.find (":"));
 	  paren_i = function_sig.find ("(");
@@ -359,7 +359,7 @@ KPyBrowser::tip (const TQPoint & p, TQRect & r, TQString & str)
       str = "";
       return;
     }
-  r = itemRect (item);
+  r = tqitemRect (item);
   //r.setY(r.y() + 10);
 
   PyBrowseNode *browse_node = dynamic_cast < PyBrowseNode * >(item);
diff --git a/kate/kpybrowser/pybrowse_part.cpp b/kate/kpybrowser/pybrowse_part.cpp
index 4b8490c..4cd379c 100644
--- a/kate/kpybrowser/pybrowse_part.cpp
+++ b/kate/kpybrowser/pybrowse_part.cpp
@@ -104,7 +104,7 @@ void PluginViewPyBrowse::slotSelected(TQString name, int line)
   if (apiline == -1)
   {
           KMessageBox::information(0,
-                  i18n("Could not find method/class %1.").arg(name), i18n("Selection"));
+                  i18n("Could not find method/class %1.").tqarg(name), i18n("Selection"));
   }
   else
   {
diff --git a/kate/make/plugin_katemake.cpp b/kate/make/plugin_katemake.cpp
index 1cb4064..bda41f5 100644
--- a/kate/make/plugin_katemake.cpp
+++ b/kate/make/plugin_katemake.cpp
@@ -35,8 +35,8 @@
 #include <tqinputdialog.h>
 #include <tqregexp.h>
 #include <tqstring.h>
-#include <textstream.h>
-#include <palette.h>
+#include <tqtextstream.h>
+#include <tqpalette.h>
 #include <tqvbox.h>
 #include <tqlabel.h>
 
@@ -82,7 +82,7 @@ void PluginKateMake::addView(Kate::MainWindow *win)
 	Kate::ToolViewManager *viewmanager = win->toolViewManager();
 	TQWidget *w = viewmanager->createToolView("kate_plugin_make",
 			Kate::ToolViewManager::Bottom,
-			SmallIcon(TQString::fromLatin1("misc")),
+			SmallIcon(TQString::tqfromLatin1("misc")),
 			i18n("Make Output"));
 	PluginKateMakeView *view = new PluginKateMakeView (w,win,
 		"katemakeview");
@@ -132,7 +132,7 @@ public:
 			(lineno > 0 ? TQString::number(lineno) : TQString()),
 			message)
 	{
-		m_isError = !message.contains(TQString::fromLatin1("warning"));
+		m_isError = !message.contains(TQString::tqfromLatin1("warning"));
 		m_lineno = lineno;
 		m_serial = s_serial++;
 	} 
@@ -192,22 +192,22 @@ protected:
 
 TQString ErrorMessage::caption() const
 {
-	return TQString::fromLatin1("%1:%2").arg(text(COL_FILE)).arg(line());
+	return TQString::tqfromLatin1("%1:%2").tqarg(text(COL_FILE)).tqarg(line());
 }
 
 TQString ErrorMessage::fancyMessage() const
 {
-	TQString msg = TQString::fromLatin1("<qt>");
+	TQString msg = TQString::tqfromLatin1("<qt>");
 	if (isError())
 	{
-		msg.append(TQString::fromLatin1("<font color=\"red\">"));
+		msg.append(TQString::tqfromLatin1("<font color=\"red\">"));
 	}
 	msg.append(message());
 	if (isError())
 	{
-		msg.append(TQString::fromLatin1("</font>"));
+		msg.append(TQString::tqfromLatin1("</font>"));
 	}
-	msg.append(TQString::fromLatin1("<qt>"));
+	msg.append(TQString::tqfromLatin1("<qt>"));
 	return msg;
 }
 
@@ -350,7 +350,7 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent,
 		actionCollection(), "make_settings" );
 
 	setInstance(new KInstance("kate"));
-	setXMLFile(TQString::fromLatin1("plugins/katemake/ui.rc"));
+	setXMLFile(TQString::tqfromLatin1("plugins/katemake/ui.rc"));
 
 
 	setFocusPolicy(TQ_NoFocus);
@@ -379,7 +379,7 @@ PluginKateMakeView::PluginKateMakeView(TQWidget *parent,
 //	if (source_prefix.isEmpty())
 	{
 		filenameDetector = new TQRegExp(
-			TQString::fromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:"));
+			TQString::tqfromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:"));
 	}
 //	else
 	{
@@ -557,7 +557,7 @@ void PluginKateMakeView::slotClicked(TQListViewItem *item)
 			<< globalPos.x() << "," << globalPos.y() << endl;
 #if 0
 		KPassivePopup::message(
-			TQString::fromLatin1("%1:%2").arg(filename).arg(lineno),
+			TQString::tqfromLatin1("%1:%2").tqarg(filename).tqarg(lineno),
 			msg,
 			this);
 #else
@@ -644,12 +644,12 @@ bool PluginKateMakeView::slotValidate()
 		KMessageBox::sorry(0,
 			i18n("The file <i>%1</i> is not a local file. "
 				"Non-local files cannot be compiled.")
-				.arg(url.path()));
+				.tqarg(url.path()));
 		return false;
 	}
 
 	document_dir = TQFileInfo(url.path()).dirPath(true) +
-		TQString::fromLatin1("/");
+		TQString::tqfromLatin1("/");
 
 	if (document_dir.startsWith(source_prefix))
 	{
@@ -662,7 +662,7 @@ bool PluginKateMakeView::slotValidate()
 		make = KStandardDirs::findExe("make");
 	*m_proc << make;
 	if( make.isEmpty() || ! m_proc->start(KProcess::NotifyOnExit, KProcess::AllOutput) ) {
-		KMessageBox::error(0, i18n("<b>Error:</b> Failed to run %1.").arg(make.isEmpty() ?
+		KMessageBox::error(0, i18n("<b>Error:</b> Failed to run %1.").tqarg(make.isEmpty() ?
 			"make" : make));
 		return false;
 	}
@@ -717,7 +717,7 @@ void PluginKateMakeView::slotConfigure()
 		if (!filenameDetector)
 		{
 			filenameDetector = new TQRegExp(
-				TQString::fromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:"));
+				TQString::tqfromLatin1("[a-zA-Z0-9_\\.\\-]*\\.[chp]*:[0-9]*:"));
 		}
 	}
 	//else
diff --git a/kate/snippets/CWidgetSnippetsBase.ui b/kate/snippets/CWidgetSnippetsBase.ui
index 18a99c5..37c2aab 100644
--- a/kate/snippets/CWidgetSnippetsBase.ui
+++ b/kate/snippets/CWidgetSnippetsBase.ui
@@ -93,7 +93,7 @@
             </widget>
             <widget class="TQLayoutWidget">
                 <property name="name">
-                    <cstring>layout24</cstring>
+                    <cstring>tqlayout24</cstring>
                 </property>
                 <vbox>
                     <property name="name">
@@ -104,7 +104,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout11</cstring>
+                            <cstring>tqlayout11</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -156,7 +156,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>200</width>
                                         <height>20</height>
diff --git a/kate/snippets/plugin_katesnippets.cpp b/kate/snippets/plugin_katesnippets.cpp
index 8212f47..649b45d 100644
--- a/kate/snippets/plugin_katesnippets.cpp
+++ b/kate/snippets/plugin_katesnippets.cpp
@@ -171,7 +171,7 @@ void KatePluginSnippetsView::slot_lvSnippetsClicked (TQListViewItem  * item) {
       }
 
       sText.replace( TQRegExp("<mark/>"), sSelection );
-      sText.replace( TQRegExp("<date/>"), TQDate::currentDate().toString(Qt::LocalDate) );
+      sText.replace( TQRegExp("<date/>"), TQDate::tqcurrentDate().toString(Qt::LocalDate) );
       sText.replace( TQRegExp("<time/>"), TQTime::currentTime().toString(Qt::LocalDate) );
       kv->insertText ( sText );
     }
diff --git a/kate/snippets/plugin_katesnippets.h b/kate/snippets/plugin_katesnippets.h
index 05551b6..25c49a0 100644
--- a/kate/snippets/plugin_katesnippets.h
+++ b/kate/snippets/plugin_katesnippets.h
@@ -22,7 +22,7 @@
 #include <kconfig.h>
 #include <tqptrlist.h>
 #include <tqtoolbutton.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 #include <kiconloader.h>
 
 #include "csnippet.h"
diff --git a/kate/tabbarextension/plugin_katetabbarextension.cpp b/kate/tabbarextension/plugin_katetabbarextension.cpp
index 5d1ba79..2fd9378 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.cpp
+++ b/kate/tabbarextension/plugin_katetabbarextension.cpp
@@ -38,7 +38,7 @@
 #include <kfiledialog.h>
 
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqgroupbox.h>
 #include <tqcheckbox.h>
diff --git a/kate/tabbarextension/plugin_katetabbarextension.h b/kate/tabbarextension/plugin_katetabbarextension.h
index 3c92236..8fcf398 100644
--- a/kate/tabbarextension/plugin_katetabbarextension.h
+++ b/kate/tabbarextension/plugin_katetabbarextension.h
@@ -248,7 +248,7 @@ class KateTabBarExtension : public TQWidget
 
   private:
     KateTabBarButton* pCurrentTab;         ///< pointer to the current tab
-    TQBoxLayout* top;                       ///< layout that contains all tabs
+    TQBoxLayout* top;                       ///< tqlayout that contains all tabs
     Kate::MainWindow* m_win;               ///< pointer to the main window
     Kate::DocumentManager* m_docManager;   ///< pointer to the document manager
 //    TQPtrList <KateTabBarButton> m_tabs;    ///< list containing all tabs
diff --git a/kate/xmlcheck/plugin_katexmlcheck.cpp b/kate/xmlcheck/plugin_katexmlcheck.cpp
index 6b0474b..b1a0ea3 100644
--- a/kate/xmlcheck/plugin_katexmlcheck.cpp
+++ b/kate/xmlcheck/plugin_katexmlcheck.cpp
@@ -38,7 +38,7 @@
 #include <tqinputdialog.h>
 #include <tqregexp.h>
 #include <tqstring.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #include <kaction.h>
 #include <kcursor.h>
@@ -120,7 +120,7 @@ PluginKateXMLCheckView::PluginKateXMLCheckView(TQWidget *parent,Kate::MainWindow
 	setResizeMode(TQListView::LastColumn);
 	connect(this, TQT_SIGNAL(clicked(TQListViewItem *)), TQT_SLOT(slotClicked(TQListViewItem *)));
 
-/* TODO?: invalidate the listview when document has changed
+/* TODO?: tqinvalidate the listview when document has changed
 	Kate::View *kv = application()->activeMainWindow()->viewManager()->activeView();
 	if( ! kv ) {
 		kdDebug() << "Warning: no Kate::View" << endl;
@@ -280,7 +280,7 @@ bool PluginKateXMLCheckView::slotValidate()
 	if( m_tmp_file->status() != 0 ) {
 		kdDebug() << "Error (slotValidate()): could not create '" << m_tmp_file->name() << "': " << m_tmp_file->status() << endl;
 		KMessageBox::error(0, i18n("<b>Error:</b> Could not create "
-			"temporary file '%1'.").arg(m_tmp_file->name()));
+			"temporary file '%1'.").tqarg(m_tmp_file->name()));
 		delete m_tmp_file;
 		m_tmp_file=0L;
 		return false;
diff --git a/kate/xmltools/html4-loose.dtd.xml b/kate/xmltools/html4-loose.dtd.xml
index f7b48d0..03505ae 100644
--- a/kate/xmltools/html4-loose.dtd.xml
+++ b/kate/xmltools/html4-loose.dtd.xml
@@ -689,11 +689,11 @@
         type="param"
 >
 <text-expanded>align      (left|center|right|justify|char) #IMPLIED
-   char       CDATA    #IMPLIED  -- alignment char, e.g. char=':' --
-   charoff    CDATA       #IMPLIED  -- offset for alignment char --</text-expanded>
+   char       CDATA    #IMPLIED  -- tqalignment char, e.g. char=':' --
+   charoff    CDATA       #IMPLIED  -- offset for tqalignment char --</text-expanded>
 <text>align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED  -- alignment char, e.g. char=':' --
-   charoff    %Length;       #IMPLIED  -- offset for alignment char --</text>
+   char       %Character;    #IMPLIED  -- tqalignment char, e.g. char=':' --
+   charoff    %Length;       #IMPLIED  -- offset for tqalignment char --</text>
 </entity>
 
 <entity name="pre.exclusion"
@@ -3621,8 +3621,8 @@
   %attrs;                              -- %coreattrs, %i18n, %events --
   span        NUMBER         1         -- default number of columns in group --
   width       %MultiLength;  #IMPLIED  -- default width for enclosed COLs --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
+  %cellhalign;                         -- horizontal tqalignment in cells --
+  %cellvalign;                         -- vertical tqalignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -4909,8 +4909,8 @@
 <attlist name="TBODY">
 <attdecl>          -- table section --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
+  %cellhalign;                         -- horizontal tqalignment in cells --
+  %cellvalign;                         -- vertical tqalignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -5086,7 +5086,7 @@
   name        CDATA          #IMPLIED  -- allows applets to find each other --
   width       %Length;       #REQUIRED -- initial width --
   height      %Length;       #REQUIRED -- initial height --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal tqalignment --
   hspace      %Pixels;       #IMPLIED  -- horizontal gutter --
   vspace      %Pixels;       #IMPLIED  -- vertical gutter --
   </attdecl>
@@ -5170,8 +5170,8 @@
 <attlist name="TFOOT">
 <attdecl>          -- table section --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
+  %cellhalign;                         -- horizontal tqalignment in cells --
+  %cellvalign;                         -- vertical tqalignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -5683,8 +5683,8 @@
   %attrs;                              -- %coreattrs, %i18n, %events --
   span        NUMBER         1         -- COL attributes affect N columns --
   width       %MultiLength;  #IMPLIED  -- column width specification --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
+  %cellhalign;                         -- horizontal tqalignment in cells --
+  %cellvalign;                         -- vertical tqalignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -6457,7 +6457,7 @@
   width       %Length;       #IMPLIED  -- override width --
   usemap      %URI;          #IMPLIED  -- use client-side image map --
   ismap       (ismap)        #IMPLIED  -- use server-side image map --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal tqalignment --
   border      %Pixels;       #IMPLIED  -- link border width --
   hspace      %Pixels;       #IMPLIED  -- horizontal gutter --
   vspace      %Pixels;       #IMPLIED  -- vertical gutter --
@@ -6648,7 +6648,7 @@
   rel         %LinkTypes;    #IMPLIED  -- forward link types --
   rev         %LinkTypes;    #IMPLIED  -- reverse link types --
   accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  shape       %Shape;        rect      -- for use with client-side image maps --
+  tqshape       %Shape;        rect      -- for use with client-side image maps --
   coords      %Coords;       #IMPLIED  -- for use with client-side image maps --
   tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
   onfocus     %Script;       #IMPLIED  -- the element got the focus --
@@ -6742,7 +6742,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="shape"
+<attribute name="tqshape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -6956,7 +6956,7 @@
 <attlist name="H1">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text alignment --
+  %align;                              -- align, text tqalignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -7085,7 +7085,7 @@
 <attlist name="H2">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text alignment --
+  %align;                              -- align, text tqalignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -7214,7 +7214,7 @@
 <attlist name="H3">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text alignment --
+  %align;                              -- align, text tqalignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -7439,7 +7439,7 @@
 <attlist name="H4">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text alignment --
+  %align;                              -- align, text tqalignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -7716,7 +7716,7 @@
 <attlist name="H5">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text alignment --
+  %align;                              -- align, text tqalignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -8002,7 +8002,7 @@
 <attlist name="H6">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text alignment --
+  %align;                              -- align, text tqalignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -8645,7 +8645,7 @@
 <attlist name="P">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text alignment --
+  %align;                              -- align, text tqalignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -9871,7 +9871,7 @@
 <attlist name="DIV">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text alignment --
+  %align;                              -- align, text tqalignment --
   %reserved;                           -- reserved for possible future use --
   </attdecl>
 <attribute name="title"
@@ -10579,7 +10579,7 @@
   usemap      %URI;          #IMPLIED  -- use client-side image map --
   name        CDATA          #IMPLIED  -- submit as part of form --
   tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal tqalignment --
   border      %Pixels;       #IMPLIED  -- link border width --
   hspace      %Pixels;       #IMPLIED  -- horizontal gutter --
   vspace      %Pixels;       #IMPLIED  -- vertical gutter --
@@ -10824,8 +10824,8 @@
 <attlist name="THEAD">
 <attdecl>          -- table section --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
+  %cellhalign;                         -- horizontal tqalignment in cells --
+  %cellvalign;                         -- vertical tqalignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -11505,7 +11505,7 @@
   marginwidth %Pixels;       #IMPLIED  -- margin widths in pixels --
   marginheight %Pixels;      #IMPLIED  -- margin height in pixels --
   scrolling   (yes|no|auto)  auto      -- scrollbar or none --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal tqalignment --
   height      %Length;       #IMPLIED  -- frame height --
   width       %Length;       #IMPLIED  -- frame width --
   </attdecl>
@@ -11742,7 +11742,7 @@
 <attlist name="AREA">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  shape       %Shape;        rect      -- controls interpretation of coords --
+  tqshape       %Shape;        rect      -- controls interpretation of coords --
   coords      %Coords;       #IMPLIED  -- comma-separated list of lengths --
   href        %URI;          #IMPLIED  -- URI for linked resource --
   target      %FrameTarget;  #IMPLIED  -- render in this frame --
@@ -11817,7 +11817,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="shape"
+<attribute name="tqshape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -12054,8 +12054,8 @@
   scope       %Scope;        #IMPLIED  -- scope covered by header cells --
   rowspan     NUMBER         1         -- number of rows spanned by cell --
   colspan     NUMBER         1         -- number of cols spanned by cell --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
+  %cellhalign;                         -- horizontal tqalignment in cells --
+  %cellvalign;                         -- vertical tqalignment in cells --
   nowrap      (nowrap)       #IMPLIED  -- suppress word wrap --
   bgcolor     %Color;        #IMPLIED  -- cell background color --
   width       %Length;       #IMPLIED  -- width for cell --
@@ -12476,8 +12476,8 @@
   scope       %Scope;        #IMPLIED  -- scope covered by header cells --
   rowspan     NUMBER         1         -- number of rows spanned by cell --
   colspan     NUMBER         1         -- number of cols spanned by cell --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
+  %cellhalign;                         -- horizontal tqalignment in cells --
+  %cellvalign;                         -- vertical tqalignment in cells --
   nowrap      (nowrap)       #IMPLIED  -- suppress word wrap --
   bgcolor     %Color;        #IMPLIED  -- cell background color --
   width       %Length;       #IMPLIED  -- width for cell --
@@ -13024,8 +13024,8 @@
 <attlist name="TR">
 <attdecl>                           -- table row --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
+  %cellhalign;                         -- horizontal tqalignment in cells --
+  %cellvalign;                         -- vertical tqalignment in cells --
   bgcolor     %Color;        #IMPLIED  -- background color for row --
   </attdecl>
 <attribute name="onmouseout"
@@ -13339,7 +13339,7 @@
   onselect    %Script;       #IMPLIED  -- some text was selected --
   onchange    %Script;       #IMPLIED  -- the element value was changed --
   accept      %ContentTypes; #IMPLIED  -- list of MIME types for file upload --
-  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal tqalignment --
   %reserved;                           -- reserved for possible future use --
   </attdecl>
 <attribute name="accesskey"
diff --git a/kate/xmltools/html4-strict.dtd.xml b/kate/xmltools/html4-strict.dtd.xml
index bbcf853..063051f 100644
--- a/kate/xmltools/html4-strict.dtd.xml
+++ b/kate/xmltools/html4-strict.dtd.xml
@@ -594,11 +594,11 @@
         type="param"
 >
 <text-expanded>align      (left|center|right|justify|char) #IMPLIED
-   char       CDATA    #IMPLIED  -- alignment char, e.g. char=':' --
-   charoff    CDATA       #IMPLIED  -- offset for alignment char --</text-expanded>
+   char       CDATA    #IMPLIED  -- tqalignment char, e.g. char=':' --
+   charoff    CDATA       #IMPLIED  -- offset for tqalignment char --</text-expanded>
 <text>align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED  -- alignment char, e.g. char=':' --
-   charoff    %Length;       #IMPLIED  -- offset for alignment char --</text>
+   char       %Character;    #IMPLIED  -- tqalignment char, e.g. char=':' --
+   charoff    %Length;       #IMPLIED  -- offset for tqalignment char --</text>
 </entity>
 
 <entity name="pre.exclusion"
@@ -3127,8 +3127,8 @@
   %attrs;                              -- %coreattrs, %i18n, %events --
   span        NUMBER         1         -- default number of columns in group --
   width       %MultiLength;  #IMPLIED  -- default width for enclosed COLs --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
+  %cellhalign;                         -- horizontal tqalignment in cells --
+  %cellvalign;                         -- vertical tqalignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -4148,8 +4148,8 @@
 <attlist name="TBODY">
 <attdecl>          -- table section --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
+  %cellhalign;                         -- horizontal tqalignment in cells --
+  %cellvalign;                         -- vertical tqalignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -4253,8 +4253,8 @@
 <attlist name="TFOOT">
 <attdecl>          -- table section --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
+  %cellhalign;                         -- horizontal tqalignment in cells --
+  %cellvalign;                         -- vertical tqalignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -4734,8 +4734,8 @@
   %attrs;                              -- %coreattrs, %i18n, %events --
   span        NUMBER         1         -- COL attributes affect N columns --
   width       %MultiLength;  #IMPLIED  -- column width specification --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
+  %cellhalign;                         -- horizontal tqalignment in cells --
+  %cellvalign;                         -- vertical tqalignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -5636,7 +5636,7 @@
   rel         %LinkTypes;    #IMPLIED  -- forward link types --
   rev         %LinkTypes;    #IMPLIED  -- reverse link types --
   accesskey   %Character;    #IMPLIED  -- accessibility key character --
-  shape       %Shape;        rect      -- for use with client-side image maps --
+  tqshape       %Shape;        rect      -- for use with client-side image maps --
   coords      %Coords;       #IMPLIED  -- for use with client-side image maps --
   tabindex    NUMBER         #IMPLIED  -- position in tabbing order --
   onfocus     %Script;       #IMPLIED  -- the element got the focus --
@@ -5726,7 +5726,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="shape"
+<attribute name="tqshape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -8923,8 +8923,8 @@
 <attlist name="THEAD">
 <attdecl>          -- table section --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
+  %cellhalign;                         -- horizontal tqalignment in cells --
+  %cellvalign;                         -- vertical tqalignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -9624,7 +9624,7 @@
 <attlist name="AREA">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  shape       %Shape;        rect      -- controls interpretation of coords --
+  tqshape       %Shape;        rect      -- controls interpretation of coords --
   coords      %Coords;       #IMPLIED  -- comma-separated list of lengths --
   href        %URI;          #IMPLIED  -- URI for linked resource --
   nohref      (nohref)       #IMPLIED  -- this region has no action --
@@ -9694,7 +9694,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="shape"
+<attribute name="tqshape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -9919,8 +9919,8 @@
   scope       %Scope;        #IMPLIED  -- scope covered by header cells --
   rowspan     NUMBER         1         -- number of rows spanned by cell --
   colspan     NUMBER         1         -- number of cols spanned by cell --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
+  %cellhalign;                         -- horizontal tqalignment in cells --
+  %cellvalign;                         -- vertical tqalignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -10250,8 +10250,8 @@
   scope       %Scope;        #IMPLIED  -- scope covered by header cells --
   rowspan     NUMBER         1         -- number of rows spanned by cell --
   colspan     NUMBER         1         -- number of cols spanned by cell --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
+  %cellhalign;                         -- horizontal tqalignment in cells --
+  %cellvalign;                         -- vertical tqalignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -10751,8 +10751,8 @@
 <attlist name="TR">
 <attdecl>                           -- table row --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal alignment in cells --
-  %cellvalign;                         -- vertical alignment in cells --
+  %cellhalign;                         -- horizontal tqalignment in cells --
+  %cellvalign;                         -- vertical tqalignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
diff --git a/kate/xmltools/kde-docbook.dtd.xml b/kate/xmltools/kde-docbook.dtd.xml
index 11282d5..4d10a26 100644
--- a/kate/xmltools/kde-docbook.dtd.xml
+++ b/kate/xmltools/kde-docbook.dtd.xml
@@ -4451,7 +4451,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -4881,7 +4881,7 @@
 <attribute name="align" type="#IMPLIED" enumeration="yes" value="left right center" default=""/>
 <attribute name="role" type="#IMPLIED" value="CDATA" default=""/>
 </attlist>
-<element name="literallayout">
+<element name="literaltqlayout">
 <content-model-expanded>
   
 <or-group occurrence="*">
@@ -4989,7 +4989,7 @@
 </or-group>
 </content-model-expanded>
 </element>
-<attlist name="literallayout">
+<attlist name="literaltqlayout">
 <attribute name="lang" type="#IMPLIED" enumeration="yes" value="af az bg bo br bs ca cs cy da de el en en-GB en-US eo es et eu fa fi fo fr ga gl he hi hr hu id is it ja kn ko lt lv mi mk mt nl no nb nn nso oc pl pt pt-BR pt-PT ro ru si sk sl sr st sv ta te tg th tr uk vi x-wa xh zh zh-CN zh-TW zu" default=""/>
 <attribute name="width" type="#IMPLIED" value="CDATA" default=""/>
 <attribute name="format" type="" enumeration="notation" value="linespecific" default="linespecific"/>
@@ -5048,7 +5048,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -5267,7 +5267,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -5488,7 +5488,7 @@
   
 <sequence-group>
 <or-group occurrence="+">
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -5549,7 +5549,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -5668,7 +5668,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -7472,7 +7472,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -7665,7 +7665,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -7779,7 +7779,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -8025,7 +8025,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -8228,7 +8228,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -8754,7 +8754,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -8900,7 +8900,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -9601,7 +9601,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -9673,7 +9673,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -9754,7 +9754,7 @@
 <element-name name="titleabbrev" occurrence="?"/>
 </sequence-group>
 <or-group occurrence="+">
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -10513,7 +10513,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -10641,7 +10641,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -10703,7 +10703,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -10768,7 +10768,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -11281,7 +11281,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -11602,7 +11602,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -12033,7 +12033,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -12701,7 +12701,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -12847,7 +12847,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -13607,7 +13607,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -13758,7 +13758,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -13863,7 +13863,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -14187,7 +14187,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -14679,7 +14679,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -14795,7 +14795,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -14911,7 +14911,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -15027,7 +15027,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -15143,7 +15143,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -15237,7 +15237,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -16199,7 +16199,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -16287,7 +16287,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -16372,7 +16372,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -17314,7 +17314,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -17401,7 +17401,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -17478,7 +17478,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -17764,7 +17764,7 @@
   
 <element-name name="warning"/>
   
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
   
 <element-name name="programlisting"/>
   
@@ -17811,7 +17811,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -18170,7 +18170,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -18403,7 +18403,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -18671,7 +18671,7 @@
   
 <element-name name="simplelist"/>
   
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
   
 <element-name name="programlisting"/>
   
@@ -18776,7 +18776,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -19127,7 +19127,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -19517,7 +19517,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -19620,7 +19620,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -19897,7 +19897,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -20298,7 +20298,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -20626,7 +20626,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -21006,7 +21006,7 @@
 <element-name name="segmentedlist"/>
 <element-name name="simplelist"/>
 <element-name name="variablelist"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
@@ -21077,7 +21077,7 @@
 <element-name name="note"/>
 <element-name name="tip"/>
 <element-name name="warning"/>
-<element-name name="literallayout"/>
+<element-name name="literaltqlayout"/>
 <element-name name="programlisting"/>
 <element-name name="programlistingco"/>
 <element-name name="screen"/>
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index d322282..ce53476 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -63,7 +63,7 @@ TODO:
  but then at <xsl:template match="/"><html> it will only show you HTML elements!
 =>So better "Assign meta DTD" and "Add meta DTD", the latter will expand the current meta DTD
 -Option to insert empty element in <empty/> form
--Show expanded entities with TQChar::TQChar( int rc ) + unicode font
+-Show expanded entities with TQChar::TQChar( int rc ) + tqunicode font
 -Don't ignore entities defined in the document's prologue
 -Only offer 'valid' elements, i.e. don't take the elements as a set but check
  if the DTD is matched ( order, number of occurences, ... )
@@ -81,7 +81,7 @@ TODO:
 #include <tqdatetime.h>
 #include <tqdom.h>
 #include <tqfile.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlistbox.h>
 #include <tqprogressdialog.h>
 #include <tqpushbutton.h>
@@ -466,9 +466,9 @@ void PluginKateXMLTools::getDTD()
     url.setFileName( defaultDir + filename );
     KMessageBox::information(0, i18n("The current file has been identified "
         "as a document of type \"%1\". The meta DTD for this document type "
-            "will now be loaded.").arg( doctype ),
+            "will now be loaded.").tqarg( doctype ),
         i18n( "Loading XML Meta DTD" ),
-        TQString::fromLatin1( "DTDAssigned") );
+        TQString::tqfromLatin1( "DTDAssigned") );
   }
 
   if( url.isEmpty() )
@@ -503,7 +503,7 @@ void PluginKateXMLTools::slotFinished( KIO::Job *job )
   {
     // catch failed loading loading via http:
     KMessageBox::error(0, i18n("The file '%1' could not be opened. "
-        "The server returned an error.").arg( m_urlString ),
+        "The server returned an error.").tqarg( m_urlString ),
         i18n( "XML Plugin Error") );
   }
   else
@@ -937,7 +937,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle
       --col;
     }
 
-    ushort ch = str.at( col).unicode();
+    ushort ch = str.tqat( col).tqunicode();
 
     switch( parseState )
     {
@@ -981,7 +981,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle
 
             TQString tag = str.mid( col + 1 );
             for( uint pos = 0, len = tag.length(); pos < len; ++pos ) {
-              ch = tag.at( pos).unicode();
+              ch = tag.tqat( pos).tqunicode();
               if( ch == ' ' || ch == '\t' || ch == '>' ) {
                 tag.truncate( pos );
                 break;
diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp
index af66188..99de846 100644
--- a/kate/xmltools/pseudo_dtd.cpp
+++ b/kate/xmltools/pseudo_dtd.cpp
@@ -46,7 +46,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd )
   if ( ! doc.setContent( metaDtd) )
   {
     KMessageBox::error(0, i18n("The file '%1' could not be parsed. "
-        "Please check that the file is well-formed XML.").arg( metaDtdUrl ),
+        "Please check that the file is well-formed XML.").tqarg( metaDtdUrl ),
         i18n( "XML Plugin Error") );
     return;
   }
@@ -57,7 +57,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd )
         "Please check that the file is of this type:\n"
             "-//Norman Walsh//DTD DTDParse V2.0//EN\n"
             "You can produce such files with dtdparse. "
-            "See the Kate Plugin documentation for more information.").arg( metaDtdUrl ),
+            "See the Kate Plugin documentation for more information.").tqarg( metaDtdUrl ),
         i18n("XML Plugin Error") );
     return;
   }
@@ -410,7 +410,7 @@ bool PseudoDTD::parseEntities( TQDomDocument *doc, TQProgressDialog *progress )
       {
         TQString exp = expandedElem.text();
         // TODO: support more than one &#...; in the expanded text
-        /* TODO include do this when the unicode font problem is solved:
+        /* TODO include do this when the tqunicode font problem is solved:
         if( exp.contains(TQRegExp("^&#x[a-zA-Z0-9]+;$")) ) {
         // hexadecimal numbers, e.g. "&#x236;"
         uint end = exp.find( ";" );
@@ -445,7 +445,7 @@ TQStringList PseudoDTD::entities( TQString start )
     if( (*it).startsWith(start) )
     {
       TQString str = it.key();
-      /* TODO: show entities as unicode character
+      /* TODO: show entities as tqunicode character
       if( !it.data().isEmpty() ) {
       //str += " -- " + it.data();
       TQRegExp re( "&#(\\d+);" );
diff --git a/kate/xmltools/testcases.xml b/kate/xmltools/testcases.xml
index aa1e7dd..e66fc60 100644
--- a/kate/xmltools/testcases.xml
+++ b/kate/xmltools/testcases.xml
@@ -40,7 +40,7 @@ the current cursor position, replacing the old value:
 	<td align="">	center, char, justify, left, right
 	<td valign="">	baseline, bottom, middle, top
 	<td valign="foobar"> -- "foobar" should be replaced
-	<area shape="">	circle, default, poly, rect
+	<area tqshape="">	circle, default, poly, rect
 	<area foobar="">	(no predefined values)
 
 6. Type "&". A list with named entities should appear. Select one and
diff --git a/kate/xmltools/xhtml1-frameset.dtd.xml b/kate/xmltools/xhtml1-frameset.dtd.xml
index 6530334..73bf4bc 100644
--- a/kate/xmltools/xhtml1-frameset.dtd.xml
+++ b/kate/xmltools/xhtml1-frameset.dtd.xml
@@ -7533,7 +7533,7 @@
 <attdecl>
   %attrs;
   %focus;
-  shape       %Shape;        "rect"
+  tqshape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
   href        %URI;          #IMPLIED
   nohref      (nohref)       #IMPLIED
@@ -7608,7 +7608,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="shape"
+<attribute name="tqshape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -12001,7 +12001,7 @@
   hreflang    %LanguageCode; #IMPLIED
   rel         %LinkTypes;    #IMPLIED
   rev         %LinkTypes;    #IMPLIED
-  shape       %Shape;        "rect"
+  tqshape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
   target      %FrameTarget;  #IMPLIED
   </attdecl>
@@ -12097,7 +12097,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="shape"
+<attribute name="tqshape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
diff --git a/kate/xmltools/xhtml1-strict.dtd.xml b/kate/xmltools/xhtml1-strict.dtd.xml
index 907cd86..850de19 100644
--- a/kate/xmltools/xhtml1-strict.dtd.xml
+++ b/kate/xmltools/xhtml1-strict.dtd.xml
@@ -6190,7 +6190,7 @@
 <attdecl>
   %attrs;
   %focus;
-  shape       %Shape;        "rect"
+  tqshape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
   href        %URI;          #IMPLIED
   nohref      (nohref)       #IMPLIED
@@ -6260,7 +6260,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="shape"
+<attribute name="tqshape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -9838,7 +9838,7 @@
   hreflang    %LanguageCode; #IMPLIED
   rel         %LinkTypes;    #IMPLIED
   rev         %LinkTypes;    #IMPLIED
-  shape       %Shape;        "rect"
+  tqshape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
   </attdecl>
 <attribute name="rev"
@@ -9929,7 +9929,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="shape"
+<attribute name="tqshape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
diff --git a/kate/xmltools/xhtml1-transitional.dtd.xml b/kate/xmltools/xhtml1-transitional.dtd.xml
index 9506803..5f04e87 100644
--- a/kate/xmltools/xhtml1-transitional.dtd.xml
+++ b/kate/xmltools/xhtml1-transitional.dtd.xml
@@ -7600,7 +7600,7 @@
 <attdecl>
   %attrs;
   %focus;
-  shape       %Shape;        "rect"
+  tqshape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
   href        %URI;          #IMPLIED
   nohref      (nohref)       #IMPLIED
@@ -7675,7 +7675,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="shape"
+<attribute name="tqshape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -11940,7 +11940,7 @@
   hreflang    %LanguageCode; #IMPLIED
   rel         %LinkTypes;    #IMPLIED
   rev         %LinkTypes;    #IMPLIED
-  shape       %Shape;        "rect"
+  tqshape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
   target      %FrameTarget;  #IMPLIED
   </attdecl>
@@ -12036,7 +12036,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="shape"
+<attribute name="tqshape"
            type=""
            enumeration="yes"
            value="rect circle poly default"