From e5174e4060db8f7437da95b42cbab274b2583a5b Mon Sep 17 00:00:00 2001 From: Slávek Banko Date: Tue, 5 May 2026 20:34:25 +0200 Subject: Fix build issues with GCC 16.x MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For C++20, 'concept' is a new keyword. Therefore, we can no longer use it as an argument or variable name. This resolves issue #74. Signed-off-by: Slávek Banko --- umbrello/umbrello/classifier.cpp | 28 +++++++++++----------- umbrello/umbrello/classifiercodedocument.cpp | 8 +++---- umbrello/umbrello/codegenerator.cpp | 4 ++-- umbrello/umbrello/codegenerator.h | 4 ++-- .../umbrello/codegenerators/cppcodegenerator.cpp | 6 ++--- .../cppheaderclassdeclarationblock.cpp | 6 ++--- .../codegenerators/cppheadercodedocument.cpp | 4 ++-- .../codegenerators/cppsourcecodedocument.cpp | 4 ++-- umbrello/umbrello/codegenerators/dwriter.cpp | 16 ++++++------- .../codegenerators/javaclassdeclarationblock.cpp | 8 +++---- .../codegenerators/javaclassifiercodedocument.cpp | 4 ++-- umbrello/umbrello/codegenerators/javawriter.cpp | 18 +++++++------- .../codegenerators/rubyclassdeclarationblock.cpp | 10 ++++---- .../codegenerators/rubyclassifiercodedocument.cpp | 4 ++-- umbrello/umbrello/codegenerators/rubywriter.cpp | 8 +++---- .../codegenerators/simplecodegenerator.cpp | 20 ++++++++-------- .../umbrello/codegenerators/simplecodegenerator.h | 4 ++-- umbrello/umbrello/dialogs/codegenerationwizard.cpp | 8 +++---- umbrello/umbrello/dialogs/codegenerationwizard.h | 2 +- 19 files changed, 83 insertions(+), 83 deletions(-) diff --git a/umbrello/umbrello/classifier.cpp b/umbrello/umbrello/classifier.cpp index ae18fec1..fd0ce637 100644 --- a/umbrello/umbrello/classifier.cpp +++ b/umbrello/umbrello/classifier.cpp @@ -377,11 +377,11 @@ UMLClassifierList UMLClassifier::findSubClassConcepts (ClassifierType type) { if (a->getObjectId(A) != myID) { UMLObject* obj = a->getObject(A); - UMLClassifier *concept = dynamic_cast(obj); - if (concept && (type == ALL || (!concept->isInterface() && type == CLASS) - || (concept->isInterface() && type == INTERFACE)) - && (inheritingConcepts.findRef(concept) == -1)) - inheritingConcepts.append(concept); + UMLClassifier *umlConcept = dynamic_cast(obj); + if (umlConcept && (type == ALL || (!umlConcept->isInterface() && type == CLASS) + || (umlConcept->isInterface() && type == INTERFACE)) + && (inheritingConcepts.findRef(umlConcept) == -1)) + inheritingConcepts.append(umlConcept); } } @@ -394,11 +394,11 @@ UMLClassifierList UMLClassifier::findSuperClassConcepts (ClassifierType type) { UMLClassifierList parentConcepts; Uml::IDType myID = getID(); - for (UMLClassifier *concept = list.first(); concept; concept = list.next()) + for (UMLClassifier *umlConcept = list.first(); umlConcept; umlConcept = list.next()) { - if (type == ALL || (!concept->isInterface() && type == CLASS) - || (concept->isInterface() && type == INTERFACE)) - parentConcepts.append(concept); + if (type == ALL || (!umlConcept->isInterface() && type == CLASS) + || (umlConcept->isInterface() && type == INTERFACE)) + parentConcepts.append(umlConcept); } for (UMLAssociation *a = rlist.first(); a; a = rlist.next()) @@ -406,11 +406,11 @@ UMLClassifierList UMLClassifier::findSuperClassConcepts (ClassifierType type) { if (a->getObjectId(A) == myID) { UMLObject* obj = a->getObject(B); - UMLClassifier *concept = dynamic_cast(obj); - if (concept && (type == ALL || (!concept->isInterface() && type == CLASS) - || (concept->isInterface() && type == INTERFACE)) - && (parentConcepts.findRef(concept) == -1)) - parentConcepts.append(concept); + UMLClassifier *umlConcept = dynamic_cast(obj); + if (umlConcept && (type == ALL || (!umlConcept->isInterface() && type == CLASS) + || (umlConcept->isInterface() && type == INTERFACE)) + && (parentConcepts.findRef(umlConcept) == -1)) + parentConcepts.append(umlConcept); } } diff --git a/umbrello/umbrello/classifiercodedocument.cpp b/umbrello/umbrello/classifiercodedocument.cpp index e6691f82..0c77412b 100644 --- a/umbrello/umbrello/classifiercodedocument.cpp +++ b/umbrello/umbrello/classifiercodedocument.cpp @@ -416,10 +416,10 @@ void ClassifierCodeDocument::init (UMLClassifier * c ) // Example of the problem: CPPSourceCodeDocument reimplementing syncNamesToParent() // CPPCodeGenerator::initFromParentDocument() // CodeDocument * codeDoc = new CPPSourceCodeDocument(c); -// CPPSourceCodeDocument::CPPSourceCodeDocument(UMLClassifier * concept) -// : ClassifierCodeDocument(concept) -// ClassifierCodeDocument::ClassifierCodeDocument(concept) -// init(concept); +// CPPSourceCodeDocument::CPPSourceCodeDocument(UMLClassifier * umlConcept) +// : ClassifierCodeDocument(umlConcept) +// ClassifierCodeDocument::ClassifierCodeDocument(umlConcept) +// init(umlConcept); // syncNamesToParent(); // dispatches to CPPSourceCodeDocument::syncNamesToParent() // but that object is not yet constructed. diff --git a/umbrello/umbrello/codegenerator.cpp b/umbrello/umbrello/codegenerator.cpp index f4734dc0..74c0fb76 100644 --- a/umbrello/umbrello/codegenerator.cpp +++ b/umbrello/umbrello/codegenerator.cpp @@ -319,9 +319,9 @@ void CodeGenerator::writeCodeToFile ( UMLClassifierList & concepts) { CodeDocumentList docs; docs.setAutoDelete(false); - for (UMLClassifier *concept= concepts.first(); concept; concept= concepts.next()) + for (UMLClassifier *umlConcept= concepts.first(); umlConcept; umlConcept= concepts.next()) { - CodeDocument * doc = findCodeDocumentByClassifier(concept); + CodeDocument * doc = findCodeDocumentByClassifier(umlConcept); if(doc) docs.append(doc); } diff --git a/umbrello/umbrello/codegenerator.h b/umbrello/umbrello/codegenerator.h index 93b0bafa..2412a63b 100644 --- a/umbrello/umbrello/codegenerator.h +++ b/umbrello/umbrello/codegenerator.h @@ -406,10 +406,10 @@ signals: * This signal is emitted when code for a UMLClassifier has been * generated. Its only really used by the codegenerationwizard to * update its progress. - * @param concept The concept which was processed + * @param umlConcept The concept which was processed * @param generated Flag, set to true if generation was successful */ - void codeGenerated(UMLClassifier* concept, bool generated); + void codeGenerated(UMLClassifier* umlConcept, bool generated); }; diff --git a/umbrello/umbrello/codegenerators/cppcodegenerator.cpp b/umbrello/umbrello/codegenerators/cppcodegenerator.cpp index a86f14f4..a4358935 100644 --- a/umbrello/umbrello/codegenerators/cppcodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/cppcodegenerator.cpp @@ -212,12 +212,12 @@ void CPPCodeGenerator::writeCodeToFile ( UMLClassifierList & concepts) { CodeDocumentList docs; docs.setAutoDelete(false); - for (UMLClassifier *concept= concepts.first(); concept; concept= concepts.next()) + for (UMLClassifier *umlConcept= concepts.first(); umlConcept; umlConcept= concepts.next()) { - CodeDocument * doc = findCodeDocumentByClassifier(concept); + CodeDocument * doc = findCodeDocumentByClassifier(umlConcept); if(doc) docs.append(doc); - CodeDocument * hdoc = findHeaderCodeDocumentByClassifier(concept); + CodeDocument * hdoc = findHeaderCodeDocumentByClassifier(umlConcept); if(hdoc) docs.append(hdoc); } diff --git a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp index 868dea41..069b5c39 100644 --- a/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/cppheaderclassdeclarationblock.cpp @@ -128,10 +128,10 @@ void CPPHeaderClassDeclarationBlock::updateContent ( ) int i = 0; if(nrof_superclasses >0) startText.append(" : "); - for (UMLClassifier * concept= superclasses.first(); concept; concept = superclasses.next()) + for (UMLClassifier * umlConcept= superclasses.first(); umlConcept; umlConcept = superclasses.next()) { - startText.append(concept->getVisibility().toString() + ' ' + - CodeGenerator::cleanName(concept->getName())); + startText.append(umlConcept->getVisibility().toString() + ' ' + + CodeGenerator::cleanName(umlConcept->getName())); if(i != (nrof_superclasses-1)) startText.append(", "); i++; diff --git a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp index 9da4c6aa..849dccbc 100644 --- a/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp +++ b/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp @@ -51,8 +51,8 @@ // Constructors/Destructors // -CPPHeaderCodeDocument::CPPHeaderCodeDocument ( UMLClassifier * concept ) - : ClassifierCodeDocument (concept) +CPPHeaderCodeDocument::CPPHeaderCodeDocument ( UMLClassifier * umlConcept ) + : ClassifierCodeDocument (umlConcept) { setFileExtension(".h"); diff --git a/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp b/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp index 57bf4637..a12d3477 100644 --- a/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp +++ b/umbrello/umbrello/codegenerators/cppsourcecodedocument.cpp @@ -41,8 +41,8 @@ // Constructors/Destructors // -CPPSourceCodeDocument::CPPSourceCodeDocument ( UMLClassifier * concept ) - : ClassifierCodeDocument (concept) { +CPPSourceCodeDocument::CPPSourceCodeDocument ( UMLClassifier * umlConcept ) + : ClassifierCodeDocument (umlConcept) { init ( ); } diff --git a/umbrello/umbrello/codegenerators/dwriter.cpp b/umbrello/umbrello/codegenerators/dwriter.cpp index 088ab9c1..f7991bf1 100644 --- a/umbrello/umbrello/codegenerators/dwriter.cpp +++ b/umbrello/umbrello/codegenerators/dwriter.cpp @@ -348,8 +348,8 @@ void DWriter::writeClassDecl(UMLClassifier *c, TQTextStream &d) { d << " : "; // (f) base classes - for (UMLClassifier * concept= superclasses.first(); concept; concept = superclasses.next()) { - d << cleanName(concept->getName()); + for (UMLClassifier * umlConcept= superclasses.first(); umlConcept; umlConcept = superclasses.next()) { + d << cleanName(umlConcept->getName()); count--; @@ -357,8 +357,8 @@ void DWriter::writeClassDecl(UMLClassifier *c, TQTextStream &d) { } // (g) interfaces - for (UMLClassifier * concept= superinterfaces.first(); concept; concept = superinterfaces.next()) { - d << cleanName(concept->getName()); + for (UMLClassifier * umlConcept= superinterfaces.first(); umlConcept; umlConcept = superinterfaces.next()) { + d << cleanName(umlConcept->getName()); count--; @@ -774,12 +774,12 @@ bool DWriter::dMethodInList(UMLOperation *umlOp, UMLOperationList &opl) { void DWriter::getSuperImplementedOperations(UMLClassifier *c, UMLOperationList &yetImplementedOpList ,UMLOperationList &toBeImplementedOpList, bool noClassInPath) { UMLClassifierList superClasses = c->findSuperClassConcepts(); - for (UMLClassifier *concept= superClasses.first(); concept; concept = superClasses.next()) + for (UMLClassifier *umlConcept= superClasses.first(); umlConcept; umlConcept = superClasses.next()) { - getSuperImplementedOperations(concept, yetImplementedOpList, toBeImplementedOpList, (concept->isInterface() && noClassInPath)); - UMLOperationList opl = concept->getOpList(); + getSuperImplementedOperations(umlConcept, yetImplementedOpList, toBeImplementedOpList, (umlConcept->isInterface() && noClassInPath)); + UMLOperationList opl = umlConcept->getOpList(); for (UMLOperation *op = opl.first(); op; op = opl.next()) { - if (concept->isInterface() && noClassInPath) { + if (umlConcept->isInterface() && noClassInPath) { if (!DWriter::dMethodInList(op,toBeImplementedOpList)) toBeImplementedOpList.append(op); } diff --git a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp index e1966001..32fd7795 100644 --- a/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/javaclassdeclarationblock.cpp @@ -120,9 +120,9 @@ void JavaClassDeclarationBlock::updateContent ( ) int i = 0; if(nrof_superclasses >0) startText.append(" extends "); - for (UMLClassifier * concept= superclasses.first(); concept; concept = superclasses.next()) + for (UMLClassifier * umlConcept= superclasses.first(); umlConcept; umlConcept = superclasses.next()) { - startText.append(parentDoc->cleanName(concept->getName())); + startText.append(parentDoc->cleanName(umlConcept->getName())); if(i != (nrof_superclasses-1)) startText.append(", "); i++; @@ -138,9 +138,9 @@ void JavaClassDeclarationBlock::updateContent ( ) else startText.append(" implements "); } - for (UMLClassifier * concept= superinterfaces.first(); concept; concept = superinterfaces.next()) + for (UMLClassifier * umlConcept= superinterfaces.first(); umlConcept; umlConcept = superinterfaces.next()) { - startText.append(parentDoc->cleanName(concept->getName())); + startText.append(parentDoc->cleanName(umlConcept->getName())); if(i != (nrof_superinterfaces-1)) startText.append(", "); i++; diff --git a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp index 426c6d9a..cf6b3883 100644 --- a/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp +++ b/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp @@ -44,8 +44,8 @@ // Constructors/Destructors // -JavaClassifierCodeDocument::JavaClassifierCodeDocument ( UMLClassifier * concept ) - : ClassifierCodeDocument (concept) { +JavaClassifierCodeDocument::JavaClassifierCodeDocument ( UMLClassifier * umlConcept ) + : ClassifierCodeDocument (umlConcept) { init(); } diff --git a/umbrello/umbrello/codegenerators/javawriter.cpp b/umbrello/umbrello/codegenerators/javawriter.cpp index db6d6515..cf763509 100644 --- a/umbrello/umbrello/codegenerators/javawriter.cpp +++ b/umbrello/umbrello/codegenerators/javawriter.cpp @@ -313,11 +313,11 @@ void JavaWriter::writeClassDecl(UMLClassifier *c, TQTextStream &java) } // write inheritances out - UMLClassifier *concept; + UMLClassifier *umlConcept; UMLClassifierList superclasses = c->findSuperClassConcepts(UMLClassifier::CLASS); int i = 0; - for (concept= superclasses.first(); concept; concept = superclasses.next()) + for (umlConcept= superclasses.first(); umlConcept; umlConcept = superclasses.next()) { if (i == 0) { @@ -328,13 +328,13 @@ void JavaWriter::writeClassDecl(UMLClassifier *c, TQTextStream &java) //The java generated code is wrong ! : No multiple inheritence of class java<< ", " ; } - java<< cleanName(concept->getName()); + java<< cleanName(umlConcept->getName()); i++; } UMLClassifierList superInterfaces = c->findSuperClassConcepts(UMLClassifier::INTERFACE); i = 0; - for (concept= superInterfaces.first(); concept; concept = superInterfaces.next()) + for (umlConcept= superInterfaces.first(); umlConcept; umlConcept = superInterfaces.next()) { if (i == 0) { @@ -348,7 +348,7 @@ void JavaWriter::writeClassDecl(UMLClassifier *c, TQTextStream &java) //The java generated code is OK ! : multiple inheritence of interface java<< ", " ; } - java<< cleanName(concept->getName()); + java<< cleanName(umlConcept->getName()); i++; } @@ -751,12 +751,12 @@ void JavaWriter::getSuperImplementedOperations(UMLClassifier *c, UMLOperationLis { UMLClassifierList superClasses = c->findSuperClassConcepts(); - for (UMLClassifier *concept= superClasses.first(); concept; concept = superClasses.next()) + for (UMLClassifier *umlConcept= superClasses.first(); umlConcept; umlConcept = superClasses.next()) { - getSuperImplementedOperations(concept, yetImplementedOpList, toBeImplementedOpList, (concept->isInterface() && noClassInPath)); - UMLOperationList opl = concept->getOpList(); + getSuperImplementedOperations(umlConcept, yetImplementedOpList, toBeImplementedOpList, (umlConcept->isInterface() && noClassInPath)); + UMLOperationList opl = umlConcept->getOpList(); for (UMLOperation *op = opl.first(); op; op = opl.next()) { - if (concept->isInterface() && noClassInPath) { + if (umlConcept->isInterface() && noClassInPath) { if (!JavaWriter::javaMethodInList(op,toBeImplementedOpList)) toBeImplementedOpList.append(op); } diff --git a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp index f75ff165..07b5b390 100644 --- a/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp +++ b/umbrello/umbrello/codegenerators/rubyclassdeclarationblock.cpp @@ -111,20 +111,20 @@ void RubyClassDeclarationBlock::updateContent ( ) startText.append(RubyClassName); int i = 0; - for (UMLClassifier * concept= superclasses.first(); concept; concept = superclasses.next()) { + for (UMLClassifier * umlConcept= superclasses.first(); umlConcept; umlConcept = superclasses.next()) { if (i == 0) { - startText.append(TQString(" < ") + RubyCodeGenerator::cppToRubyType(concept->getName()) + endLine); + startText.append(TQString(" < ") + RubyCodeGenerator::cppToRubyType(umlConcept->getName()) + endLine); } else { // After the first superclass name in the list, assume the classes // are ruby modules that can be mixed in, - startText.append("include " + RubyCodeGenerator::cppToRubyType(concept->getName()) + endLine); + startText.append("include " + RubyCodeGenerator::cppToRubyType(umlConcept->getName()) + endLine); } i++; } // Write out the interfaces we 'implement'. Are these modules to be mixed in, in Ruby? - for (UMLClassifier * concept= superinterfaces.first(); concept; concept = superinterfaces.next()) { - startText.append(TQString("include ") + RubyCodeGenerator::cppToRubyType(concept->getName()) + endLine); + for (UMLClassifier * umlConcept= superinterfaces.first(); umlConcept; umlConcept = superinterfaces.next()) { + startText.append(TQString("include ") + RubyCodeGenerator::cppToRubyType(umlConcept->getName()) + endLine); } // Set the header and end text for the hier.codeblock diff --git a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp index ada4b0bb..0cf2e596 100644 --- a/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp +++ b/umbrello/umbrello/codegenerators/rubyclassifiercodedocument.cpp @@ -45,8 +45,8 @@ // Constructors/Destructors // -RubyClassifierCodeDocument::RubyClassifierCodeDocument ( UMLClassifier * concept ) - : ClassifierCodeDocument (concept) { +RubyClassifierCodeDocument::RubyClassifierCodeDocument ( UMLClassifier * umlConcept ) + : ClassifierCodeDocument (umlConcept) { init(); } diff --git a/umbrello/umbrello/codegenerators/rubywriter.cpp b/umbrello/umbrello/codegenerators/rubywriter.cpp index 90d55eab..a719a5a7 100644 --- a/umbrello/umbrello/codegenerators/rubywriter.cpp +++ b/umbrello/umbrello/codegenerators/rubywriter.cpp @@ -98,18 +98,18 @@ void RubyWriter::writeClass(UMLClassifier *c) { } // write inheritances out - UMLClassifier *concept; + UMLClassifier *umlConcept; h<< "class " << cppToRubyType(classname) << (superclasses.count() > 0 ? " < ":""); int i = 0; - for (concept = superclasses.first(); concept; concept = superclasses.next()) { + for (umlConcept = superclasses.first(); umlConcept; umlConcept = superclasses.next()) { if (i == 0) { - h << cppToRubyType(concept->getName()) << m_endl; + h << cppToRubyType(umlConcept->getName()) << m_endl; } else { // Assume ruby modules that can be mixed in, after the first // superclass name in the list - h << m_indentation << "include "<< cppToRubyType(concept->getName()) << m_endl; + h << m_indentation << "include "<< cppToRubyType(umlConcept->getName()) << m_endl; } i++; } diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp index ff115735..0ffa6b8e 100644 --- a/umbrello/umbrello/codegenerators/simplecodegenerator.cpp +++ b/umbrello/umbrello/codegenerators/simplecodegenerator.cpp @@ -74,16 +74,16 @@ TQString SimpleCodeGenerator::getIndent () return myIndent; } -TQString SimpleCodeGenerator::findFileName(UMLPackage* concept, const TQString &ext) { +TQString SimpleCodeGenerator::findFileName(UMLPackage* umlConcept, const TQString &ext) { //if we already know to which file this class was written/should be written, just return it. - if (m_fileMap.contains(concept)) - return m_fileMap[concept]; + if (m_fileMap.contains(umlConcept)) + return m_fileMap[umlConcept]; //else, determine the "natural" file name TQString name; // Get the package name - TQString package = concept->getPackage("."); + TQString package = umlConcept->getPackage("."); // Replace all white spaces with blanks package.simplifyWhiteSpace(); @@ -96,12 +96,12 @@ TQString SimpleCodeGenerator::findFileName(UMLPackage* concept, const TQString & // if package is given add this as a directory to the file name if (!package.isEmpty() && m_createDirHierarchyForPackages) { - name = package + '.' + concept->getName(); + name = package + '.' + umlConcept->getName(); name.replace(TQRegExp("\\."),"/"); package.replace(TQRegExp("\\."), "/"); package = '/' + package; } else { - name = concept->getFullyQualifiedName("-"); + name = umlConcept->getFullyQualifiedName("-"); } if (! UMLApp::app()->activeLanguageIsCaseSensitive()) { @@ -141,16 +141,16 @@ TQString SimpleCodeGenerator::findFileName(UMLPackage* concept, const TQString & TQString extension = ext.simplifyWhiteSpace(); extension.replace(' ', '_'); - return overwritableName(concept, name, extension); + return overwritableName(umlConcept, name, extension); } -TQString SimpleCodeGenerator::overwritableName(UMLPackage* concept, const TQString &name, const TQString &ext) { +TQString SimpleCodeGenerator::overwritableName(UMLPackage* umlConcept, const TQString &name, const TQString &ext) { //check if a file named "name" with extension "ext" already exists CodeGenerationPolicy *commonPolicy = UMLApp::app()->getCommonPolicy(); TQDir outputDir = commonPolicy->getOutputDirectory(); TQString filename = name + ext; if(!outputDir.exists(filename)) { - m_fileMap.insert(concept,filename); + m_fileMap.insert(umlConcept,filename); return filename; //if not, "name" is OK and we have not much to to } @@ -208,7 +208,7 @@ TQString SimpleCodeGenerator::overwritableName(UMLPackage* concept, const TQStri break; } - m_fileMap.insert(concept, filename); + m_fileMap.insert(umlConcept, filename); return filename; } diff --git a/umbrello/umbrello/codegenerators/simplecodegenerator.h b/umbrello/umbrello/codegenerators/simplecodegenerator.h index 55214d1f..074c1f0f 100644 --- a/umbrello/umbrello/codegenerators/simplecodegenerator.h +++ b/umbrello/umbrello/codegenerators/simplecodegenerator.h @@ -73,8 +73,8 @@ public: protected: // compatability methods.. - TQString findFileName(UMLPackage* concept, const TQString &ext); - TQString overwritableName(UMLPackage* concept, const TQString &name, const TQString &ext); + TQString findFileName(UMLPackage* umlConcept, const TQString &ext); + TQString overwritableName(UMLPackage* umlConcept, const TQString &name, const TQString &ext); bool hasDefaultValueAttr(UMLClassifier *c); bool hasAbstractOps(UMLClassifier *c); diff --git a/umbrello/umbrello/dialogs/codegenerationwizard.cpp b/umbrello/umbrello/dialogs/codegenerationwizard.cpp index a4016bd3..691af1a8 100644 --- a/umbrello/umbrello/dialogs/codegenerationwizard.cpp +++ b/umbrello/umbrello/dialogs/codegenerationwizard.cpp @@ -113,8 +113,8 @@ void CodeGenerationWizard::generateCode() { for(TQListViewItem *item = m_statusList->firstChild(); item; item = item-> nextSibling()) { - UMLClassifier *concept = m_doc->findUMLClassifier(item->text(0)); - cList.append(concept); + UMLClassifier *umlConcept = m_doc->findUMLClassifier(item->text(0)); + cList.append(umlConcept); } codeGenerator->writeCodeToFile(cList); finishButton()->setText(i18n("Finish")); @@ -124,8 +124,8 @@ void CodeGenerationWizard::generateCode() { } } -void CodeGenerationWizard::classGenerated(UMLClassifier* concept, bool generated) { - TQListViewItem* item = m_statusList->findItem( concept->getFullyQualifiedName(), 0 ); +void CodeGenerationWizard::classGenerated(UMLClassifier* umlConcept, bool generated) { + TQListViewItem* item = m_statusList->findItem( umlConcept->getFullyQualifiedName(), 0 ); if( !item ) { kError()<<"GenerationStatusPage::Error finding class in list view"<