diff options
Diffstat (limited to 'kate/xmltools')
-rw-r--r-- | kate/xmltools/kde-docbook.dtd.xml | 2 | ||||
-rw-r--r-- | kate/xmltools/plugin_katexmltools.cpp | 18 | ||||
-rw-r--r-- | kate/xmltools/pseudo_dtd.cpp | 8 | ||||
-rw-r--r-- | kate/xmltools/pseudo_dtd.h | 6 |
4 files changed, 17 insertions, 17 deletions
diff --git a/kate/xmltools/kde-docbook.dtd.xml b/kate/xmltools/kde-docbook.dtd.xml index 65130e9..06b7a1e 100644 --- a/kate/xmltools/kde-docbook.dtd.xml +++ b/kate/xmltools/kde-docbook.dtd.xml @@ -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="tqparentbook" type="#IMPLIED" value="IDREF" default=""/> +<attribute name="parentbook" 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=""/> diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp index fe5c9f4..b3eea59 100644 --- a/kate/xmltools/plugin_katexmltools.cpp +++ b/kate/xmltools/plugin_katexmltools.cpp @@ -282,9 +282,9 @@ void PluginKateXMLTools::keyEvent( int, int, const TQString &/*s*/ ) else if( leftCh == "<" ) { kdDebug() << "*outside tag -> get elements" << endl; - TQString tqparentElement = getParentElement( *kv, true ); - kdDebug() << "tqparent: " << tqparentElement << endl; - allowed = m_docDtds[docNumber]->allowedElements(tqparentElement ); + TQString parentElement = getParentElement( *kv, true ); + kdDebug() << "tqparent: " << parentElement << endl; + allowed = m_docDtds[docNumber]->allowedElements(parentElement ); m_mode = elements; } // TODO: optionally close tqparent tag if not left=="/>" @@ -555,11 +555,11 @@ void PluginKateXMLTools::slotInsertElement() } PseudoDTD *dtd = m_docDtds[kv->document()->documentNumber()]; - TQString tqparentElement = getParentElement( *kv, false ); + TQString parentElement = getParentElement( *kv, false ); TQStringList allowed; if( dtd ) - allowed = dtd->allowedElements(tqparentElement ); + allowed = dtd->allowedElements(parentElement ); InsertElement *dialog = new InsertElement( ( TQWidget *)application()->activeMainWindow()->viewManager()->activeView(), "insertXml" ); @@ -616,11 +616,11 @@ void PluginKateXMLTools::slotCloseElement() kdDebug() << "Warning: no Kate::View" << endl; return; } - TQString tqparentElement = getParentElement( *kv, false ); + TQString parentElement = getParentElement( *kv, false ); - //kdDebug() << "tqparentElement: '" << tqparentElement << "'" << endl; - TQString closeTag = "</" + tqparentElement + ">"; - if( ! tqparentElement.isEmpty() ) + //kdDebug() << "parentElement: '" << parentElement << "'" << endl; + TQString closeTag = "</" + parentElement + ">"; + if( ! parentElement.isEmpty() ) kv->insertText( closeTag ); } diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp index b6cc9b0..e0376d4 100644 --- a/kate/xmltools/pseudo_dtd.cpp +++ b/kate/xmltools/pseudo_dtd.cpp @@ -196,7 +196,7 @@ bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress ) * 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 tqparentElement ) +TQStringList PseudoDTD::allowedElements( TQString parentElement ) { if( m_sgmlSupport ) { @@ -204,12 +204,12 @@ TQStringList PseudoDTD::allowedElements( TQString tqparentElement ) TQMap<TQString,TQStringList>::Iterator it; for( it = m_elementsList.begin(); it != m_elementsList.end(); ++it ) { - if( it.key().lower() == tqparentElement.lower() ) + if( it.key().lower() == parentElement.lower() ) return it.data(); } } - else if( m_elementsList.tqcontains(tqparentElement) ) - return m_elementsList[tqparentElement]; + else if( m_elementsList.tqcontains(parentElement) ) + return m_elementsList[parentElement]; return TQStringList(); } diff --git a/kate/xmltools/pseudo_dtd.h b/kate/xmltools/pseudo_dtd.h index f798bea..912ec4b 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 tqparentElement ); - TQStringList allowedAttributes( TQString tqparentElement ); + TQStringList allowedElements( TQString parentElement ); + TQStringList allowedAttributes( TQString parentElement ); TQStringList attributeValues( TQString element, TQString attribute ); TQStringList entities( TQString start ); - TQStringList requiredAttributes( const TQString &tqparentElement ) const; + TQStringList requiredAttributes( const TQString &parentElement ) const; protected: |