1 files changed, 18 insertions, 18 deletions

diff --git a/quanta/src/document.cpp b/quanta/src/document.cpp
index c0dc3816..9b136e58 100644
--- a/quanta/src/document.cpp
+++ b/quanta/src/document.cpp
@@ -565,9 +565,9 @@ bool Document::insertChildTags(TQTag *tag, TQTag *lastTag)
     if (it.data())
     {
       childInserted = true;
-      TQTag *childTag = QuantaCommon::tagFromDTD(tag->tqparentDTD, it.key());
+      TQTag *childTag = QuantaCommon::tagFromDTD(tag->parentDTD, it.key());
       TQString tagStr =QuantaCommon::tagCase(it.key());
-      if ( tag->tqparentDTD->singleTagStyle == "xml" &&
+      if ( tag->parentDTD->singleTagStyle == "xml" &&
            ( childTag->isSingle() ||
             (childTag->isOptional() && !qConfig.closeOptionalTags)) )
       {
@@ -1000,7 +1000,7 @@ bool Document::xmlAutoCompletion(int line, int column, const TQString & string)
     if ( string == ">" && tagName[0] != '/' && !tagName.endsWith("/") &&
          !s.endsWith("/>") && tag)
     {
-      if ( tag->tqparentDTD->singleTagStyle == "xml" &&
+      if ( tag->parentDTD->singleTagStyle == "xml" &&
            (tag->isSingle() || (!qConfig.closeOptionalTags && tag->isOptional()))
          )
       {
@@ -1125,7 +1125,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getGroupCompletions(Node *n
       GroupElementList elementList = it.data();
       for (uint i = 0; i < elementList.count(); i++)
       {
-        if (elementList[i]->tqparentNode == 0L || elementList[i]->global)
+        if (elementList[i]->parentNode == 0L || elementList[i]->global)
         {
           completion.text = it.key().section('|', -1).stripWhiteSpace();
           completions->append(completion);
@@ -1133,11 +1133,11 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getGroupCompletions(Node *n
         } else
         {
           Node *n = node;
-          while (n && n != elementList[i]->tqparentNode)
+          while (n && n != elementList[i]->parentNode)
           {
             n = n->tqparent;
           }
-          if (n == elementList[i]->tqparentNode)
+          if (n == elementList[i]->parentNode)
           {
             completion.text = it.key().section('|', -1).stripWhiteSpace();
             completions->append(completion);
@@ -1172,15 +1172,15 @@ bool Document::isDerivatedFrom(const TQString& className, const TQString &baseCl
   if (className.isEmpty() || !completionDTD->classInheritance.tqcontains(className))
     return false;
 
-  TQString tqparentClass = completionDTD->classInheritance[className];
+  TQString parentClass = completionDTD->classInheritance[className];
   int result = 0;
   do {
-    if (tqparentClass == baseClass)
+    if (parentClass == baseClass)
       result = 1; //className extends baseClass
     else
     {
-      if (completionDTD->classInheritance.tqcontains(tqparentClass))
-        tqparentClass = completionDTD->classInheritance[tqparentClass];
+      if (completionDTD->classInheritance.tqcontains(parentClass))
+        parentClass = completionDTD->classInheritance[parentClass];
       else
         result = -1;//nothing was found in the inheritance list
     }
@@ -1208,9 +1208,9 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
       node = node->tqparent;
   if (node && node->tag->type != Tag::XmlTag)
       node = 0L;
-  TQTag *tqparentTQTag= 0L;
+  TQTag *parentTQTag= 0L;
   if (node && node->tqparent)
-      tqparentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
+      parentTQTag = QuantaCommon::tagFromDTD(node->tqparent);
   TQString textLine = editIf->textLine(line).left(col);
   TQString word = findWordRev(textLine, completionDTD).upper();
   TQString classStr = "";
@@ -1229,7 +1229,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
         objStr = r->cap(1);
         if (objStr == "this")
         {
-          TQString tqparentGroupStr = "";
+          TQString parentGroupStr = "";
           bool classFound = false;
           parser->synchParseInDetail(); 
           Node *n = parser->nodeAt(line, col);
@@ -1244,11 +1244,11 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
             while (it != n->m_groupElements.end())
             {
               GroupElement *e = *it;
-              if (tqparentGroupStr.isEmpty() && e->group->appendToTags)
+              if (parentGroupStr.isEmpty() && e->group->appendToTags)
               {
-                tqparentGroupStr = e->group->tqparentGroup;
+                parentGroupStr = e->group->parentGroup;
               }
-              if (!tqparentGroupStr.isEmpty() && e->group->name == tqparentGroupStr)
+              if (!parentGroupStr.isEmpty() && e->group->name == parentGroupStr)
               {
                 classStr = e->tag->name;
                 classFound = true;
@@ -1301,7 +1301,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getTagCompletions(int line,
       tagName = tag->name();
       if (!tagName.isEmpty() && tagName.upper().startsWith(word))
       {
-        if (!tqparentTQTag || (tqparentTQTag && tqparentTQTag->isChild(tagName)))
+        if (!parentTQTag || (parentTQTag && parentTQTag->isChild(tagName)))
         {
           tagName = tag->name() + TQString("%1").tqarg(i, 10);
           tagNameList += tagName;
@@ -1438,7 +1438,7 @@ TQValueList<KTextEditor::CompletionEntry>* Document::getAttributeCompletions(con
               //list common attributes for this tag
               for (TQStringList::Iterator it = tag->commonGroups.begin(); it != tag->commonGroups.end(); ++it)
               {
-                AttributeList *attrs = tag->tqparentDTD->commonAttrs->tqfind(*it);
+                AttributeList *attrs = tag->parentDTD->commonAttrs->tqfind(*it);
                 for (uint j = 0; j < attrs->count(); j++)
                 {
                   TQString name = attrs->at(j)->name;