From ca82971624269719d487c6f7980d7237f9420036 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:45:00 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kate/xmltools/html4-loose.dtd.xml | 74 +++++++++---------- kate/xmltools/html4-strict.dtd.xml | 48 ++++++------- kate/xmltools/kde-docbook.dtd.xml | 114 +++++++++++++++--------------- kate/xmltools/plugin_katexmltools.cpp | 14 ++-- kate/xmltools/pseudo_dtd.cpp | 8 +-- kate/xmltools/testcases.xml | 2 +- kate/xmltools/xhtml1-frameset.dtd.xml | 8 +-- kate/xmltools/xhtml1-strict.dtd.xml | 8 +-- kate/xmltools/xhtml1-transitional.dtd.xml | 8 +-- 9 files changed, 142 insertions(+), 142 deletions(-) (limited to 'kate/xmltools') diff --git a/kate/xmltools/html4-loose.dtd.xml b/kate/xmltools/html4-loose.dtd.xml index 03505ae..f7b48d0 100644 --- a/kate/xmltools/html4-loose.dtd.xml +++ b/kate/xmltools/html4-loose.dtd.xml @@ -689,11 +689,11 @@ type="param" > align (left|center|right|justify|char) #IMPLIED - char CDATA #IMPLIED -- tqalignment char, e.g. char=':' -- - charoff CDATA #IMPLIED -- offset for tqalignment char -- + char CDATA #IMPLIED -- alignment char, e.g. char=':' -- + charoff CDATA #IMPLIED -- offset for alignment char -- align (left|center|right|justify|char) #IMPLIED - char %Character; #IMPLIED -- tqalignment char, e.g. char=':' -- - charoff %Length; #IMPLIED -- offset for tqalignment char -- + char %Character; #IMPLIED -- alignment char, e.g. char=':' -- + charoff %Length; #IMPLIED -- offset for alignment char -- -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- @@ -5170,8 +5170,8 @@ -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- - %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- %attrs; -- %coreattrs, %i18n, %events -- - %align; -- align, text tqalignment -- + %align; -- align, text alignment -- %reserved; -- reserved for possible future use -- -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- @@ -11742,7 +11742,7 @@ %attrs; -- %coreattrs, %i18n, %events -- - tqshape %Shape; rect -- controls interpretation of coords -- + shape %Shape; rect -- controls interpretation of coords -- coords %Coords; #IMPLIED -- comma-separated list of lengths -- href %URI; #IMPLIED -- URI for linked resource -- target %FrameTarget; #IMPLIED -- render in this frame -- @@ -11817,7 +11817,7 @@ type="#IMPLIED" value="CDATA" default=""/> - -- table row -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- bgcolor %Color; #IMPLIED -- background color for row -- align (left|center|right|justify|char) #IMPLIED - char CDATA #IMPLIED -- tqalignment char, e.g. char=':' -- - charoff CDATA #IMPLIED -- offset for tqalignment char -- + char CDATA #IMPLIED -- alignment char, e.g. char=':' -- + charoff CDATA #IMPLIED -- offset for alignment char -- align (left|center|right|justify|char) #IMPLIED - char %Character; #IMPLIED -- tqalignment char, e.g. char=':' -- - charoff %Length; #IMPLIED -- offset for tqalignment char -- + char %Character; #IMPLIED -- alignment char, e.g. char=':' -- + charoff %Length; #IMPLIED -- offset for alignment char -- -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- - -- table section -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- %attrs; -- %coreattrs, %i18n, %events -- - tqshape %Shape; rect -- controls interpretation of coords -- + shape %Shape; rect -- controls interpretation of coords -- coords %Coords; #IMPLIED -- comma-separated list of lengths -- href %URI; #IMPLIED -- URI for linked resource -- nohref (nohref) #IMPLIED -- this region has no action -- @@ -9694,7 +9694,7 @@ type="#IMPLIED" value="CDATA" default=""/> - -- table row -- %attrs; -- %coreattrs, %i18n, %events -- - %cellhalign; -- horizontal tqalignment in cells -- - %cellvalign; -- vertical tqalignment in cells -- + %cellhalign; -- horizontal alignment in cells -- + %cellvalign; -- vertical alignment in cells -- - + @@ -4881,7 +4881,7 @@ - + @@ -4989,7 +4989,7 @@ - + @@ -5048,7 +5048,7 @@ - + @@ -5267,7 +5267,7 @@ - + @@ -5488,7 +5488,7 @@ - + @@ -5549,7 +5549,7 @@ - + @@ -5668,7 +5668,7 @@ - + @@ -7472,7 +7472,7 @@ - + @@ -7665,7 +7665,7 @@ - + @@ -7779,7 +7779,7 @@ - + @@ -8025,7 +8025,7 @@ - + @@ -8228,7 +8228,7 @@ - + @@ -8754,7 +8754,7 @@ - + @@ -8900,7 +8900,7 @@ - + @@ -9601,7 +9601,7 @@ - + @@ -9673,7 +9673,7 @@ - + @@ -9754,7 +9754,7 @@ - + @@ -10513,7 +10513,7 @@ - + @@ -10641,7 +10641,7 @@ - + @@ -10703,7 +10703,7 @@ - + @@ -10768,7 +10768,7 @@ - + @@ -11281,7 +11281,7 @@ - + @@ -11602,7 +11602,7 @@ - + @@ -12033,7 +12033,7 @@ - + @@ -12701,7 +12701,7 @@ - + @@ -12847,7 +12847,7 @@ - + @@ -13607,7 +13607,7 @@ - + @@ -13758,7 +13758,7 @@ - + @@ -13863,7 +13863,7 @@ - + @@ -14187,7 +14187,7 @@ - + @@ -14679,7 +14679,7 @@ - + @@ -14795,7 +14795,7 @@ - + @@ -14911,7 +14911,7 @@ - + @@ -15027,7 +15027,7 @@ - + @@ -15143,7 +15143,7 @@ - + @@ -15237,7 +15237,7 @@ - + @@ -16199,7 +16199,7 @@ - + @@ -16287,7 +16287,7 @@ - + @@ -16372,7 +16372,7 @@ - + @@ -17314,7 +17314,7 @@ - + @@ -17401,7 +17401,7 @@ - + @@ -17478,7 +17478,7 @@ - + @@ -17764,7 +17764,7 @@ - + @@ -17811,7 +17811,7 @@ - + @@ -18170,7 +18170,7 @@ - + @@ -18403,7 +18403,7 @@ - + @@ -18671,7 +18671,7 @@ - + @@ -18776,7 +18776,7 @@ - + @@ -19127,7 +19127,7 @@ - + @@ -19517,7 +19517,7 @@ - + @@ -19620,7 +19620,7 @@ - + @@ -19897,7 +19897,7 @@ - + @@ -20298,7 +20298,7 @@ - + @@ -20626,7 +20626,7 @@ - + @@ -21006,7 +21006,7 @@ - + @@ -21077,7 +21077,7 @@ - + diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp index ce53476..d322282 100644 --- a/kate/xmltools/plugin_katexmltools.cpp +++ b/kate/xmltools/plugin_katexmltools.cpp @@ -63,7 +63,7 @@ TODO: but then at 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 form --Show expanded entities with TQChar::TQChar( int rc ) + tqunicode font +-Show expanded entities with TQChar::TQChar( int rc ) + unicode 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 #include #include -#include +#include #include #include #include @@ -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.").tqarg( doctype ), + "will now be loaded.").arg( doctype ), i18n( "Loading XML Meta DTD" ), - TQString::tqfromLatin1( "DTDAssigned") ); + TQString::fromLatin1( "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.").tqarg( m_urlString ), + "The server returned an error.").arg( m_urlString ), i18n( "XML Plugin Error") ); } else @@ -937,7 +937,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle --col; } - ushort ch = str.tqat( col).tqunicode(); + ushort ch = str.at( col).unicode(); switch( parseState ) { @@ -981,7 +981,7 @@ TQString PluginKateXMLTools::getParentElement( Kate::View &kv, bool ignoreSingle TQString tag = str.mid( col + 1 ); for( uint pos = 0, len = tag.length(); pos < len; ++pos ) { - ch = tag.tqat( pos).tqunicode(); + ch = tag.at( pos).unicode(); if( ch == ' ' || ch == '\t' || ch == '>' ) { tag.truncate( pos ); break; diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp index 99de846..af66188 100644 --- a/kate/xmltools/pseudo_dtd.cpp +++ b/kate/xmltools/pseudo_dtd.cpp @@ -46,7 +46,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd ) if ( ! doc.setContent( metaDtd) ) { KMessageBox::error(0, i18n("The file '%1' could not be parsed. " - "Please check that the file is well-formed XML.").tqarg( metaDtdUrl ), + "Please check that the file is well-formed XML.").arg( metaDtdUrl ), i18n( "XML Plugin Error") ); return; } @@ -57,7 +57,7 @@ void PseudoDTD::analyzeDTD( TQString &metaDtdUrl, TQString &metaDtd ) "Please check that the file is of this type:\n" "-//Norman Walsh//DTD DTDParse V2.0//EN\n" "You can produce such files with dtdparse. " - "See the Kate Plugin documentation for more information.").tqarg( metaDtdUrl ), + "See the Kate Plugin documentation for more information.").arg( metaDtdUrl ), i18n("XML Plugin Error") ); return; } @@ -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 tqunicode font problem is solved: + /* TODO include do this when the unicode font problem is solved: if( exp.contains(TQRegExp("^&#x[a-zA-Z0-9]+;$")) ) { // hexadecimal numbers, e.g. "ȶ" 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 tqunicode character + /* TODO: show entities as unicode character if( !it.data().isEmpty() ) { //str += " -- " + it.data(); TQRegExp re( "&#(\\d+);" ); diff --git a/kate/xmltools/testcases.xml b/kate/xmltools/testcases.xml index e66fc60..aa1e7dd 100644 --- a/kate/xmltools/testcases.xml +++ b/kate/xmltools/testcases.xml @@ -40,7 +40,7 @@ the current cursor position, replacing the old value: center, char, justify, left, right baseline, bottom, middle, top -- "foobar" should be replaced - circle, default, poly, rect + circle, default, poly, rect (no predefined values) 6. Type "&". A list with named entities should appear. Select one and diff --git a/kate/xmltools/xhtml1-frameset.dtd.xml b/kate/xmltools/xhtml1-frameset.dtd.xml index 73bf4bc..6530334 100644 --- a/kate/xmltools/xhtml1-frameset.dtd.xml +++ b/kate/xmltools/xhtml1-frameset.dtd.xml @@ -7533,7 +7533,7 @@ %attrs; %focus; - tqshape %Shape; "rect" + shape %Shape; "rect" coords %Coords; #IMPLIED href %URI; #IMPLIED nohref (nohref) #IMPLIED @@ -7608,7 +7608,7 @@ type="#IMPLIED" value="CDATA" default=""/> - @@ -12097,7 +12097,7 @@ type="#IMPLIED" value="CDATA" default=""/> - %attrs; %focus; - tqshape %Shape; "rect" + shape %Shape; "rect" coords %Coords; #IMPLIED href %URI; #IMPLIED nohref (nohref) #IMPLIED @@ -6260,7 +6260,7 @@ type="#IMPLIED" value="CDATA" default=""/> - - %attrs; %focus; - tqshape %Shape; "rect" + shape %Shape; "rect" coords %Coords; #IMPLIED href %URI; #IMPLIED nohref (nohref) #IMPLIED @@ -7675,7 +7675,7 @@ type="#IMPLIED" value="CDATA" default=""/> - @@ -12036,7 +12036,7 @@ type="#IMPLIED" value="CDATA" default=""/> -