summaryrefslogtreecommitdiffstats
path: root/kate/xmltools
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:12 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:12 -0600
commit6b45a7b7b2a804ccb2d522eb9ba6423fedb59b8f (patch)
treea08b27e3f4fde1ed82a5f061a2725998e8012f93 /kate/xmltools
parentca82971624269719d487c6f7980d7237f9420036 (diff)
downloadtdeaddons-6b45a7b7b2a804ccb2d522eb9ba6423fedb59b8f.tar.gz
tdeaddons-6b45a7b7b2a804ccb2d522eb9ba6423fedb59b8f.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit ca82971624269719d487c6f7980d7237f9420036.
Diffstat (limited to 'kate/xmltools')
-rw-r--r--kate/xmltools/html4-loose.dtd.xml74
-rw-r--r--kate/xmltools/html4-strict.dtd.xml48
-rw-r--r--kate/xmltools/kde-docbook.dtd.xml114
-rw-r--r--kate/xmltools/plugin_katexmltools.cpp14
-rw-r--r--kate/xmltools/pseudo_dtd.cpp8
-rw-r--r--kate/xmltools/testcases.xml2
-rw-r--r--kate/xmltools/xhtml1-frameset.dtd.xml8
-rw-r--r--kate/xmltools/xhtml1-strict.dtd.xml8
-rw-r--r--kate/xmltools/xhtml1-transitional.dtd.xml8
9 files changed, 142 insertions, 142 deletions
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"