diff options
Diffstat (limited to 'kate/xmltools')
-rw-r--r-- | kate/xmltools/html4-loose.dtd.xml | 74 | ||||
-rw-r--r-- | kate/xmltools/html4-strict.dtd.xml | 48 | ||||
-rw-r--r-- | kate/xmltools/kde-docbook.dtd.xml | 118 | ||||
-rw-r--r-- | kate/xmltools/plugin_katexmltools.cpp | 82 | ||||
-rw-r--r-- | kate/xmltools/plugin_katexmltools.h | 10 | ||||
-rw-r--r-- | kate/xmltools/pseudo_dtd.cpp | 50 | ||||
-rw-r--r-- | kate/xmltools/pseudo_dtd.h | 8 | ||||
-rw-r--r-- | kate/xmltools/testcases.xml | 4 | ||||
-rw-r--r-- | kate/xmltools/xhtml1-frameset.dtd.xml | 8 | ||||
-rw-r--r-- | kate/xmltools/xhtml1-strict.dtd.xml | 8 | ||||
-rw-r--r-- | kate/xmltools/xhtml1-transitional.dtd.xml | 8 |
11 files changed, 210 insertions, 208 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 bf01b59..65130e9 100644 --- a/kate/xmltools/kde-docbook.dtd.xml +++ b/kate/xmltools/kde-docbook.dtd.xml @@ -845,7 +845,7 @@ <entity name="ulcorn" type="gen"> <text-expanded>&#x231C;</text-expanded> </entity> -<entity name="kfind" type="gen"> +<entity name="ktqfind" type="gen"> <text-expanded> <application>KFind</application> </text-expanded> @@ -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"/> @@ -8326,7 +8326,7 @@ <attribute name="xreflabel" type="#IMPLIED" value="CDATA" default=""/> <attribute name="status" type="#IMPLIED" value="CDATA" default=""/> <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="parentbook" type="#IMPLIED" value="IDREF" default=""/> +<attribute name="tqparentbook" type="#IMPLIED" value="IDREF" default=""/> <attribute name="class" type="#IMPLIED" enumeration="yes" value="journalarticle productsheet whitepaper techreport specification faq" default=""/> <attribute name="id" type="#IMPLIED" value="ID" default=""/> <attribute name="role" type="#IMPLIED" value="CDATA" default=""/> @@ -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 182aeaf..fe5c9f4 100644 --- a/kate/xmltools/plugin_katexmltools.cpp +++ b/kate/xmltools/plugin_katexmltools.cpp @@ -52,7 +52,7 @@ FIXME: TODO: -check for mem leaks --add "Go to opening/parent tag"? +-add "Go to opening/tqparent tag"? -check doctype to get top-level element -can undo behaviour be improved?, e.g. the plugins internal deletions of text don't have to be an extra step @@ -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, ... ) @@ -113,8 +113,8 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -PluginKateXMLTools::PluginKateXMLTools( TQObject* parent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application*)parent, name ) +PluginKateXMLTools::PluginKateXMLTools( TQObject* tqparent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application*)tqparent, name ) { //kdDebug() << "PluginKateXMLTools constructor called" << endl; @@ -132,7 +132,7 @@ PluginKateXMLTools::PluginKateXMLTools( TQObject* parent, const char* name, cons m_dtds.setAutoDelete( true ); - m_documentManager = ((Kate::Application*)parent)->documentManager(); + m_documentManager = ((Kate::Application*)tqparent)->documentManager(); // connect( m_documentManager, TQT_SIGNAL(documentCreated()), // this, TQT_SLOT(slotDocumentCreated()) ); @@ -239,7 +239,7 @@ void PluginKateXMLTools::backspacePressed() void PluginKateXMLTools::emptyKeyEvent() { - keyEvent( 0, 0, TQString::null ); + keyEvent( 0, 0, TQString() ); } void PluginKateXMLTools::keyEvent( int, int, const TQString &/*s*/ ) @@ -282,12 +282,12 @@ void PluginKateXMLTools::keyEvent( int, int, const TQString &/*s*/ ) else if( leftCh == "<" ) { kdDebug() << "*outside tag -> get elements" << endl; - TQString parentElement = getParentElement( *kv, true ); - kdDebug() << "parent: " << parentElement << endl; - allowed = m_docDtds[docNumber]->allowedElements(parentElement ); + TQString tqparentElement = getParentElement( *kv, true ); + kdDebug() << "tqparent: " << tqparentElement << endl; + allowed = m_docDtds[docNumber]->allowedElements(tqparentElement ); m_mode = elements; } - // TODO: optionally close parent tag if not left=="/>" + // TODO: optionally close tqparent tag if not left=="/>" else if( leftCh == " " || (isQuote(leftCh) && secondLeftCh == "=") ) { // TODO: check secondLeftChar, too?! then you don't need to trigger @@ -330,7 +330,7 @@ void PluginKateXMLTools::keyEvent( int, int, const TQString &/*s*/ ) if( allowed.count() >= 1 && allowed[0] != "__EMPTY" ) { - allowed = sortQStringList( allowed ); + allowed = sortTQStringList( allowed ); connectSlots( kv ); kv->showCompletionBox( stringListToCompletionEntryList( allowed ), 0, false ); m_popupOpenCol = col; @@ -440,8 +440,8 @@ void PluginKateXMLTools::getDTD() else if ( doctype == "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" ) filename = "kde-docbook.dtd.xml"; } - else if( documentStart.find("<xsl:stylesheet" ) != -1 && - documentStart.find( "xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"") != -1 ) + else if( documentStart.tqfind("<xsl:stylesheet" ) != -1 && + documentStart.tqfind( "xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"") != -1 ) { /* XSLT doesn't have a doctype/DTD. We look for an xsl:stylesheet tag instead. Example: @@ -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 @@ -528,7 +528,7 @@ void PluginKateXMLTools::slotData( KIO::Job *, const TQByteArray &data ) void PluginKateXMLTools::assignDTD( PseudoDTD *dtd, KTextEditor::Document *doc ) { - m_docDtds.replace( doc->documentNumber(), dtd ); + m_docDtds.tqreplace( doc->documentNumber(), dtd ); connect( doc, TQT_SIGNAL(charactersInteractivelyInserted(int,int,const TQString&) ), this, TQT_SLOT(keyEvent(int,int,const TQString&)) ); @@ -555,11 +555,11 @@ void PluginKateXMLTools::slotInsertElement() } PseudoDTD *dtd = m_docDtds[kv->document()->documentNumber()]; - TQString parentElement = getParentElement( *kv, false ); + TQString tqparentElement = getParentElement( *kv, false ); TQStringList allowed; if( dtd ) - allowed = dtd->allowedElements(parentElement ); + allowed = dtd->allowedElements(tqparentElement ); InsertElement *dialog = new InsertElement( ( TQWidget *)application()->activeMainWindow()->viewManager()->activeView(), "insertXml" ); @@ -579,7 +579,7 @@ void PluginKateXMLTools::slotInsertElement() if ( dtd && dtd->allowedAttributes(list[0]).count() ) adjust++; // the ">" - if ( dtd && dtd->allowedElements(list[0]).contains("__EMPTY") ) + if ( dtd && dtd->allowedElements(list[0]).tqcontains("__EMPTY") ) { pre = "<" + text + "/>"; if ( adjust ) @@ -603,7 +603,7 @@ void PluginKateXMLTools::slotInsertElement() } /** - * Insert a closing tag for the nearest not-closed parent element. + * Insert a closing tag for the nearest not-closed tqparent element. */ void PluginKateXMLTools::slotCloseElement() { @@ -616,11 +616,11 @@ void PluginKateXMLTools::slotCloseElement() kdDebug() << "Warning: no Kate::View" << endl; return; } - TQString parentElement = getParentElement( *kv, false ); + TQString tqparentElement = getParentElement( *kv, false ); - //kdDebug() << "parentElement: '" << parentElement << "'" << endl; - TQString closeTag = "</" + parentElement + ">"; - if( ! parentElement.isEmpty() ) + //kdDebug() << "tqparentElement: '" << tqparentElement << "'" << endl; + TQString closeTag = "</" + tqparentElement + ">"; + if( ! tqparentElement.isEmpty() ) kv->insertText( closeTag ); } @@ -708,7 +708,7 @@ void PluginKateXMLTools::filterInsertString( KTextEditor::CompletionEntry *ce, T // anders: if the tag is marked EMPTY, insert in form <tagname/> TQString str; int docNumber = kv->document()->documentNumber(); - bool isEmptyTag =m_docDtds[docNumber]->allowedElements(ce->text).contains( "__EMPTY" ); + bool isEmptyTag =m_docDtds[docNumber]->allowedElements(ce->text).tqcontains( "__EMPTY" ); if ( isEmptyTag ) str = "/>"; else @@ -895,10 +895,10 @@ TQString PluginKateXMLTools::insideAttribute( Kate::View &kv ) } /** - * Find the parent element for the current cursor position. That is, + * Find the tqparent element for the current cursor position. That is, * go left and find the first opening element that's not closed yet, * ignoring empty elements. - * Examples: If cursor is at "X", the correct parent element is "p": + * Examples: If cursor is at "X", the correct tqparent element is "p": * <p> <a x="xyz"> foo <i> test </i> bar </a> X * <p> <a x="xyz"> foo bar </a> X * <p> foo <img/> bar X @@ -930,14 +930,14 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle { do { - if( !line-- ) return TQString::null; // reached start of document + if( !line-- ) return TQString(); // reached start of document str = kv.getDoc()->textLine(line ); col = str.length(); } while( !col ); --col; } - ushort ch = str.at( col).unicode(); + ushort ch = str.tqat( col).tqunicode(); switch( parseState ) { @@ -950,7 +950,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle { case '<': // hmm... we were actually inside an element - return TQString::null; + return TQString(); case '>': // we just hit an element boundary @@ -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; @@ -1069,14 +1069,14 @@ bool PluginKateXMLTools::isQuote( TQString ch ) // Tools: /** Sort a TQStringList case-insensitively. Static. TODO: make it more simple. */ -TQStringList PluginKateXMLTools::sortQStringList( TQStringList list ) { - // Sort list case-insensitive. This looks complicated but using a QMap - // is even suggested by the Qt documentation. +TQStringList PluginKateXMLTools::sortTQStringList( TQStringList list ) { + // Sort list case-insensitive. This looks complicated but using a TQMap + // is even suggested by the TQt documentation. TQMap<TQString,TQString> mapList; for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it ) { TQString str = *it; - if( mapList.contains(str.lower()) ) + if( mapList.tqcontains(str.lower()) ) { // do not override a previous value, e.g. "Auml" and "auml" are two different // entities, but they should be sorted next to each other. @@ -1091,7 +1091,7 @@ TQStringList PluginKateXMLTools::sortQStringList( TQStringList list ) { list.clear(); TQMap<TQString,TQString>::Iterator it; - // Qt doc: "the items are alphabetically sorted [by key] when iterating over the map": + // TQt doc: "the items are alphabetically sorted [by key] when iterating over the map": for( it = mapList.begin(); it != mapList.end(); ++it ) list.append( it.data() ); @@ -1099,8 +1099,8 @@ TQStringList PluginKateXMLTools::sortQStringList( TQStringList list ) { } //BEGIN InsertElement dialog -InsertElement::InsertElement( TQWidget *parent, const char *name ) - :KDialogBase( parent, name, true, i18n("Insert XML Element" ), +InsertElement::InsertElement( TQWidget *tqparent, const char *name ) + :KDialogBase( tqparent, name, true, i18n("Insert XML Element" ), KDialogBase::Ok|KDialogBase::Cancel) { } @@ -1135,7 +1135,7 @@ TQString InsertElement::showDialog( TQStringList &completions ) if( exec() ) return combo->currentText(); - return TQString::null; + return TQString(); } //END InsertElement dialog -// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; diff --git a/kate/xmltools/plugin_katexmltools.h b/kate/xmltools/plugin_katexmltools.h index 843ab15..e3a6c51 100644 --- a/kate/xmltools/plugin_katexmltools.h +++ b/kate/xmltools/plugin_katexmltools.h @@ -49,10 +49,11 @@ class PluginKateXMLTools : public Kate::Plugin, Kate::PluginViewInterface { Q_OBJECT + TQ_OBJECT public: - PluginKateXMLTools( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateXMLTools( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateXMLTools(); void addView ( Kate::MainWindow *win ); void removeView( Kate::MainWindow *win ); @@ -80,7 +81,7 @@ class PluginKateXMLTools : public Kate::Plugin, Kate::PluginViewInterface protected: - static TQStringList sortQStringList( TQStringList list ); + static TQStringList sortTQStringList( TQStringList list ); //bool eventFilter( TQObject *object, TQEvent *event ); TQString insideTag( Kate::View &kv ); @@ -136,9 +137,10 @@ class InsertElement : public KDialogBase { Q_OBJECT + TQ_OBJECT public: - InsertElement( TQWidget *parent, const char *name ); + InsertElement( TQWidget *tqparent, const char *name ); ~InsertElement(); TQString showDialog( TQStringList &completions ); private slots: @@ -147,4 +149,4 @@ class InsertElement : public KDialogBase }; #endif // _PLUGIN_KANT_XMLTOOLS_H -// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp index 05ac58a..b6cc9b0 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; } @@ -73,7 +73,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd ) progress.setMinimumDuration( 400 ); progress.setProgress(0); - // Get information from meta DTD and put it in Qt data structures for fast access: + // Get information from meta DTD and put it in TQt data structures for fast access: if( ! parseEntities( &doc, &progress ) ) return; @@ -116,7 +116,7 @@ bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress ) progress->setProgress( progress->progress()+1 ); // FIXME!: - //qApp->processEvents(); + //tqApp->processEvents(); subelementList.clear(); TQDomNode node = list.item( i ); @@ -169,7 +169,7 @@ bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress ) TQDomElement subElem = subNode.toElement(); if( !subElem.isNull() ) { - TQMap<TQString,bool>::Iterator it = subelementList.find( subElem.attribute( "name" ) ); + TQMap<TQString,bool>::Iterator it = subelementList.tqfind( subElem.attribute( "name" ) ); if( it != subelementList.end() ) subelementList.remove(it); } @@ -192,11 +192,11 @@ bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress ) } /** - * Check which elements are allowed inside a parent element. This returns + * Check which elements are allowed inside a tqparent element. This returns * a list of allowed elements, but it doesn't care about order or if only a certain * number of occurences is allowed. */ -TQStringList PseudoDTD::allowedElements( TQString parentElement ) +TQStringList PseudoDTD::allowedElements( TQString tqparentElement ) { if( m_sgmlSupport ) { @@ -204,12 +204,12 @@ TQStringList PseudoDTD::allowedElements( TQString parentElement ) TQMap<TQString,TQStringList>::Iterator it; for( it = m_elementsList.begin(); it != m_elementsList.end(); ++it ) { - if( it.key().lower() == parentElement.lower() ) + if( it.key().lower() == tqparentElement.lower() ) return it.data(); } } - else if( m_elementsList.contains(parentElement) ) - return m_elementsList[parentElement]; + else if( m_elementsList.tqcontains(tqparentElement) ) + return m_elementsList[tqparentElement]; return TQStringList(); } @@ -232,7 +232,7 @@ bool PseudoDTD::parseAttributes( TQDomDocument *doc, TQProgressDialog *progress progress->setProgress( progress->progress()+1 ); // FIXME!! - //qApp->processEvents(); + //tqApp->processEvents(); ElementAttributes attrs; TQDomNode node = list.item(i); @@ -248,7 +248,7 @@ bool PseudoDTD::parseAttributes( TQDomDocument *doc, TQProgressDialog *progress if( ! attributeElem.isNull() ) { - if ( attributeElem.attribute("type") == "#REQUIRED" ) + if ( attributeElem.attribute("type") == "#RETQUIRED" ) attrs.requiredAttributes.append( attributeElem.attribute("name") ); else attrs.optionalAttributes.append( attributeElem.attribute("name") ); @@ -275,7 +275,7 @@ TQStringList PseudoDTD::allowedAttributes( TQString element ) } } } - else if( m_attributesList.contains(element) ) + else if( m_attributesList.tqcontains(element) ) return m_attributesList[element].optionalAttributes + m_attributesList[element].requiredAttributes; return TQStringList(); @@ -292,7 +292,7 @@ TQStringList PseudoDTD::requiredAttributes( const TQString &element ) const return it.data().requiredAttributes; } } - else if( m_attributesList.contains(element) ) + else if( m_attributesList.tqcontains(element) ) return m_attributesList[element].requiredAttributes; return TQStringList(); @@ -316,7 +316,7 @@ bool PseudoDTD::parseAttributeValues( TQDomDocument *doc, TQProgressDialog *prog progress->setProgress( progress->progress()+1 ); // FIXME! - //qApp->processEvents(); + //tqApp->processEvents(); attributevaluesTmp.clear(); TQDomNode node = list.item(i); @@ -369,10 +369,10 @@ TQStringList PseudoDTD::attributeValues( TQString element, TQString attribute ) } } } - else if( m_attributevaluesList.contains(element) ) + else if( m_attributevaluesList.tqcontains(element) ) { TQMap<TQString,TQStringList> attrVals = m_attributevaluesList[element]; - if( attrVals.contains(attribute) ) + if( attrVals.tqcontains(attribute) ) return attrVals[attribute]; } @@ -397,7 +397,7 @@ bool PseudoDTD::parseEntities( TQDomDocument *doc, TQProgressDialog *progress ) progress->setProgress( progress->progress()+1 ); //FIXME!! - //qApp->processEvents(); + //tqApp->processEvents(); TQDomNode node = list.item(i); TQDomElement elem = node.toElement(); if( !elem.isNull() @@ -410,15 +410,15 @@ 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: - if( exp.contains(TQRegExp("^&#x[a-zA-Z0-9]+;$")) ) { + /* TODO include do this when the tqunicode font problem is solved: + if( exp.tqcontains(TQRegExp("^&#x[a-zA-Z0-9]+;$")) ) { // hexadecimal numbers, e.g. "ȶ" - uint end = exp.find( ";" ); + uint end = exp.tqfind( ";" ); exp = exp.mid( 3, end-3 ); exp = TQChar(); - } else if( exp.contains(TQRegExp("^&#[0-9]+;$")) ) { + } else if( exp.tqcontains(TQRegExp("^&#[0-9]+;$")) ) { // decimal numbers, e.g. "ì" - uint end = exp.find( ";" ); + uint end = exp.tqfind( ";" ); exp = exp.mid( 2, end-2 ); exp = TQChar( exp.toInt() ); } @@ -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+);" ); @@ -463,4 +463,4 @@ TQStringList PseudoDTD::entities( TQString start ) return entities; } -// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; diff --git a/kate/xmltools/pseudo_dtd.h b/kate/xmltools/pseudo_dtd.h index 5da444c..f798bea 100644 --- a/kate/xmltools/pseudo_dtd.h +++ b/kate/xmltools/pseudo_dtd.h @@ -46,11 +46,11 @@ class PseudoDTD void analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd ); - TQStringList allowedElements( TQString parentElement ); - TQStringList allowedAttributes( TQString parentElement ); + TQStringList allowedElements( TQString tqparentElement ); + TQStringList allowedAttributes( TQString tqparentElement ); TQStringList attributeValues( TQString element, TQString attribute ); TQStringList entities( TQString start ); - TQStringList requiredAttributes( const TQString &parentElement ) const; + TQStringList requiredAttributes( const TQString &tqparentElement ) const; protected: @@ -73,4 +73,4 @@ class PseudoDTD }; #endif // _PLUGIN_KANT_XMLTOOLS_DTD_H -// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off; +// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off; diff --git a/kate/xmltools/testcases.xml b/kate/xmltools/testcases.xml index aa1e7dd..9828751 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 @@ -62,7 +62,7 @@ it should be inserted, including the trailing semicolon. <a href="foo"> blah <em>X -- <a> inside <a> is not allowed, but this limitation is not part of the DTD, so the plugin will incorrectly claim that <a> is allowed at "X". <head><title> foobar</title> X -- <title> is only allowed once, but the plugin - only looks for the parent element (<head> in this case) and ignores the existing <title>. + only looks for the tqparent element (<head> in this case) and ignores the existing <title>. <a href="foo" X > -- an attribute may only appear once, but "href" is listed by the plugin although it's used already. <td align = "X"> -- whitespace around '=' is not recognized although it's legal. 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" |