summaryrefslogtreecommitdiffstats
path: root/kate/xmltools
diff options
context:
space:
mode:
Diffstat (limited to 'kate/xmltools')
-rw-r--r--kate/xmltools/kde-docbook.dtd.xml2
-rw-r--r--kate/xmltools/plugin_katexmltools.cpp14
-rw-r--r--kate/xmltools/plugin_katexmltools.h2
-rw-r--r--kate/xmltools/pseudo_dtd.cpp22
-rw-r--r--kate/xmltools/pseudo_dtd.h2
5 files changed, 21 insertions, 21 deletions
diff --git a/kate/xmltools/kde-docbook.dtd.xml b/kate/xmltools/kde-docbook.dtd.xml
index 06b7a1e..e1611e9 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>&amp;#x231C;</text-expanded>
</entity>
-<entity name="ktqfind" type="gen">
+<entity name="kfind" type="gen">
<text-expanded>
<application>KFind</application>
</text-expanded>
diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp
index b3eea59..e8936b8 100644
--- a/kate/xmltools/plugin_katexmltools.cpp
+++ b/kate/xmltools/plugin_katexmltools.cpp
@@ -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.tqfind("<xsl:stylesheet" ) != -1 &&
- documentStart.tqfind( "xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\"") != -1 )
+ else if( documentStart.find("<xsl:stylesheet" ) != -1 &&
+ documentStart.find( "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:
@@ -528,7 +528,7 @@ void PluginKateXMLTools::slotData( KIO::Job *, const TQByteArray &data )
void PluginKateXMLTools::assignDTD( PseudoDTD *dtd, KTextEditor::Document *doc )
{
- m_docDtds.tqreplace( doc->documentNumber(), dtd );
+ m_docDtds.replace( doc->documentNumber(), dtd );
connect( doc, TQT_SIGNAL(charactersInteractivelyInserted(int,int,const TQString&) ),
this, TQT_SLOT(keyEvent(int,int,const TQString&)) );
@@ -579,7 +579,7 @@ void PluginKateXMLTools::slotInsertElement()
if ( dtd && dtd->allowedAttributes(list[0]).count() )
adjust++; // the ">"
- if ( dtd && dtd->allowedElements(list[0]).tqcontains("__EMPTY") )
+ if ( dtd && dtd->allowedElements(list[0]).contains("__EMPTY") )
{
pre = "<" + text + "/>";
if ( adjust )
@@ -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).tqcontains( "__EMPTY" );
+ bool isEmptyTag =m_docDtds[docNumber]->allowedElements(ce->text).contains( "__EMPTY" );
if ( isEmptyTag )
str = "/>";
else
@@ -1076,7 +1076,7 @@ TQStringList PluginKateXMLTools::sortTQStringList( TQStringList list ) {
for ( TQStringList::Iterator it = list.begin(); it != list.end(); ++it )
{
TQString str = *it;
- if( mapList.tqcontains(str.lower()) )
+ if( mapList.contains(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.
@@ -1138,4 +1138,4 @@ TQString InsertElement::showDialog( TQStringList &completions )
return TQString();
}
//END InsertElement dialog
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/xmltools/plugin_katexmltools.h b/kate/xmltools/plugin_katexmltools.h
index e3a6c51..892a142 100644
--- a/kate/xmltools/plugin_katexmltools.h
+++ b/kate/xmltools/plugin_katexmltools.h
@@ -149,4 +149,4 @@ class InsertElement : public KDialogBase
};
#endif // _PLUGIN_KANT_XMLTOOLS_H
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp
index e0376d4..51d1fe3 100644
--- a/kate/xmltools/pseudo_dtd.cpp
+++ b/kate/xmltools/pseudo_dtd.cpp
@@ -169,7 +169,7 @@ bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress )
TQDomElement subElem = subNode.toElement();
if( !subElem.isNull() )
{
- TQMap<TQString,bool>::Iterator it = subelementList.tqfind( subElem.attribute( "name" ) );
+ TQMap<TQString,bool>::Iterator it = subelementList.find( subElem.attribute( "name" ) );
if( it != subelementList.end() )
subelementList.remove(it);
}
@@ -208,7 +208,7 @@ TQStringList PseudoDTD::allowedElements( TQString parentElement )
return it.data();
}
}
- else if( m_elementsList.tqcontains(parentElement) )
+ else if( m_elementsList.contains(parentElement) )
return m_elementsList[parentElement];
return TQStringList();
@@ -275,7 +275,7 @@ TQStringList PseudoDTD::allowedAttributes( TQString element )
}
}
}
- else if( m_attributesList.tqcontains(element) )
+ else if( m_attributesList.contains(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.tqcontains(element) )
+ else if( m_attributesList.contains(element) )
return m_attributesList[element].requiredAttributes;
return TQStringList();
@@ -369,10 +369,10 @@ TQStringList PseudoDTD::attributeValues( TQString element, TQString attribute )
}
}
}
- else if( m_attributevaluesList.tqcontains(element) )
+ else if( m_attributevaluesList.contains(element) )
{
TQMap<TQString,TQStringList> attrVals = m_attributevaluesList[element];
- if( attrVals.tqcontains(attribute) )
+ if( attrVals.contains(attribute) )
return attrVals[attribute];
}
@@ -411,14 +411,14 @@ 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:
- if( exp.tqcontains(TQRegExp("^&#x[a-zA-Z0-9]+;$")) ) {
+ if( exp.contains(TQRegExp("^&#x[a-zA-Z0-9]+;$")) ) {
// hexadecimal numbers, e.g. "&#x236;"
- uint end = exp.tqfind( ";" );
+ uint end = exp.find( ";" );
exp = exp.mid( 3, end-3 );
exp = TQChar();
- } else if( exp.tqcontains(TQRegExp("^&#[0-9]+;$")) ) {
+ } else if( exp.contains(TQRegExp("^&#[0-9]+;$")) ) {
// decimal numbers, e.g. "&#236;"
- uint end = exp.tqfind( ";" );
+ uint end = exp.find( ";" );
exp = exp.mid( 2, end-2 );
exp = TQChar( exp.toInt() );
}
@@ -463,4 +463,4 @@ TQStringList PseudoDTD::entities( TQString start )
return entities;
}
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;
diff --git a/kate/xmltools/pseudo_dtd.h b/kate/xmltools/pseudo_dtd.h
index 912ec4b..5da444c 100644
--- a/kate/xmltools/pseudo_dtd.h
+++ b/kate/xmltools/pseudo_dtd.h
@@ -73,4 +73,4 @@ class PseudoDTD
};
#endif // _PLUGIN_KANT_XMLTOOLS_DTD_H
-// kate: space-indent on; indent-width 2; tqreplace-tabs on; mixed-indent off;
+// kate: space-indent on; indent-width 2; replace-tabs on; mixed-indent off;