Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

8 files changed, 58 insertions, 58 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;
diff --git a/quanta/src/dtds.cpp b/quanta/src/dtds.cpp
index 5061abd4..d6bdd9e1 100644
--- a/quanta/src/dtds.cpp
+++ b/quanta/src/dtds.cpp
@@ -322,7 +322,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
       delete tag;
       continue; //skip this tag
     }
-    tag->tqparentDTD = dtd;
+    tag->parentDTD = dtd;
     //read the possible stopping tags
     TQStrList stoppingTags;
     dtdConfig->readListEntry(tag->name() + "_stoppingtags",stoppingTags);
@@ -547,7 +547,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
         group.hasDefinitionRx = !group.definitionRx.pattern().isEmpty();
         group.isMinimalDefinitionRx = dtdConfig->readBoolEntry("DefinitionRx_Minimal", false);
         group.appendToTags = dtdConfig->readBoolEntry("AppendToTags", false);
-        group.tqparentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace();
+        group.parentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace();
         tagStr = dtdConfig->readEntry("TagType", "Text").stripWhiteSpace();
         if (tagStr == "XmlTag")
             group.tagType = Tag::XmlTag;
@@ -588,7 +588,7 @@ bool DTDs::readTagDir2(DTDStruct *dtd)
         group.noName = dtdConfig->readEntry("No_Name").stripWhiteSpace();
         group.icon = dtdConfig->readEntry("Icon").stripWhiteSpace();
         group.appendToTags = dtdConfig->readBoolEntry("AppendToTags", false);
-        group.tqparentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace();
+        group.parentGroup = dtdConfig->readEntry("ParentGroup").stripWhiteSpace();
         TQString tagStr = dtdConfig->readEntry("Tag").stripWhiteSpace();
         if (!tagStr.isEmpty())
         {
@@ -667,7 +667,7 @@ void DTDs::resolveInherited (DTDStruct *dtd)
 
 
 /** Reads the tags for the tag files. Returns the number of read tags. */
-uint DTDs::readTagFile(const TQString& fileName, DTDStruct* tqparentDTD, TQTagList *tagList)
+uint DTDs::readTagFile(const TQString& fileName, DTDStruct* parentDTD, TQTagList *tagList)
 {
 //  kdDebug(24000) << "dtds::readTagFile:" << fileName << endl;
  TQFile f(fileName);
@@ -702,13 +702,13 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* tqparentDTD, TQTagLi
       TQString extends = e.attribute("extends");
       TQString name = e.attribute("name");
       if (!name.isEmpty() && !extends.isEmpty())
-        tqparentDTD->classInheritance[name] = extends;
+        parentDTD->classInheritance[name] = extends;
       continue;
     }
     TQTag *tag = new TQTag();
     tag->setName(e.attribute("name"));
     tag->setFileName(fileName);
-    tag->tqparentDTD = tqparentDTD;
+    tag->parentDTD = parentDTD;
     bool common = false;
     setAttributes(&n, tag, common);
     if (common)
@@ -720,10 +720,10 @@ uint DTDs::readTagFile(const TQString& fileName, DTDStruct* tqparentDTD, TQTagLi
       commonAttrList->setAutoDelete(true);
       *commonAttrList = *attrs;
       //delete tag;
-      tqparentDTD->commonAttrs->insert(groupName, commonAttrList);
+      parentDTD->commonAttrs->insert(groupName, commonAttrList);
     } else
     {
-      if (tqparentDTD->caseSensitive)
+      if (parentDTD->caseSensitive)
       {
         tagList->tqreplace(tag->name(), tag);  //append the tag to the list for this DTD
       } else
@@ -750,9 +750,9 @@ void DTDs::setAttributes(TQDomNode *dom, TQTag* tag, bool &common)
  tmpStr = el.attribute("common");
  if ((tmpStr != "1" && tmpStr != "yes")) //in case of common tags, we are not interested in these options
  {
-    if (tag->tqparentDTD->commonAttrs)
+    if (tag->parentDTD->commonAttrs)
     {
-      TQDictIterator<AttributeList> it(*(tag->tqparentDTD->commonAttrs));
+      TQDictIterator<AttributeList> it(*(tag->parentDTD->commonAttrs));
       for( ; it.current(); ++it )
       {
         TQString lookForAttr = "has" + TQString(it.currentKey()).stripWhiteSpace();
@@ -804,7 +804,7 @@ void DTDs::setAttributes(TQDomNode *dom, TQTag* tag, bool &common)
         if (tmpStr == "child")
         {
             TQString childTag = item.attribute("name");
-            if (!tag->tqparentDTD->caseSensitive)
+            if (!tag->parentDTD->caseSensitive)
                 childTag = childTag.upper();
             tag->childTags.insert(childTag, item.attribute("usage") == "required");
         }
@@ -820,7 +820,7 @@ void DTDs::setAttributes(TQDomNode *dom, TQTag* tag, bool &common)
        if (item.tagName() == "stoppingtag")
        {
          TQString stopTag = item.attribute("name");
-         if (!tag->tqparentDTD->caseSensitive)
+         if (!tag->parentDTD->caseSensitive)
             stopTag = stopTag.upper();
          tag->stoppingTags.append(stopTag);
        }
@@ -837,7 +837,7 @@ void DTDs::setAttributes(TQDomNode *dom, TQTag* tag, bool &common)
      attr->method = el.attribute("method");
      attr->arguments = el.attribute("arguments");
 
-     attr->type = el.attribute("type",tag->tqparentDTD->defaultAttrType);
+     attr->type = el.attribute("type",tag->parentDTD->defaultAttrType);
      attr->defaultValue = el.attribute("defaultValue");
      attr->status = el.attribute("status");
 
diff --git a/quanta/src/dtds.h b/quanta/src/dtds.h
index ae7c28f1..4f351182 100644
--- a/quanta/src/dtds.h
+++ b/quanta/src/dtds.h
@@ -209,11 +209,11 @@ private:
   /** Reads the tags from the tag files.
    *
    * @param fileName path of the tag file
-   * @param tqparentDTD the DTD where the tags belog to
+   * @param parentDTD the DTD where the tags belog to
    * @param tagList the list where the tags are inserted
    * @return the number of read tags.
    */
-  uint readTagFile(const TQString& fileName, DTDStruct* tqparentDTD, TQTagList *tagList);
+  uint readTagFile(const TQString& fileName, DTDStruct* parentDTD, TQTagList *tagList);
 
   /** Parses the dom document and retrieve the tag attributes
   *
diff --git a/quanta/src/quanta.cpp b/quanta/src/quanta.cpp
index 1ca3aa96..cb4795a3 100644
--- a/quanta/src/quanta.cpp
+++ b/quanta/src/quanta.cpp
@@ -1026,7 +1026,7 @@ void QuantaApp::slotOptionsConfigureKeys()
           el.setAttribute("shortcut", action->shortcut().toString());
           el = node.toElement();
           node = node.nextSibling();
-          el.tqparentNode().removeChild(el);
+          el.parentNode().removeChild(el);
         } else
         {
           node = node.nextSibling();
@@ -2846,7 +2846,7 @@ void QuantaApp::slotRenameToolbar(const TQString& name)
       {
         if (tb->id(i) == name)
         {
-          tb->setTabLabel(tb->page(i)->tqparentWidget(), i18n(p_toolbar->name.utf8()));
+          tb->setTabLabel(tb->page(i)->parentWidget(), i18n(p_toolbar->name.utf8()));
           m_tagsMenu->changeItem(m_tagsMenu->idAt(i + 2), i18n(p_toolbar->name.utf8()));
           break;
         }
@@ -2920,7 +2920,7 @@ void QuantaApp::slotDeleteAction(KAction *action)
       //we found a toolbar that contains the action
       if (nodeList.item(j).toElement().attribute("name") == actionName)
       {
-        nodeList.item(j).tqparentNode().removeChild(nodeList.item(j));
+        nodeList.item(j).parentNode().removeChild(nodeList.item(j));
         KXMLGUIFactory::saveConfigFile(guiClient->domDocument(), guiClient->xmlFile());
         break;
       }
@@ -2976,7 +2976,7 @@ void QuantaApp::slotRemoveAction(const TQString& toolbarName, const TQString& a_
         {
           action->unplug(ToolbarTabWidget::ref()->page(toolbarName));
           action->unplug(p_toolbar->menu);
-          node.tqparentNode().removeChild(node);
+          node.parentNode().removeChild(node);
         }
         node = node.nextSibling();
       }
@@ -4445,13 +4445,13 @@ void QuantaApp::slotInsertCSS()
   while (styleNode && styleNode->tqparent && styleNode->tag->name.lower() != "style" && styleNode->tag->dtd()->name == "text/css")
     styleNode = styleNode->tqparent;
 
-  Node *tqparentNode = node;
-  if (tqparentNode->tag->type == Tag::XmlTagEnd && tqparentNode->prev)
-    tqparentNode = tqparentNode->prev;
+  Node *parentNode = node;
+  if (parentNode->tag->type == Tag::XmlTagEnd && parentNode->prev)
+    parentNode = parentNode->prev;
   else
-    while (tqparentNode && tqparentNode->tqparent &&
-           tqparentNode->tag->type != Tag::XmlTag)
-      tqparentNode = tqparentNode->tqparent;
+    while (parentNode && parentNode->tqparent &&
+           parentNode->tag->type != Tag::XmlTag)
+      parentNode = parentNode->tqparent;
   TQString fullDocument = w->editIf->text().stripWhiteSpace();
 
   if (styleNode->tag->name.lower() == "comment block" && styleNode->tqparent) {
@@ -4513,29 +4513,29 @@ void QuantaApp::slotInsertCSS()
       }
      delete dlg;
   } else
-  if (tqparentNode && tqparentNode->tag->type == Tag::XmlTag)
+  if (parentNode && parentNode->tag->type == Tag::XmlTag)
   {
-        kdDebug(24000) << "[CSS editor] We will add a style attribute to: " << tqparentNode->tag->name << endl;
+        kdDebug(24000) << "[CSS editor] We will add a style attribute to: " << parentNode->tag->name << endl;
     CSSEditor *dlg = new CSSEditor(this);
     TQFileInfo fi(ViewManager::ref()->currentURL());
     dlg->setFileToPreview(projectBaseURL().path() +  fi.baseName(),false);
 
 
-    tqparentNode->tag->beginPos(bLine, bCol);
-    tqparentNode->tag->endPos(eLine, eCol);
+    parentNode->tag->beginPos(bLine, bCol);
+    parentNode->tag->endPos(eLine, eCol);
     dlg->setFooter(">" + w->text(eLine, eCol + 1, lastLine, lastCol));
 
     TQString temp;
-    if (tqparentNode->tag->hasAttribute("style"))
+    if (parentNode->tag->hasAttribute("style"))
     {
-      dlg->setInlineStyleContent(tqparentNode->tag->attributeValue("style"));
-      Tag tempTag(*(tqparentNode->tag));
+      dlg->setInlineStyleContent(parentNode->tag->attributeValue("style"));
+      Tag tempTag(*(parentNode->tag));
       tempTag.deleteAttribute("style");
       temp = tempTag.toString();
 
     } else {
       dlg->setInlineStyleContent(TQString());
-      temp = tqparentNode->tag->toString();
+      temp = parentNode->tag->toString();
     }
     //using TQString::mid sometimes generates strange results; maybe this is due to a (random) blank in temp
     temp = temp.left(temp.length()-1);//remove >
@@ -4545,7 +4545,7 @@ void QuantaApp::slotInsertCSS()
     dlg->initialize();
     if( dlg->exec() )
     {
-      w->changeTagAttribute(tqparentNode->tag, "style", dlg->generateProperties());
+      w->changeTagAttribute(parentNode->tag, "style", dlg->generateProperties());
     }
     delete dlg;
    } else
diff --git a/quanta/src/quanta_init.cpp b/quanta/src/quanta_init.cpp
index d1e2054c..d188adee 100644
--- a/quanta/src/quanta_init.cpp
+++ b/quanta/src/quanta_init.cpp
@@ -229,7 +229,7 @@ void QuantaInit::initQuanta()
       TQDomElement el = node.toElement();
       m_quanta->oldShortcuts.insert(el.attribute("name"), el.attribute("shortcut"));
       node = node.nextSibling();
-      el.tqparentNode().removeChild(el);
+      el.parentNode().removeChild(el);
     } else
     {
       node = node.nextSibling();
diff --git a/quanta/src/quantadoc.cpp b/quanta/src/quantadoc.cpp
index 1ea690dc..4bebfcc3 100644
--- a/quanta/src/quantadoc.cpp
+++ b/quanta/src/quantadoc.cpp
@@ -292,7 +292,7 @@ void QuantaDoc::slotAttribPopup()
       for (TQStringList::Iterator it = qtag->commonGroups.begin(); it != qtag->commonGroups.end(); ++it)
       {
        TQPopupMenu* popUpMenu = new TQPopupMenu(attribMenu, (*it).latin1());
-       AttributeList *attrs = qtag->tqparentDTD->commonAttrs->tqfind(*it);
+       AttributeList *attrs = qtag->parentDTD->commonAttrs->tqfind(*it);
        for (uint j = 0; j < attrs->count(); j++)
        {
         name = attrs->at(j)->name;
@@ -348,7 +348,7 @@ void QuantaDoc::slotInsertAttrib( int id )
         TQTag* qtag = QuantaCommon::tagFromDTD(w->getDTDIdentifier(), tagName);
         for (TQStringList::Iterator it = qtag->commonGroups.begin(); it != qtag->commonGroups.end(); ++it)
         {
-          AttributeList *attrs = qtag->tqparentDTD->commonAttrs->tqfind(*it);
+          AttributeList *attrs = qtag->parentDTD->commonAttrs->tqfind(*it);
           menuId += attrs->count();
           if (id <= menuId)
           {
diff --git a/quanta/src/quantaview.cpp b/quanta/src/quantaview.cpp
index 988bf338..45b06603 100644
--- a/quanta/src/quantaview.cpp
+++ b/quanta/src/quantaview.cpp
@@ -846,7 +846,7 @@ void QuantaView::insertOutputInTheNodeTree(const TQString &str1, const TQString
     if (!nodeTQTag)
         return;
 
-    qTagList = nodeTQTag->tqparents();
+    qTagList = nodeTQTag->parents();
 #ifdef HEAVY_DEBUG
     kdDebug(25001)<< "nodeTQTag name : " << nodeTQTag->name() << endl;
     /**kdDebug(25001)<< nodeTQTag->isChild("#text", false) << endl;
diff --git a/quanta/src/viewmanager.cpp b/quanta/src/viewmanager.cpp
index bc91a218..b2c598c6 100644
--- a/quanta/src/viewmanager.cpp
+++ b/quanta/src/viewmanager.cpp
@@ -257,7 +257,7 @@ void ViewManager::slotCloseOtherTabs()
    if (dynamic_cast<QuantaView*>(currentView) && !static_cast<QuantaView*>(currentView)->document())
      ToolbarTabWidget::ref()->reparent(0, 0, TQPoint(), false);
   KMdiIterator<KMdiChildView*> *it = quantaApp->createIterator();
-  //save the tqchildren first to a list, as removing tqinvalidates our iterator
+  //save the tqchildren first to a list, as removing invalidates our iterator
   TQValueList<KMdiChildView *> tqchildren;
   for (it->first(); !it->isDone(); it->next())
   {
@@ -427,7 +427,7 @@ bool ViewManager::closeAll(bool createNew)
   parser->setSAParserEnabled(false);
   KMdiIterator<KMdiChildView*> *it = quantaApp->createIterator();
   QuantaView *view;
-  //save the tqchildren first to a list, as removing tqinvalidates our iterator
+  //save the tqchildren first to a list, as removing invalidates our iterator
   TQValueList<KMdiChildView *> tqchildren;
   for (it->first(); !it->isDone(); it->next())
   {