rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

12 files changed, 50 insertions, 50 deletions

diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index 4e715a4a..b2663e27 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -93,8 +93,8 @@
 extern GroupElementMapList globalGroupMap;
 
 Document::Document(KTextEditor::Document *doc,
-                   TQWidget *tqparent, const char *name, WFlags f )
-  : TQWidget(tqparent, name, f)
+                   TQWidget *parent, const char *name, WFlags f )
+  : TQWidget(parent, name, f)
 {
   m_dirty   = false;
   busy    = false;
@@ -102,7 +102,7 @@ Document::Document(KTextEditor::Document *doc,
   m_md5sum = "";
   m_doc = doc;
   m_view = 0L; //needed, because createView() calls processEvents() and the "this" may be deleted before m_view gets a value => crash on delete m_view;
-  m_view = m_doc->createView(tqparent, 0L);
+  m_view = m_doc->createView(parent, 0L);
   completionInProgress = false;
   argHintVisible = false;
   completionRequested = false;
@@ -978,9 +978,9 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string)
     if (string == "/" && s.endsWith("</") && tagName.isEmpty())
     {
       Node *node = parser->nodeAt(line, column, false);
-      if (node && node->tqparent )
+      if (node && node->parent )
       {
-        node = node->tqparent;
+        node = node->parent;
         if (node->tag->type == Tag::XmlTag && (!node->next || !QuantaCommon::closesTag(node->tag, node->next->tag)))
         {
             TQString name = node->tag->name;
@@ -1135,7 +1135,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getGroupCompletions(Node *n
           Node *n = node;
           while (n && n != elementList[i]->parentNode)
           {
-            n = n->tqparent;
+            n = n->parent;
           }
           if (n == elementList[i]->parentNode)
           {
@@ -1205,12 +1205,12 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
   }
   Node *node = parser->nodeAt(line, col);
   if (node && node->tag->type != Tag::XmlTag)
-      node = node->tqparent;
+      node = node->parent;
   if (node && node->tag->type != Tag::XmlTag)
       node = 0L;
   TQTag *parentTQTag= 0L;
-  if (node && node->tqparent)
-      parentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
+  if (node && node->parent)
+      parentTQTag = QuantaCommon::tagFromDTD(node->parent);
   TQString textLine = editIf->textLine(line).left(col);
   TQString word = findWordRev(textLine, completionDTD).upper();
   TQString classStr = "";
@@ -1260,7 +1260,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
               it = n->m_groupElements.erase(it);
             }
             delete gParser;
-            n = n->tqparent;
+            n = n->parent;
           }
         } else
         {
@@ -1759,8 +1759,8 @@ bool Document::scriptAutoCompletion(int line, int column, const TQString& insert
  if (node->prev)
    node = node->prev;
  else
- if (node->tqparent)
-   node = node->tqparent;
+ if (node->parent)
+   node = node->parent;
 
  int bl, bc;
  node->tag->beginPos(bl, bc);
diff --git a/quanta/src/document.h b/quanta/src/document.h
index 360b9a4c..ff76fbb3 100644
--- a/quanta/src/document.h
+++ b/quanta/src/document.h
@@ -72,7 +72,7 @@ class Document : public TQWidget{
 
 public:
   Document(KTextEditor::Document *doc,
-           TQWidget *tqparent = 0, const char *name = 0, WFlags f=0);
+           TQWidget *parent = 0, const char *name = 0, WFlags f=0);
   ~Document();
 
   KURL url();
diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp
index 7b26bc7a..abf0a292 100644
--- a/quanta/src/dtds.cpp
+++ b/quanta/src/dtds.cpp
@@ -56,12 +56,12 @@ const TQString m_rcFilename("description.rc");
   This constructor reads the dictionary of known dtd's, the attributes and tags will be loaded
   on the first access to one dtd.
 */
-DTDs::DTDs(TQObject *tqparent)
-  :TQObject(tqparent)
+DTDs::DTDs(TQObject *parent)
+  :TQObject(parent)
 {
-  connect(this, TQT_SIGNAL(hideSplash()), tqparent, TQT_SLOT(slotHideSplash()));
-  connect(this, TQT_SIGNAL(enableIdleTimer(bool)), tqparent, TQT_SLOT(slotEnableIdleTimer(bool)));
-  connect(this, TQT_SIGNAL(loadToolbarForDTD(const TQString&)), tqparent, TQT_SLOT(slotLoadToolbarForDTD(const TQString&)));
+  connect(this, TQT_SIGNAL(hideSplash()), parent, TQT_SLOT(slotHideSplash()));
+  connect(this, TQT_SIGNAL(enableIdleTimer(bool)), parent, TQT_SLOT(slotEnableIdleTimer(bool)));
+  connect(this, TQT_SIGNAL(loadToolbarForDTD(const TQString&)), parent, TQT_SLOT(slotLoadToolbarForDTD(const TQString&)));
 //  kdDebug(24000) << "dtds::dtds" << endl;
   m_dict = new TQDict<DTDStruct>(119, false); //optimized for max 119 DTD. This should be enough.
   m_dict->setAutoDelete(true);
@@ -620,8 +620,8 @@ void DTDs::resolveInherited (DTDStruct *dtd)
   //Resolve the inheritence
   if (!dtd->inheritsTagsFrom.isEmpty())
   {
-    DTDStruct *tqparent = (DTDStruct *) find(dtd->inheritsTagsFrom);  // this loads the dtd, if not present in memory
-    TQDictIterator<TQTag> tag_it(*(tqparent->tagsList));
+    DTDStruct *parent = (DTDStruct *) find(dtd->inheritsTagsFrom);  // this loads the dtd, if not present in memory
+    TQDictIterator<TQTag> tag_it(*(parent->tagsList));
     for ( ; tag_it.current(); ++tag_it)
     {
       TQTag *tag = tag_it.current();
diff --git a/quanta/src/dtds.h b/quanta/src/dtds.h
index 0ecf30cb..4bc5f2f4 100644
--- a/quanta/src/dtds.h
+++ b/quanta/src/dtds.h
@@ -57,10 +57,10 @@ public:
    *  since this class is a singleton you must use this function to access it
    *  @return the class pointer
    */
-  static DTDs* ref(TQObject *tqparent = 0L)
+  static DTDs* ref(TQObject *parent = 0L)
   {
     static DTDs *m_ref;
-    if (!m_ref) m_ref = new DTDs(tqparent);
+    if (!m_ref) m_ref = new DTDs(parent);
     return m_ref;
   }
 
@@ -179,7 +179,7 @@ private:
    *  If you need the class use DTDs::ref() for
    *  construction and reference
    */
-  DTDs(TQObject *tqparent);
+  DTDs(TQObject *parent);
 
 
   /** Reads the tag files and the description.rc from tagDir in order to
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index 27391537..11747dee 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -1781,7 +1781,7 @@ void QuantaApp::slotShowAnnotationView()
   makeDockVisible(dynamic_cast<KDockWidget*>(m_annotationOutputView->wrapperWidget()));
 }
 
-TQWidget* QuantaApp::createContainer( TQWidget *tqparent, int index, const TQDomElement &element, int &id )
+TQWidget* QuantaApp::createContainer( TQWidget *parent, int index, const TQDomElement &element, int &id )
 {
 
   TQString tabname = element.attribute( "i18ntabname", "" );
@@ -1822,18 +1822,18 @@ TQWidget* QuantaApp::createContainer( TQWidget *tqparent, int index, const TQDom
     return tb;
   }
 
-  return KMainWindow::createContainer( tqparent, index, element, id );
+  return KMainWindow::createContainer( parent, index, element, id );
 
 }
 
-void QuantaApp::removeContainer( TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id )
+void QuantaApp::removeContainer( TQWidget *container, TQWidget *parent, TQDomElement &element, int id )
 {
   if (dynamic_cast<QuantaToolBar*>(container))
   {
     ToolbarTabWidget::ref()->removePage(container);
   }
   else
-    KMainWindow::removeContainer( container, tqparent, element, id );
+    KMainWindow::removeContainer( container, parent, element, id );
 }
 
 void QuantaApp::slotBack()
@@ -4442,21 +4442,21 @@ void QuantaApp::slotInsertCSS()
   if (styleNode->tag->type == Tag::XmlTagEnd && styleNode->prev)
     styleNode = styleNode->prev;
 
-  while (styleNode && styleNode->tqparent && styleNode->tag->name.lower() != "style" && styleNode->tag->dtd()->name == "text/css")
-    styleNode = styleNode->tqparent;
+  while (styleNode && styleNode->parent && styleNode->tag->name.lower() != "style" && styleNode->tag->dtd()->name == "text/css")
+    styleNode = styleNode->parent;
 
   Node *parentNode = node;
   if (parentNode->tag->type == Tag::XmlTagEnd && parentNode->prev)
     parentNode = parentNode->prev;
   else
-    while (parentNode && parentNode->tqparent &&
+    while (parentNode && parentNode->parent &&
            parentNode->tag->type != Tag::XmlTag)
-      parentNode = parentNode->tqparent;
+      parentNode = parentNode->parent;
   TQString fullDocument = w->editIf->text().stripWhiteSpace();
 
-  if (styleNode->tag->name.lower() == "comment block" && styleNode->tqparent) {
-    if (styleNode->tqparent->tag->name.lower() == "style") {
-      styleNode = styleNode->tqparent;
+  if (styleNode->tag->name.lower() == "comment block" && styleNode->parent) {
+    if (styleNode->parent->tag->name.lower() == "style") {
+      styleNode = styleNode->parent;
     }
   }
 
diff --git a/quanta/src/quanta.h b/quanta/src/quanta.h
index 811fa60c..7d9c2867 100644
--- a/quanta/src/quanta.h
+++ b/quanta/src/quanta.h
@@ -132,8 +132,8 @@ public:
   DebuggerManager *debugger() const {return m_debugger;}
   KParts::PartManager *partManager() {return m_partManager;}
 
-  TQWidget* createContainer(TQWidget *tqparent, int index, const TQDomElement &element, int &id );
-  void removeContainer(TQWidget *container, TQWidget *tqparent, TQDomElement &element, int id );
+  TQWidget* createContainer(TQWidget *parent, int index, const TQDomElement &element, int &id );
+  void removeContainer(TQWidget *container, TQWidget *parent, TQDomElement &element, int id );
 /** Returns the project's base URL if it exists, the HOME dir if there is no project and no opened document (or the current opened document was not saved yet), and the base URL of the opened document, if it is saved somewhere.
 
   maps to the same function in Project*/
diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index aba09d7d..9884d01a 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -76,7 +76,7 @@
 #include "tagactionmanager.h"
 #include "tagactionset.h"
 
-QuantaDoc::QuantaDoc(TQWidget *tqparent, const char *name) : TQObject(tqparent, name)
+QuantaDoc::QuantaDoc(TQWidget *parent, const char *name) : TQObject(parent, name)
 {
   fileWatcher = new KDirWatch(this);
 
diff --git a/quanta/src/quantadoc.h b/quanta/src/quantadoc.h
index 48c3b631..0da3ff5e 100644
--- a/quanta/src/quantadoc.h
+++ b/quanta/src/quantadoc.h
@@ -32,7 +32,7 @@ class QuantaDoc : public TQObject
 
 public:
 
-  QuantaDoc(TQWidget *tqparent, const char *name=0);
+  QuantaDoc(TQWidget *parent, const char *name=0);
   ~QuantaDoc();
 
   bool newDocument(const KURL&, bool switchToExisting = true);
diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index dbbb6578..fcfe0871 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -76,8 +76,8 @@
 extern int NN;
 extern TQValueList<Node*> nodes;
 
-QuantaView::QuantaView(TQWidget *tqparent, const char *name, const TQString &caption )
-  : KMdiChildView(tqparent, name)
+QuantaView::QuantaView(TQWidget *parent, const char *name, const TQString &caption )
+  : KMdiChildView(parent, name)
   , m_document(0L)
   , m_plugin(0L)
   , m_customWidget(0L)
@@ -833,11 +833,11 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString
 
     nodeParent = nodeCursor;
     if (nodeParent->tag->type == Tag::Text)
-        nodeParent = nodeParent->tqparent;
+        nodeParent = nodeParent->parent;
 
-  //Checking if at least one tqparent of node can have a Text Node as child, otherwise
+  //Checking if at least one parent of node can have a Text Node as child, otherwise
   //it is impossible for the
-  //user to add this node. In that case, try to insert the Node in the closest tqparent accepting it.
+  //user to add this node. In that case, try to insert the Node in the closest parent accepting it.
   //e.g. TR : a normal insertion would require to have the caret in the TABLE Node, but it is
               //impossible
     nodeTQTag = QuantaCommon::tagFromDTD(m_document->defaultDTD(),
@@ -904,7 +904,7 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString
       nodeTreeModified = false;
       if (specialTagInsertion)
       {
-        //let's try to insert this node in the closest tqparent accepting it.
+        //let's try to insert this node in the closest parent accepting it.
         while (nodeParent)
         {
           nodeParentTQTag =
@@ -919,7 +919,7 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString
             nodeTreeModified = true;
             break;
           }
-          nodeParent = nodeParent->tqparent;
+          nodeParent = nodeParent->parent;
         }
       }
       else if (hasSelection && !nodeTQTag->isSingle())
diff --git a/quanta/src/quantaview.h b/quanta/src/quantaview.h
index dc6d7414..bf80aff1 100644
--- a/quanta/src/quantaview.h
+++ b/quanta/src/quantaview.h
@@ -68,7 +68,7 @@ class QuantaView : public KMdiChildView
 
 public:
 
-  QuantaView(TQWidget *tqparent = 0, const char *name=0, const TQString &caption = TQString());
+  QuantaView(TQWidget *parent = 0, const char *name=0, const TQString &caption = TQString());
   ~QuantaView();
 
   /** returns true if the view can be removed, false otherwise */
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index eb7ef971..6a6294e3 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -61,7 +61,7 @@
 #define UPLOAD_ID 12
 #define DELETE_ID 13
 
-ViewManager::ViewManager(TQObject *tqparent, const char *name) : TQObject(tqparent, name)
+ViewManager::ViewManager(TQObject *parent, const char *name) : TQObject(parent, name)
 {
     m_lastActiveView = 0L;
     m_lastActiveEditorView = 0L;
diff --git a/quanta/src/viewmanager.h b/quanta/src/viewmanager.h
index 9b600d00..31f0a761 100644
--- a/quanta/src/viewmanager.h
+++ b/quanta/src/viewmanager.h
@@ -35,10 +35,10 @@ class ViewManager : public TQObject
   TQ_OBJECT
 public:
   /** Returns a reference to the viewmanager object */
-  static ViewManager* const ref(TQObject *tqparent = 0L, const char *name = 0L)
+  static ViewManager* const ref(TQObject *parent = 0L, const char *name = 0L)
   {
     static ViewManager *m_ref;
-    if (!m_ref) m_ref = new ViewManager(tqparent, name);
+    if (!m_ref) m_ref = new ViewManager(parent, name);
     return m_ref;
   }
   /** The destructor. */
@@ -124,7 +124,7 @@ private slots:
 
 private:
   /** Private constructor for the singleton object. */
-  ViewManager(TQObject * tqparent = 0, const char * name = 0);
+  ViewManager(TQObject * parent = 0, const char * name = 0);
   /** Returns true if there isn't any opened view holding an editor */
   bool allEditorsClosed();