From 90363652674deb94cd07057428b24fcb1735dbce Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeaddons@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kate/xmltools/plugin_katexmltools.cpp | 22 +++++++++++----------- kate/xmltools/plugin_katexmltools.h | 4 ++-- kate/xmltools/pseudo_dtd.cpp | 2 +- kate/xmltools/testcases.xml | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) (limited to 'kate/xmltools') diff --git a/kate/xmltools/plugin_katexmltools.cpp b/kate/xmltools/plugin_katexmltools.cpp index e8936b8..ce53476 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/tqparent tag"? +-add "Go to opening/parent 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 @@ -113,8 +113,8 @@ class PluginView : public KXMLGUIClient Kate::MainWindow *win; }; -PluginKateXMLTools::PluginKateXMLTools( TQObject* tqparent, const char* name, const TQStringList& ) - : Kate::Plugin ( (Kate::Application*)tqparent, name ) +PluginKateXMLTools::PluginKateXMLTools( TQObject* parent, const char* name, const TQStringList& ) + : Kate::Plugin ( (Kate::Application*)parent, name ) { //kdDebug() << "PluginKateXMLTools constructor called" << endl; @@ -132,7 +132,7 @@ PluginKateXMLTools::PluginKateXMLTools( TQObject* tqparent, const char* name, co m_dtds.setAutoDelete( true ); - m_documentManager = ((Kate::Application*)tqparent)->documentManager(); + m_documentManager = ((Kate::Application*)parent)->documentManager(); // connect( m_documentManager, TQT_SIGNAL(documentCreated()), // this, TQT_SLOT(slotDocumentCreated()) ); @@ -283,11 +283,11 @@ void PluginKateXMLTools::keyEvent( int, int, const TQString &/*s*/ ) { kdDebug() << "*outside tag -> get elements" << endl; TQString parentElement = getParentElement( *kv, true ); - kdDebug() << "tqparent: " << parentElement << endl; + kdDebug() << "parent: " << parentElement << endl; allowed = m_docDtds[docNumber]->allowedElements(parentElement ); m_mode = elements; } - // TODO: optionally close tqparent tag if not left=="/>" + // TODO: optionally close parent tag if not left=="/>" else if( leftCh == " " || (isQuote(leftCh) && secondLeftCh == "=") ) { // TODO: check secondLeftChar, too?! then you don't need to trigger @@ -603,7 +603,7 @@ void PluginKateXMLTools::slotInsertElement() } /** - * Insert a closing tag for the nearest not-closed tqparent element. + * Insert a closing tag for the nearest not-closed parent element. */ void PluginKateXMLTools::slotCloseElement() { @@ -895,10 +895,10 @@ TQString PluginKateXMLTools::insideAttribute( Kate::View &kv ) } /** - * Find the tqparent element for the current cursor position. That is, + * Find the parent 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 tqparent element is "p": + * Examples: If cursor is at "X", the correct parent element is "p": *

foo test bar X *

foo bar X *

foo bar X @@ -1099,8 +1099,8 @@ TQStringList PluginKateXMLTools::sortTQStringList( TQStringList list ) { } //BEGIN InsertElement dialog -InsertElement::InsertElement( TQWidget *tqparent, const char *name ) - :KDialogBase( tqparent, name, true, i18n("Insert XML Element" ), +InsertElement::InsertElement( TQWidget *parent, const char *name ) + :KDialogBase( parent, name, true, i18n("Insert XML Element" ), KDialogBase::Ok|KDialogBase::Cancel) { } diff --git a/kate/xmltools/plugin_katexmltools.h b/kate/xmltools/plugin_katexmltools.h index 892a142..651ba7b 100644 --- a/kate/xmltools/plugin_katexmltools.h +++ b/kate/xmltools/plugin_katexmltools.h @@ -53,7 +53,7 @@ class PluginKateXMLTools : public Kate::Plugin, Kate::PluginViewInterface public: - PluginKateXMLTools( TQObject* tqparent = 0, const char* name = 0, const TQStringList& = TQStringList() ); + PluginKateXMLTools( TQObject* parent = 0, const char* name = 0, const TQStringList& = TQStringList() ); virtual ~PluginKateXMLTools(); void addView ( Kate::MainWindow *win ); void removeView( Kate::MainWindow *win ); @@ -140,7 +140,7 @@ class InsertElement : public KDialogBase TQ_OBJECT public: - InsertElement( TQWidget *tqparent, const char *name ); + InsertElement( TQWidget *parent, const char *name ); ~InsertElement(); TQString showDialog( TQStringList &completions ); private slots: diff --git a/kate/xmltools/pseudo_dtd.cpp b/kate/xmltools/pseudo_dtd.cpp index 51d1fe3..99de846 100644 --- a/kate/xmltools/pseudo_dtd.cpp +++ b/kate/xmltools/pseudo_dtd.cpp @@ -192,7 +192,7 @@ bool PseudoDTD::parseElements( TQDomDocument *doc, TQProgressDialog *progress ) } /** - * Check which elements are allowed inside a tqparent element. This returns + * Check which elements are allowed inside a parent 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. */ diff --git a/kate/xmltools/testcases.xml b/kate/xmltools/testcases.xml index 9828751..e66fc60 100644 --- a/kate/xmltools/testcases.xml +++ b/kate/xmltools/testcases.xml @@ -62,7 +62,7 @@ it should be inserted, including the trailing semicolon. blah X -- inside is not allowed, but this limitation is not part of the DTD, so the plugin will incorrectly claim that is allowed at "X". foobar X -- is only allowed once, but the plugin - only looks for the tqparent element (<head> in this case) and ignores the existing <title>. + only looks for the parent 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. -- cgit v1.2.1