diff options
Diffstat (limited to 'umbrello/umbrello/codegenerators')
38 files changed, 122 insertions, 122 deletions
diff --git a/umbrello/umbrello/codegenerators/adawriter.cpp b/umbrello/umbrello/codegenerators/adawriter.cpp index 475be180..d081ce0e 100644 --- a/umbrello/umbrello/codegenerators/adawriter.cpp +++ b/umbrello/umbrello/codegenerators/adawriter.cpp @@ -483,9 +483,9 @@ void AdaWriter::writeOperation(UMLOperation *op, TQTextStream &ada, bool is_comm ada << cleanName(op->getName()) << " "; if (! (op->getStatic() && atl.count() == 0)) ada << "("; - UMLClassifier *tqparentClassifier = static_cast<UMLClassifier*>(op->getUMLPackage()); + UMLClassifier *parentClassifier = static_cast<UMLClassifier*>(op->getUMLPackage()); if (! op->getStatic()) { - ada << "Self : access " << className(tqparentClassifier); + ada << "Self : access " << className(parentClassifier); if (atl.count()) ada << ";" << m_endl; } diff --git a/umbrello/umbrello/codegenerators/aswriter.cpp b/umbrello/umbrello/codegenerators/aswriter.cpp index e99559f2..20f9a4a4 100644 --- a/umbrello/umbrello/codegenerators/aswriter.cpp +++ b/umbrello/umbrello/codegenerators/aswriter.cpp @@ -602,7 +602,7 @@ const TQStringList ASWriter::reservedKeywords() const { << "or" << "ord" << "_parent" - << "tqparentNode" + << "parentNode" << "parseFloat" << "parseInt" << "parseXML" diff --git a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp index 7c8f0ff3..1e0bf353 100644 --- a/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp +++ b/umbrello/umbrello/codegenerators/cppcodeclassfield.cpp @@ -33,14 +33,14 @@ // Constructors/Destructors // -CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role) - : CodeClassField(tqparentDoc, role) +CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role) + : CodeClassField(parentDoc, role) { } -CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib) - : CodeClassField(tqparentDoc, attrib) +CPPCodeClassField::CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib) + : CodeClassField(parentDoc, attrib) { } @@ -55,7 +55,7 @@ CPPCodeClassField::~CPPCodeClassField ( ) { } // TQString CPPCodeClassField::getFieldName() { - if (tqparentIsAttribute()) + if (parentIsAttribute()) { UMLAttribute * at = (UMLAttribute*) getParentObject(); return cleanName(at->getName()); @@ -80,7 +80,7 @@ TQString CPPCodeClassField::getListFieldClassName () { TQString CPPCodeClassField::getInitialValue() { - if (tqparentIsAttribute()) + if (parentIsAttribute()) { UMLAttribute * at = dynamic_cast<UMLAttribute*>( getParentObject() ); if (at) { diff --git a/umbrello/umbrello/codegenerators/cppcodeclassfield.h b/umbrello/umbrello/codegenerators/cppcodeclassfield.h index 0b714b16..7a76c7cc 100644 --- a/umbrello/umbrello/codegenerators/cppcodeclassfield.h +++ b/umbrello/umbrello/codegenerators/cppcodeclassfield.h @@ -37,8 +37,8 @@ public: /** * Constructors */ - CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role); - CPPCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib); + CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role); + CPPCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib); /** * Empty Destructor diff --git a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui index f2bef81e..6ca8377b 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/cppcodegenerationformbase.ui @@ -473,7 +473,7 @@ <Q_SLOTS> <slot>browseClicked()</slot> </Q_SLOTS> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>klineedit.h</includehint> <includehint>klineedit.h</includehint> diff --git a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp index 57ae0172..868dea41 100644 --- a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp @@ -25,10 +25,10 @@ // CPPHeaderClassDeclarationBlock::CPPHeaderClassDeclarationBlock - ( CPPHeaderCodeDocument * tqparentDoc, const TQString &startText, const TQString &endText, const TQString &comment) - : OwnedHierarchicalCodeBlock(tqparentDoc->getParentClassifier(), tqparentDoc, startText, endText, comment) + ( CPPHeaderCodeDocument * parentDoc, const TQString &startText, const TQString &endText, const TQString &comment) + : OwnedHierarchicalCodeBlock(parentDoc->getParentClassifier(), parentDoc, startText, endText, comment) { - init(tqparentDoc, comment); + init(parentDoc, comment); } CPPHeaderClassDeclarationBlock::~CPPHeaderClassDeclarationBlock ( ) { } @@ -75,10 +75,10 @@ void CPPHeaderClassDeclarationBlock::saveToXMI ( TQDomDocument & doc, TQDomEleme void CPPHeaderClassDeclarationBlock::updateContent ( ) { - CPPHeaderCodeDocument *tqparentDoc = dynamic_cast<CPPHeaderCodeDocument*>(getParentDocument()); - UMLClassifier *c = tqparentDoc->getParentClassifier(); + CPPHeaderCodeDocument *parentDoc = dynamic_cast<CPPHeaderCodeDocument*>(getParentDocument()); + UMLClassifier *c = parentDoc->getParentClassifier(); TQString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars(); - bool isInterface = tqparentDoc->tqparentIsInterface(); // a little shortcut + bool isInterface = parentDoc->parentIsInterface(); // a little shortcut TQString CPPHeaderClassName = CodeGenerator::cleanName(c->getName()); bool forceDoc = UMLApp::app()->getCommonPolicy()->getCodeVerboseDocumentComments(); @@ -112,7 +112,7 @@ void CPPHeaderClassDeclarationBlock::updateContent ( ) */ /* - if(tqparentDoc->tqparentIsInterface()) + if(parentDoc->parentIsInterface()) startText.append("interface "); else */ @@ -144,10 +144,10 @@ void CPPHeaderClassDeclarationBlock::updateContent ( ) } -void CPPHeaderClassDeclarationBlock::init (CPPHeaderCodeDocument *tqparentDoc, const TQString &comment) +void CPPHeaderClassDeclarationBlock::init (CPPHeaderCodeDocument *parentDoc, const TQString &comment) { - setComment(new CPPCodeDocumentation(tqparentDoc)); + setComment(new CPPCodeDocumentation(parentDoc)); getComment()->setText(comment); setEndText("};"); diff --git a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h index b6eb68c7..84fc128a 100644 --- a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h +++ b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.h @@ -34,7 +34,7 @@ public: /** * Empty Constructor */ - explicit CPPHeaderClassDeclarationBlock ( CPPHeaderCodeDocument * tqparentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = ""); + explicit CPPHeaderClassDeclarationBlock ( CPPHeaderCodeDocument * parentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = ""); /** * Empty Destructor diff --git a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp index 2c983a15..d96ad398 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp +++ b/umbrello/umbrello/codegenerators/cppheadercodeaccessormethod.cpp @@ -56,12 +56,12 @@ CPPHeaderCodeAccessorMethod::~CPPHeaderCodeAccessorMethod ( ) { } // we basically want to update the body of this method void CPPHeaderCodeAccessorMethod::updateContent( ) { - CodeClassField * tqparentField = getParentClassField(); - CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField); + CodeClassField * parentField = getParentClassField(); + CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); bool isInlineMethod = policy->getAccessorsAreInline( ); - Uml::Visibility scope = tqparentField->getVisibility(); + Uml::Visibility scope = parentField->getVisibility(); TQString variableName = cppfield->getFieldName(); TQString itemClassName = cppfield->getTypeName(); TQString text; @@ -92,11 +92,11 @@ void CPPHeaderCodeAccessorMethod::updateContent( ) void CPPHeaderCodeAccessorMethod::updateMethodDeclaration() { - CodeClassField * tqparentField = getParentClassField(); - ClassifierCodeDocument * doc = tqparentField->getParentDocument(); + CodeClassField * parentField = getParentClassField(); + ClassifierCodeDocument * doc = parentField->getParentDocument(); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); - CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField); + CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField); bool isInlineMethod = policy->getAccessorsAreInline( ); diff --git a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp index d2dba95d..55edd167 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp @@ -64,7 +64,7 @@ void CPPHeaderCodeClassFieldDeclarationBlock::updateContent( ) TQString fieldName = hcppcf->getFieldName(); // Ugh. Sloppy exception. - if (!cf->tqparentIsAttribute() && !cf->fieldIsSingleValue()) + if (!cf->parentIsAttribute() && !cf->fieldIsSingleValue()) typeName = hcppcf->getListFieldClassName(); TQString body = staticValue + ' ' + typeName + ' ' + fieldName + ';'; diff --git a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp index 92bafba1..1e1bab84 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp +++ b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp @@ -185,7 +185,7 @@ void CPPHeaderCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & root) } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("tqparent_id","-1"); + TQString id = element.attribute("parent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast<UMLOperation*>(obj); if(op) { @@ -370,7 +370,7 @@ void CPPHeaderCodeDocument::updateContent( ) bool hasOperationMethods = c->getOpList().last() ? true : false; bool hasNamespace = false; bool isEnumeration = false; - bool isInterface = tqparentIsInterface(); + bool isInterface = parentIsInterface(); bool hasclassFields = hasClassFields(); bool forcedoc = UMLApp::app()->getCommonPolicy()->getCodeVerboseDocumentComments(); TQString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars(); diff --git a/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp b/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp index c4ec5145..37951553 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp +++ b/umbrello/umbrello/codegenerators/cppheadercodeoperation.cpp @@ -68,7 +68,7 @@ void CPPHeaderCodeOperation::updateContent( ) void CPPHeaderCodeOperation::updateMethodDeclaration() { ClassifierCodeDocument *ccd = dynamic_cast<ClassifierCodeDocument*>(getParentDocument()); - bool isInterface = ccd->tqparentIsInterface(); + bool isInterface = ccd->parentIsInterface(); UMLOperation * o = getParentOperation(); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); @@ -134,7 +134,7 @@ void CPPHeaderCodeOperation::updateMethodDeclaration() int CPPHeaderCodeOperation::lastEditableLine() { ClassifierCodeDocument * doc = dynamic_cast<ClassifierCodeDocument*>(getParentDocument()); UMLOperation * o = getParentOperation(); - if(doc->tqparentIsInterface() || o->getAbstract()) + if(doc->parentIsInterface() || o->getAbstract()) return -1; // very last line is NOT editable as its a one-line declaration w/ no body in // an interface. return 0; diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp index 2ff19637..c71f6d2a 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp +++ b/umbrello/umbrello/codegenerators/cppsourcecodeaccessormethod.cpp @@ -56,8 +56,8 @@ CPPSourceCodeAccessorMethod::~CPPSourceCodeAccessorMethod ( ) { } // we basically want to update the body of this method void CPPSourceCodeAccessorMethod::updateContent( ) { - CodeClassField * tqparentField = getParentClassField(); - CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField); + CodeClassField * parentField = getParentClassField(); + CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); bool isInlineMethod = policy->getAccessorsAreInline( ); @@ -92,11 +92,11 @@ void CPPSourceCodeAccessorMethod::updateContent( ) void CPPSourceCodeAccessorMethod::updateMethodDeclaration() { - CodeClassField * tqparentField = getParentClassField(); - ClassifierCodeDocument * doc = tqparentField->getParentDocument(); + CodeClassField * parentField = getParentClassField(); + ClassifierCodeDocument * doc = parentField->getParentDocument(); CodeGenPolicyExt *pe = UMLApp::app()->getPolicyExt(); CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); - CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(tqparentField); + CPPCodeClassField * cppfield = dynamic_cast<CPPCodeClassField*>(parentField); UMLClassifier * c = doc->getParentClassifier(); bool isInlineMethod = policy->getAccessorsAreInline( ); diff --git a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp index 5c3d0a74..9409b207 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp +++ b/umbrello/umbrello/codegenerators/cppsourcecodeoperation.cpp @@ -41,7 +41,7 @@ CPPSourceCodeOperation::CPPSourceCodeOperation ( CPPSourceCodeDocument * doc, UM CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); UMLClassifier * c = doc->getParentClassifier(); UMLOperation * o = getParentOperation(); - bool isInterface = doc->tqparentIsInterface(); + bool isInterface = doc->parentIsInterface(); bool isInlineMethod = policy->getOperationsAreInline( ); // first, the comment on the operation @@ -131,7 +131,7 @@ void CPPSourceCodeOperation::updateMethodDeclaration() CPPCodeGenerationPolicy * policy = dynamic_cast<CPPCodeGenerationPolicy*>(pe); UMLClassifier * c = doc->getParentClassifier(); UMLOperation * o = getParentOperation(); - bool isInterface = doc->tqparentIsInterface(); + bool isInterface = doc->parentIsInterface(); bool isInlineMethod = policy->getOperationsAreInline( ); // first, the comment on the operation diff --git a/umbrello/umbrello/codegenerators/csharpwriter.cpp b/umbrello/umbrello/codegenerators/csharpwriter.cpp index a6c64db4..601ca84b 100644 --- a/umbrello/umbrello/codegenerators/csharpwriter.cpp +++ b/umbrello/umbrello/codegenerators/csharpwriter.cpp @@ -434,9 +434,9 @@ void CSharpWriter::writeRealizationsRecursive(UMLClassifier *currentClass, UMLAs cs << m_container_indent << m_indentation << "#endregion" << m_endl << m_endl; // Recurse to tqparent realizations - UMLAssociationList tqparentReal = real->getRealizations(); - if (!tqparentReal.isEmpty()) { - writeRealizationsRecursive(real, &tqparentReal, cs); + UMLAssociationList parentReal = real->getRealizations(); + if (!parentReal.isEmpty()) { + writeRealizationsRecursive(real, &parentReal, cs); } } } diff --git a/umbrello/umbrello/codegenerators/javaantcodedocument.cpp b/umbrello/umbrello/codegenerators/javaantcodedocument.cpp index 1fd6fd69..99f0d862 100644 --- a/umbrello/umbrello/codegenerators/javaantcodedocument.cpp +++ b/umbrello/umbrello/codegenerators/javaantcodedocument.cpp @@ -146,7 +146,7 @@ void JavaANTCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & root) } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("tqparent_id","-1"); + TQString id = element.attribute("parent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast<UMLOperation*>(obj); if(op) { diff --git a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp index babc04a9..e1966001 100644 --- a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp @@ -23,10 +23,10 @@ // JavaClassDeclarationBlock::JavaClassDeclarationBlock - ( JavaClassifierCodeDocument * tqparentDoc, const TQString &startText, const TQString &endText, const TQString &comment) - : OwnedHierarchicalCodeBlock(tqparentDoc->getParentClassifier(), tqparentDoc, startText, endText, comment) + ( JavaClassifierCodeDocument * parentDoc, const TQString &startText, const TQString &endText, const TQString &comment) + : OwnedHierarchicalCodeBlock(parentDoc->getParentClassifier(), parentDoc, startText, endText, comment) { - init(tqparentDoc, comment); + init(parentDoc, comment); } JavaClassDeclarationBlock::~JavaClassDeclarationBlock ( ) { } @@ -66,12 +66,12 @@ void JavaClassDeclarationBlock::loadFromXMI ( TQDomElement & root ) void JavaClassDeclarationBlock::updateContent ( ) { - JavaClassifierCodeDocument *tqparentDoc = dynamic_cast<JavaClassifierCodeDocument*>(getParentDocument()); - UMLClassifier *c = tqparentDoc->getParentClassifier(); + JavaClassifierCodeDocument *parentDoc = dynamic_cast<JavaClassifierCodeDocument*>(getParentDocument()); + UMLClassifier *c = parentDoc->getParentClassifier(); CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy(); TQString endLine = commonPolicy->getNewLineEndingChars(); - bool isInterface = tqparentDoc->tqparentIsInterface(); // a little shortcut - TQString JavaClassName = tqparentDoc->getJavaClassName(c->getName()); + bool isInterface = parentDoc->parentIsInterface(); // a little shortcut + TQString JavaClassName = parentDoc->getJavaClassName(c->getName()); // COMMENT if(isInterface) @@ -101,7 +101,7 @@ void JavaClassDeclarationBlock::updateContent ( ) } else startText.append("public "); - if(tqparentDoc->tqparentIsInterface()) + if(parentDoc->parentIsInterface()) startText.append("interface "); else startText.append("class "); @@ -122,7 +122,7 @@ void JavaClassDeclarationBlock::updateContent ( ) startText.append(" extends "); for (UMLClassifier * concept= superclasses.first(); concept; concept = superclasses.next()) { - startText.append(tqparentDoc->cleanName(concept->getName())); + startText.append(parentDoc->cleanName(concept->getName())); if(i != (nrof_superclasses-1)) startText.append(", "); i++; @@ -140,7 +140,7 @@ void JavaClassDeclarationBlock::updateContent ( ) } for (UMLClassifier * concept= superinterfaces.first(); concept; concept = superinterfaces.next()) { - startText.append(tqparentDoc->cleanName(concept->getName())); + startText.append(parentDoc->cleanName(concept->getName())); if(i != (nrof_superinterfaces-1)) startText.append(", "); i++; @@ -153,10 +153,10 @@ void JavaClassDeclarationBlock::updateContent ( ) } -void JavaClassDeclarationBlock::init (JavaClassifierCodeDocument *tqparentDoc, const TQString &comment) +void JavaClassDeclarationBlock::init (JavaClassifierCodeDocument *parentDoc, const TQString &comment) { - setComment(new JavaCodeDocumentation(tqparentDoc)); + setComment(new JavaCodeDocumentation(parentDoc)); getComment()->setText(comment); setEndText("}"); diff --git a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h index caa07074..0c1709ba 100644 --- a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h +++ b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.h @@ -34,7 +34,7 @@ public: /** * Empty Constructor */ - explicit JavaClassDeclarationBlock ( JavaClassifierCodeDocument * tqparentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = ""); + explicit JavaClassDeclarationBlock ( JavaClassifierCodeDocument * parentDoc, const TQString &start = "", const TQString &endText = "}", const TQString &comment = ""); /** * Empty Destructor diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp index bcf46bb6..e386d01d 100644 --- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp +++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp @@ -222,7 +222,7 @@ void JavaClassifierCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & ro } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("tqparent_id","-1"); + TQString id = element.attribute("parent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast<UMLOperation*>(obj); if(op) { @@ -344,7 +344,7 @@ void JavaClassifierCodeDocument::updateContent( ) // This depends on whether or not we have attribute/association classes CodeClassFieldList * cfList = getCodeClassFieldList(); for(CodeClassField * field = cfList->first(); field; field = cfList->next()) - if(field->tqparentIsAttribute()) + if(field->parentIsAttribute()) field->setWriteOutMethods(policy->getAutoGenerateAttribAccessors()); else field->setWriteOutMethods(policy->getAutoGenerateAssocAccessors()); @@ -359,7 +359,7 @@ void JavaClassifierCodeDocument::updateContent( ) CodeClassFieldList aggregationClassFields = getSpecificClassFields ( CodeClassField::Aggregation ); CodeClassFieldList compositionClassFields = getSpecificClassFields ( CodeClassField::Composition ); - bool isInterface = tqparentIsInterface(); + bool isInterface = parentIsInterface(); bool hasOperationMethods = c->getOpList().last() ? true : false; TQString endLine = commonPolicy->getNewLineEndingChars(); // a shortcut..so we don't have to call this all the time @@ -532,7 +532,7 @@ void JavaClassifierCodeDocument::updateContent( ) constBlock->addOrUpdateTaggedCodeBlockWithComments("emptyconstructor", emptyConstStatement, "Empty Constructor", 1, false); // Now, as an additional condition we only show the empty constructor block // IF it was desired to be shown - if(tqparentIsClass() && pol->getAutoGenerateConstructors()) + if(parentIsClass() && pol->getAutoGenerateConstructors()) emptyConstBlock->setWriteOutText(true); else emptyConstBlock->setWriteOutText(false); diff --git a/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp index dde0ca31..c0b08396 100644 --- a/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp +++ b/umbrello/umbrello/codegenerators/javacodeaccessormethod.cpp @@ -74,8 +74,8 @@ void JavaCodeAccessorMethod::setAttributesFromNode( TQDomElement & root) void JavaCodeAccessorMethod::updateContent( ) { - CodeClassField * tqparentField = getParentClassField(); - JavaCodeClassField * javafield = dynamic_cast<JavaCodeClassField*>(tqparentField); + CodeClassField * parentField = getParentClassField(); + JavaCodeClassField * javafield = dynamic_cast<JavaCodeClassField*>(parentField); TQString fieldName = javafield->getFieldName(); TQString text = ""; @@ -150,7 +150,7 @@ void JavaCodeAccessorMethod::updateMethodDeclaration() // set scope of this accessor appropriately..if its an attribute, // we need to be more sophisticated - if(javafield->tqparentIsAttribute()) + if(javafield->parentIsAttribute()) switch (scopePolicy) { case CodeGenerationPolicy::Public: case CodeGenerationPolicy::Private: diff --git a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp index c168ac35..200594e9 100644 --- a/umbrello/umbrello/codegenerators/javacodeclassfield.cpp +++ b/umbrello/umbrello/codegenerators/javacodeclassfield.cpp @@ -36,14 +36,14 @@ // Constructors/Destructors // -JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role) - : CodeClassField(tqparentDoc, role) +JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role) + : CodeClassField(parentDoc, role) { } -JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib) - : CodeClassField(tqparentDoc, attrib) +JavaCodeClassField::JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib) + : CodeClassField(parentDoc, attrib) { } @@ -58,7 +58,7 @@ JavaCodeClassField::~JavaCodeClassField ( ) { } // TQString JavaCodeClassField::getFieldName() { - if (tqparentIsAttribute()) + if (parentIsAttribute()) { UMLAttribute * at = (UMLAttribute*) getParentObject(); return cleanName(at->getName()); @@ -78,7 +78,7 @@ TQString JavaCodeClassField::getFieldName() { TQString JavaCodeClassField::getInitialValue() { - if (tqparentIsAttribute()) + if (parentIsAttribute()) { UMLAttribute * at = dynamic_cast<UMLAttribute*>( getParentObject() ); if (at) { diff --git a/umbrello/umbrello/codegenerators/javacodeclassfield.h b/umbrello/umbrello/codegenerators/javacodeclassfield.h index 0cad977b..325d0b3a 100644 --- a/umbrello/umbrello/codegenerators/javacodeclassfield.h +++ b/umbrello/umbrello/codegenerators/javacodeclassfield.h @@ -36,8 +36,8 @@ public: /** * Constructors */ - JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role); - JavaCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib); + JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role); + JavaCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib); /** * Empty Destructor diff --git a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp index 6f6eb5ec..520f5611 100644 --- a/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp @@ -67,7 +67,7 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( ) TQString scopeStr = jdoc->scopeToJavaDecl(getParentObject()->getVisibility()); // IF this is from an association, then scope taken as appropriate to policy - if(!jcf->tqparentIsAttribute()) + if(!jcf->parentIsAttribute()) { switch (scopePolicy) { case CodeGenerationPolicy::Public: @@ -86,13 +86,13 @@ void JavaCodeClassFieldDeclarationBlock::updateContent( ) TQString fieldName = jcf->getFieldName(); TQString initialV = jcf->getInitialValue(); - if (!cf->tqparentIsAttribute() && !cf->fieldIsSingleValue()) + if (!cf->parentIsAttribute() && !cf->fieldIsSingleValue()) typeName = "List"; TQString body = staticValue+scopeStr+' '+typeName+' '+fieldName; if (!initialV.isEmpty()) body.append(" = " + initialV); - else if (!cf->tqparentIsAttribute()) + else if (!cf->parentIsAttribute()) { UMLRole * role = dynamic_cast<UMLRole*>(cf->getParentObject()); if (role->getObject()->getBaseType() == Uml::ot_Interface) diff --git a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui index 5e0bbe29..a9ba6a89 100644 --- a/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/javacodegenerationformbase.ui @@ -273,5 +273,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/codegenerators/javacodeoperation.cpp b/umbrello/umbrello/codegenerators/javacodeoperation.cpp index a788b215..54b34f46 100644 --- a/umbrello/umbrello/codegenerators/javacodeoperation.cpp +++ b/umbrello/umbrello/codegenerators/javacodeoperation.cpp @@ -123,7 +123,7 @@ void JavaCodeOperation::updateMethodDeclaration() int JavaCodeOperation::lastEditableLine() { ClassifierCodeDocument * doc = dynamic_cast<ClassifierCodeDocument*>(getParentDocument()); - if(doc->tqparentIsInterface()) + if(doc->parentIsInterface()) return -1; // very last line is NOT editable as its a one-line declaration w/ no body in // an interface. return 0; diff --git a/umbrello/umbrello/codegenerators/php5writer.cpp b/umbrello/umbrello/codegenerators/php5writer.cpp index d1eadb0b..c33ad3aa 100644 --- a/umbrello/umbrello/codegenerators/php5writer.cpp +++ b/umbrello/umbrello/codegenerators/php5writer.cpp @@ -2051,8 +2051,8 @@ static const char *php5words[] = "ovrimos_rollback", "owner_document", "pack", - "tqparent_node", - "tqparents", + "parent_node", + "parents", "parse_ini_file", "parse_str", "parse_url", diff --git a/umbrello/umbrello/codegenerators/phpwriter.cpp b/umbrello/umbrello/codegenerators/phpwriter.cpp index 5536c2c9..b68417c7 100644 --- a/umbrello/umbrello/codegenerators/phpwriter.cpp +++ b/umbrello/umbrello/codegenerators/phpwriter.cpp @@ -2047,8 +2047,8 @@ static const char *words[] = "ovrimos_rollback", "owner_document", "pack", - "tqparent_node", - "tqparents", + "parent_node", + "parents", "parse_ini_file", "parse_str", "parse_url", diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp index 294175d5..89eb8bd2 100644 --- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp @@ -26,10 +26,10 @@ // RubyClassDeclarationBlock::RubyClassDeclarationBlock - ( RubyClassifierCodeDocument * tqparentDoc, const TQString &startText, const TQString &endText, const TQString &comment) - : OwnedHierarchicalCodeBlock(tqparentDoc->getParentClassifier(), tqparentDoc, startText, endText, comment) + ( RubyClassifierCodeDocument * parentDoc, const TQString &startText, const TQString &endText, const TQString &comment) + : OwnedHierarchicalCodeBlock(parentDoc->getParentClassifier(), parentDoc, startText, endText, comment) { - init(tqparentDoc, comment); + init(parentDoc, comment); } RubyClassDeclarationBlock::~RubyClassDeclarationBlock ( ) { } @@ -69,12 +69,12 @@ void RubyClassDeclarationBlock::loadFromXMI ( TQDomElement & root ) void RubyClassDeclarationBlock::updateContent ( ) { - RubyClassifierCodeDocument *tqparentDoc = dynamic_cast<RubyClassifierCodeDocument*>(getParentDocument()); - UMLClassifier *c = tqparentDoc->getParentClassifier(); + RubyClassifierCodeDocument *parentDoc = dynamic_cast<RubyClassifierCodeDocument*>(getParentDocument()); + UMLClassifier *c = parentDoc->getParentClassifier(); CodeGenerationPolicy * p = UMLApp::app()->getCommonPolicy(); TQString endLine = p->getNewLineEndingChars(); - bool isInterface = tqparentDoc->tqparentIsInterface(); // a little shortcut - TQString RubyClassName = tqparentDoc->getRubyClassName(c->getName()); + bool isInterface = parentDoc->parentIsInterface(); // a little shortcut + TQString RubyClassName = parentDoc->getRubyClassName(c->getName()); bool forceDoc = p->getCodeVerboseDocumentComments(); // COMMENT @@ -98,7 +98,7 @@ void RubyClassDeclarationBlock::updateContent ( ) // Now set START/ENDING Text TQString startText = ""; - if (tqparentDoc->tqparentIsInterface()) { + if (parentDoc->parentIsInterface()) { startText.append("module "); } else { startText.append("class "); @@ -131,10 +131,10 @@ void RubyClassDeclarationBlock::updateContent ( ) setStartText(startText); } -void RubyClassDeclarationBlock::init (RubyClassifierCodeDocument *tqparentDoc, const TQString &comment) +void RubyClassDeclarationBlock::init (RubyClassifierCodeDocument *parentDoc, const TQString &comment) { - setComment(new RubyCodeDocumentation(tqparentDoc)); + setComment(new RubyCodeDocumentation(parentDoc)); getComment()->setText(comment); setEndText("end"); diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h index 10b7f5bd..327516a3 100644 --- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h +++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.h @@ -42,7 +42,7 @@ public: /** * Empty Constructor */ - explicit RubyClassDeclarationBlock ( RubyClassifierCodeDocument * tqparentDoc, const TQString &start = "", const TQString &endText = "end", const TQString &comment = ""); + explicit RubyClassDeclarationBlock ( RubyClassifierCodeDocument * parentDoc, const TQString &start = "", const TQString &endText = "end", const TQString &comment = ""); /** * Empty Destructor diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp index ecd5523b..b1a60755 100644 --- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp +++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp @@ -252,7 +252,7 @@ void RubyClassifierCodeDocument::loadChildTextBlocksFromNode ( TQDomElement & ro } else if( name == "codeoperation" ) { // find the code operation by id - TQString id = element.attribute("tqparent_id","-1"); + TQString id = element.attribute("parent_id","-1"); UMLObject * obj = UMLApp::app()->getDocument()->findObjectById(STR2ID(id)); UMLOperation * op = dynamic_cast<UMLOperation*>(obj); if(op) { @@ -371,7 +371,7 @@ void RubyClassifierCodeDocument::updateContent( ) // This depends on whether or not we have attribute/association classes CodeClassFieldList * cfList = getCodeClassFieldList(); for(CodeClassField * field = cfList->first(); field; field = cfList->next()) - if(field->tqparentIsAttribute()) + if(field->parentIsAttribute()) field->setWriteOutMethods(gen->getAutoGenerateAttribAccessors()); else field->setWriteOutMethods(gen->getAutoGenerateAssocAccessors()); @@ -399,7 +399,7 @@ void RubyClassifierCodeDocument::updateContent( ) CodeClassFieldList privAggregationClassFields = getSpecificClassFields ( CodeClassField::Aggregation, Uml::Visibility::Private); CodeClassFieldList privCompositionClassFields = getSpecificClassFields ( CodeClassField::Composition, Uml::Visibility::Private); - bool isInterface = tqparentIsInterface(); + bool isInterface = parentIsInterface(); bool hasOperationMethods = c->getOpList().last() ? true : false; CodeGenerationPolicy *pol = UMLApp::app()->getCommonPolicy(); TQString endLine = pol->getNewLineEndingChars(); // a shortcut..so we don't have to call this all the time diff --git a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp index 8a4fd7bd..14d7ce70 100644 --- a/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp +++ b/umbrello/umbrello/codegenerators/rubycodeaccessormethod.cpp @@ -78,8 +78,8 @@ void RubyCodeAccessorMethod::setAttributesFromNode( TQDomElement & root) void RubyCodeAccessorMethod::updateContent( ) { - CodeClassField * tqparentField = getParentClassField(); - RubyCodeClassField * rubyfield = dynamic_cast<RubyCodeClassField*>(tqparentField); + CodeClassField * parentField = getParentClassField(); + RubyCodeClassField * rubyfield = dynamic_cast<RubyCodeClassField*>(parentField); TQString fieldName = rubyfield->getFieldName(); TQString endLine = UMLApp::app()->getCommonPolicy()->getNewLineEndingChars(); @@ -159,7 +159,7 @@ void RubyCodeAccessorMethod::updateMethodDeclaration() // set scope of this accessor appropriately..if its an attribute, // we need to be more sophisticated - if(rubyfield->tqparentIsAttribute()) + if(rubyfield->parentIsAttribute()) switch (scopePolicy) { case CodeGenerationPolicy::Public: case CodeGenerationPolicy::Private: diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp index e04d189a..4d24552a 100644 --- a/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp +++ b/umbrello/umbrello/codegenerators/rubycodeclassfield.cpp @@ -38,14 +38,14 @@ // Constructors/Destructors // -RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role) - : CodeClassField(tqparentDoc, role) +RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role) + : CodeClassField(parentDoc, role) { } -RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib) - : CodeClassField(tqparentDoc, attrib) +RubyCodeClassField::RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib) + : CodeClassField(parentDoc, attrib) { } @@ -60,7 +60,7 @@ RubyCodeClassField::~RubyCodeClassField ( ) { } // TQString RubyCodeClassField::getFieldName() { - if (tqparentIsAttribute()) + if (parentIsAttribute()) { UMLAttribute * at = (UMLAttribute*) getParentObject(); return cleanName(at->getName()); @@ -80,7 +80,7 @@ TQString RubyCodeClassField::getFieldName() { TQString RubyCodeClassField::getInitialValue() { - if (tqparentIsAttribute()) + if (parentIsAttribute()) { UMLAttribute * at = dynamic_cast<UMLAttribute*>( getParentObject() ); if (at) { diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfield.h b/umbrello/umbrello/codegenerators/rubycodeclassfield.h index 28e96b74..f6cb27fe 100644 --- a/umbrello/umbrello/codegenerators/rubycodeclassfield.h +++ b/umbrello/umbrello/codegenerators/rubycodeclassfield.h @@ -38,8 +38,8 @@ public: /** * Constructors */ - RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLRole * role); - RubyCodeClassField (ClassifierCodeDocument * tqparentDoc, UMLAttribute * attrib); + RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLRole * role); + RubyCodeClassField (ClassifierCodeDocument * parentDoc, UMLAttribute * attrib); /** * Empty Destructor diff --git a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp index 2171bb28..da8eb00e 100644 --- a/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp @@ -61,7 +61,7 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( ) TQString scopeStr = rdoc->scopeToRubyDecl(getParentObject()->getVisibility()); // IF this is from an association, then scope taken as appropriate to policy - if(!rcf->tqparentIsAttribute()) + if(!rcf->parentIsAttribute()) { switch (scopePolicy) { case CodeGenerationPolicy::Public: @@ -80,13 +80,13 @@ void RubyCodeClassFieldDeclarationBlock::updateContent( ) TQString fieldName = rcf->getFieldName(); TQString initialV = rcf->getInitialValue(); - if (!cf->tqparentIsAttribute() && !cf->fieldIsSingleValue()) + if (!cf->parentIsAttribute() && !cf->fieldIsSingleValue()) typeName = "Array"; TQString body = staticValue+scopeStr+' '+typeName+' '+fieldName; if (!initialV.isEmpty()) body.append(" = " + initialV); - else if (!cf->tqparentIsAttribute()) + else if (!cf->parentIsAttribute()) { UMLRole * role = dynamic_cast<UMLRole*>(cf->getParentObject()); if (role->getObject()->getBaseType() == Uml::ot_Interface) diff --git a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui index fe4573c2..c47dc97f 100644 --- a/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui +++ b/umbrello/umbrello/codegenerators/rubycodegenerationformbase.ui @@ -244,5 +244,5 @@ </widget> </grid> </widget> -<tqlayoutdefaults spacing="6" margin="11"/> +<layoutdefaults spacing="6" margin="11"/> </UI> diff --git a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp index bba8b462..caed59d8 100644 --- a/umbrello/umbrello/codegenerators/rubycodeoperation.cpp +++ b/umbrello/umbrello/codegenerators/rubycodeoperation.cpp @@ -217,7 +217,7 @@ void RubyCodeOperation::updateMethodDeclaration() int RubyCodeOperation::lastEditableLine() { ClassifierCodeDocument * doc = dynamic_cast<ClassifierCodeDocument*>(getParentDocument()); - if(doc->tqparentIsInterface()) + if(doc->parentIsInterface()) return -1; // very last line is NOT editable as its a one-line declaration w/ no body in // an interface. return 0; diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp index d4f62cc3..ca118eb2 100644 --- a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp @@ -47,10 +47,10 @@ SimpleCodeGenerator::SimpleCodeGenerator (bool createDirHierarchyForPackages /* =true */) { m_indentLevel = 0; - UMLDoc * tqparentDoc = UMLApp::app()->getDocument(); - tqparentDoc->disconnect(this); // disconnect from UMLDoc.. we arent planning to be synced at all + UMLDoc * parentDoc = UMLApp::app()->getDocument(); + parentDoc->disconnect(this); // disconnect from UMLDoc.. we arent planning to be synced at all m_createDirHierarchyForPackages = createDirHierarchyForPackages; - initFields(tqparentDoc); + initFields(parentDoc); } SimpleCodeGenerator::~SimpleCodeGenerator ( ) { } @@ -256,14 +256,14 @@ void SimpleCodeGenerator::writeCodeToFile ( UMLClassifierList & concepts) { this->writeClass(c); // call the writer for each class. } -void SimpleCodeGenerator::initFields ( UMLDoc * tqparentDoc ) { +void SimpleCodeGenerator::initFields ( UMLDoc * parentDoc ) { // load Classifier documents from tqparent document // initFromParentDocument(); m_fileMap.clear(); m_applyToAllRemaining = true; - m_doc = tqparentDoc; + m_doc = parentDoc; // this really is just being used to sync the internal params // to the codegenpolicy as there are no code documents to really sync. diff --git a/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp b/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp index 21dd5230..6a068113 100644 --- a/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp +++ b/umbrello/umbrello/codegenerators/xmlelementcodeblock.cpp @@ -29,10 +29,10 @@ // Constructors/Destructors // -XMLElementCodeBlock::XMLElementCodeBlock ( CodeDocument * tqparentDoc, const TQString & nodeName, const TQString & comment) - : HierarchicalCodeBlock(tqparentDoc) +XMLElementCodeBlock::XMLElementCodeBlock ( CodeDocument * parentDoc, const TQString & nodeName, const TQString & comment) + : HierarchicalCodeBlock(parentDoc) { - init(tqparentDoc, nodeName, comment); + init(parentDoc, nodeName, comment); } XMLElementCodeBlock::~XMLElementCodeBlock ( ) { } @@ -150,10 +150,10 @@ void XMLElementCodeBlock::updateContent ( ) } -void XMLElementCodeBlock::init (CodeDocument *tqparentDoc, const TQString &nodeName, const TQString &comment) +void XMLElementCodeBlock::init (CodeDocument *parentDoc, const TQString &nodeName, const TQString &comment) { - setComment(new XMLCodeComment(tqparentDoc)); + setComment(new XMLCodeComment(parentDoc)); getComment()->setText(comment); m_nodeName = nodeName; diff --git a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h index 21427df0..adbe39b7 100644 --- a/umbrello/umbrello/codegenerators/xmlelementcodeblock.h +++ b/umbrello/umbrello/codegenerators/xmlelementcodeblock.h @@ -37,7 +37,7 @@ public: /** * Empty Constructor */ - XMLElementCodeBlock ( CodeDocument * tqparentDoc, const TQString & nodeName, const TQString & comment = ""); + XMLElementCodeBlock ( CodeDocument * parentDoc, const TQString & nodeName, const TQString & comment = ""); /** * Empty Destructor |