diff options
Diffstat (limited to 'quanta/src/dtds.cpp')
| -rw-r--r-- | quanta/src/dtds.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
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"); |