diff options
Diffstat (limited to 'umbrello/umbrello/model_utils.cpp')
-rw-r--r-- | umbrello/umbrello/model_utils.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/umbrello/umbrello/model_utils.cpp b/umbrello/umbrello/model_utils.cpp index 95a93f6b..9c6cfbc2 100644 --- a/umbrello/umbrello/model_utils.cpp +++ b/umbrello/umbrello/model_utils.cpp @@ -235,7 +235,7 @@ UMLObject* findUMLObject(const UMLObjectList& inList, return NULL; } -TQString uniqObjectName(Uml::Object_Type type, UMLPackage *tqparentPkg, TQString prefix) { +TQString uniqObjectName(Uml::Object_Type type, UMLPackage *parentPkg, TQString prefix) { TQString currentName = prefix; if (currentName.isEmpty()) { if(type == Uml::ot_Class) @@ -271,7 +271,7 @@ TQString uniqObjectName(Uml::Object_Type type, UMLPackage *tqparentPkg, TQString } UMLDoc *doc = UMLApp::app()->getDocument(); TQString name = currentName; - for (int number = 1; !doc->isUnique(name, tqparentPkg); number++) { + for (int number = 1; !doc->isUnique(name, parentPkg); number++) { name = currentName + '_' + TQString::number(number); } return name; @@ -501,12 +501,12 @@ Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *own if (m.isEmpty()) return PS_Empty; if (m.tqcontains(TQRegExp("operator *()"))) { - // C++ special case: two sets of tqparentheses + // C++ special case: two sets of parentheses desc.m_name = "operator()"; m.remove(TQRegExp("operator *()")); } else { /** - * The search pattern includes everything up to the opening tqparenthesis + * The search pattern includes everything up to the opening parenthesis * because UML also permits non programming-language oriented designs * using narrative names, for example "check water temperature". */ @@ -532,7 +532,7 @@ Parse_tqStatus parseOperation(TQString m, OpDescriptor& desc, UMLClassifier *own desc.m_pReturnType = pRetType; } } - // Remove possible empty tqparentheses () + // Remove possible empty parentheses () m.remove( TQRegExp("\\s*\\(\\s*\\)") ); desc.m_args.clear(); pat = TQRegExp( "\\((.*)\\)" ); |