Remove additional unneeded tq method conversions

8 files changed, 80 insertions, 80 deletions

diff --git a/kate/xmltools/html4-loose.dtd.xml b/kate/xmltools/html4-loose.dtd.xml
index 03505ae..f7b48d0 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  -- tqalignment char, e.g. char=':' --
-   charoff    CDATA       #IMPLIED  -- offset for tqalignment char --</text-expanded>
+   char       CDATA    #IMPLIED  -- alignment char, e.g. char=':' --
+   charoff    CDATA       #IMPLIED  -- offset for alignment char --</text-expanded>
 <text>align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED  -- tqalignment char, e.g. char=':' --
-   charoff    %Length;       #IMPLIED  -- offset for tqalignment char --</text>
+   char       %Character;    #IMPLIED  -- alignment char, e.g. char=':' --
+   charoff    %Length;       #IMPLIED  -- offset for alignment 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 tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -4909,8 +4909,8 @@
 <attlist name="TBODY">
 <attdecl>          -- table section --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment 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 tqalignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
   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 tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment 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 tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment 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 tqalignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
   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 --
-  tqshape       %Shape;        rect      -- for use with client-side image maps --
+  shape       %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="tqshape"
+<attribute name="shape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -6956,7 +6956,7 @@
 <attlist name="H1">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -7085,7 +7085,7 @@
 <attlist name="H2">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -7214,7 +7214,7 @@
 <attlist name="H3">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -7439,7 +7439,7 @@
 <attlist name="H4">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -7716,7 +7716,7 @@
 <attlist name="H5">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -8002,7 +8002,7 @@
 <attlist name="H6">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -8645,7 +8645,7 @@
 <attlist name="P">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   </attdecl>
 <attribute name="title"
            type="#IMPLIED"
@@ -9871,7 +9871,7 @@
 <attlist name="DIV">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %align;                              -- align, text tqalignment --
+  %align;                              -- align, text alignment --
   %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 tqalignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
   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 tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment 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 tqalignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
   height      %Length;       #IMPLIED  -- frame height --
   width       %Length;       #IMPLIED  -- frame width --
   </attdecl>
@@ -11742,7 +11742,7 @@
 <attlist name="AREA">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  tqshape       %Shape;        rect      -- controls interpretation of coords --
+  shape       %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="tqshape"
+<attribute name="shape"
            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 tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment 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 tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment 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 tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment 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 tqalignment --
+  align       %IAlign;       #IMPLIED  -- vertical or horizontal alignment --
   %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 063051f..bbcf853 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  -- tqalignment char, e.g. char=':' --
-   charoff    CDATA       #IMPLIED  -- offset for tqalignment char --</text-expanded>
+   char       CDATA    #IMPLIED  -- alignment char, e.g. char=':' --
+   charoff    CDATA       #IMPLIED  -- offset for alignment char --</text-expanded>
 <text>align      (left|center|right|justify|char) #IMPLIED
-   char       %Character;    #IMPLIED  -- tqalignment char, e.g. char=':' --
-   charoff    %Length;       #IMPLIED  -- offset for tqalignment char --</text>
+   char       %Character;    #IMPLIED  -- alignment char, e.g. char=':' --
+   charoff    %Length;       #IMPLIED  -- offset for alignment 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 tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -4148,8 +4148,8 @@
 <attlist name="TBODY">
 <attdecl>          -- table section --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -4253,8 +4253,8 @@
 <attlist name="TFOOT">
 <attdecl>          -- table section --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment 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 tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment 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 --
-  tqshape       %Shape;        rect      -- for use with client-side image maps --
+  shape       %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="tqshape"
+<attribute name="shape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -8923,8 +8923,8 @@
 <attlist name="THEAD">
 <attdecl>          -- table section --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -9624,7 +9624,7 @@
 <attlist name="AREA">
 <attdecl>
   %attrs;                              -- %coreattrs, %i18n, %events --
-  tqshape       %Shape;        rect      -- controls interpretation of coords --
+  shape       %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="tqshape"
+<attribute name="shape"
            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 tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment 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 tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
@@ -10751,8 +10751,8 @@
 <attlist name="TR">
 <attdecl>                           -- table row --
   %attrs;                              -- %coreattrs, %i18n, %events --
-  %cellhalign;                         -- horizontal tqalignment in cells --
-  %cellvalign;                         -- vertical tqalignment in cells --
+  %cellhalign;                         -- horizontal alignment in cells --
+  %cellvalign;                         -- vertical alignment in cells --
   </attdecl>
 <attribute name="onmouseout"
            type="#IMPLIED"
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index 734c257..f772aeb 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -466,7 +466,7 @@ 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.").tqarg( doctype ),
+            "will now be loaded.").arg( doctype ),
         i18n( "Loading XML Meta DTD" ),
         TQString::fromLatin1( "DTDAssigned") );
   }
@@ -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.").tqarg( m_urlString ),
+        "The server returned an error.").arg( m_urlString ),
         i18n( "XML Plugin Error") );
   }
   else
@@ -937,7 +937,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle
       --col;
     }
 
-    ushort ch = str.tqat( col).tqunicode();
+    ushort ch = str.at( 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.tqat( pos).tqunicode();
+              ch = tag.at( 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 99de846..b13c35f 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.").tqarg( metaDtdUrl ),
+        "Please check that the file is well-formed XML.").arg( 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.").tqarg( metaDtdUrl ),
+            "See the Kate Plugin documentation for more information.").arg( metaDtdUrl ),
         i18n("XML Plugin Error") );
     return;
   }
diff --git a/kate/xmltools/testcases.xml b/kate/xmltools/testcases.xml
index e66fc60..aa1e7dd 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 tqshape="">	circle, default, poly, rect
+	<area shape="">	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 73bf4bc..6530334 100644
--- a/kate/xmltools/xhtml1-frameset.dtd.xml
+++ b/kate/xmltools/xhtml1-frameset.dtd.xml
@@ -7533,7 +7533,7 @@
 <attdecl>
   %attrs;
   %focus;
-  tqshape       %Shape;        "rect"
+  shape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
   href        %URI;          #IMPLIED
   nohref      (nohref)       #IMPLIED
@@ -7608,7 +7608,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -12001,7 +12001,7 @@
   hreflang    %LanguageCode; #IMPLIED
   rel         %LinkTypes;    #IMPLIED
   rev         %LinkTypes;    #IMPLIED
-  tqshape       %Shape;        "rect"
+  shape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
   target      %FrameTarget;  #IMPLIED
   </attdecl>
@@ -12097,7 +12097,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
            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 850de19..907cd86 100644
--- a/kate/xmltools/xhtml1-strict.dtd.xml
+++ b/kate/xmltools/xhtml1-strict.dtd.xml
@@ -6190,7 +6190,7 @@
 <attdecl>
   %attrs;
   %focus;
-  tqshape       %Shape;        "rect"
+  shape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
   href        %URI;          #IMPLIED
   nohref      (nohref)       #IMPLIED
@@ -6260,7 +6260,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -9838,7 +9838,7 @@
   hreflang    %LanguageCode; #IMPLIED
   rel         %LinkTypes;    #IMPLIED
   rev         %LinkTypes;    #IMPLIED
-  tqshape       %Shape;        "rect"
+  shape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
   </attdecl>
 <attribute name="rev"
@@ -9929,7 +9929,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
            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 5f04e87..9506803 100644
--- a/kate/xmltools/xhtml1-transitional.dtd.xml
+++ b/kate/xmltools/xhtml1-transitional.dtd.xml
@@ -7600,7 +7600,7 @@
 <attdecl>
   %attrs;
   %focus;
-  tqshape       %Shape;        "rect"
+  shape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
   href        %URI;          #IMPLIED
   nohref      (nohref)       #IMPLIED
@@ -7675,7 +7675,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
            type=""
            enumeration="yes"
            value="rect circle poly default"
@@ -11940,7 +11940,7 @@
   hreflang    %LanguageCode; #IMPLIED
   rel         %LinkTypes;    #IMPLIED
   rev         %LinkTypes;    #IMPLIED
-  tqshape       %Shape;        "rect"
+  shape       %Shape;        "rect"
   coords      %Coords;       #IMPLIED
   target      %FrameTarget;  #IMPLIED
   </attdecl>
@@ -12036,7 +12036,7 @@
            type="#IMPLIED"
            value="CDATA"
            default=""/>
-<attribute name="tqshape"
+<attribute name="shape"
            type=""
            enumeration="yes"
            value="rect circle poly default"