diff options
Diffstat (limited to 'umbrello/umbrello/codegenerators/javawriter.cpp')
-rw-r--r-- | umbrello/umbrello/codegenerators/javawriter.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/umbrello/umbrello/codegenerators/javawriter.cpp b/umbrello/umbrello/codegenerators/javawriter.cpp index 9c351555..19f3c1fd 100644 --- a/umbrello/umbrello/codegenerators/javawriter.cpp +++ b/umbrello/umbrello/codegenerators/javawriter.cpp @@ -137,8 +137,8 @@ void JavaWriter::writeClass(UMLClassifier *c) TQString str; str = getHeadingFile(".java"); if(!str.isEmpty()) { - str.tqreplace(TQRegExp("%filename%"),fileName); - str.tqreplace(TQRegExp("%filepath%"),file.name()); + str.replace(TQRegExp("%filename%"),fileName); + str.replace(TQRegExp("%filepath%"),file.name()); java<<str<<m_endl; } @@ -408,7 +408,7 @@ void JavaWriter::writeAttributeMethods(UMLAttributeList &atpub, Uml::Visibility // from what I can tell, this IS the default behavior for // cleanName. I dunno why its not working -b.t. fieldName.stripWhiteSpace(); - fieldName.tqreplace(0,1,fieldName.tqat(0).upper()); + fieldName.replace(0,1,fieldName.tqat(0).upper()); writeSingleAttributeAccessorMethods(at->getTypeName(), cleanName(at->getName()), @@ -425,7 +425,7 @@ void JavaWriter::writeComment(const TQString &comment, const TQString &myIndent, // in the case we have several line comment.. // NOTE: this part of the method has the problem of adopting UNIX newline, // need to resolve for using with MAC/WinDoze eventually I assume - if (comment.tqcontains(TQRegExp("\n"))) { + if (comment.contains(TQRegExp("\n"))) { if(javaDocStyle) java << myIndent << "/**" << m_endl; @@ -530,9 +530,9 @@ void JavaWriter::writeAssociationRoleDecl(TQString fieldClassName, // declare the association based on whether it is this a single variable // or a List (Vector). One day this will be done correctly with special // multiplicity object that we don't have to figure out what it means via regex. - if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) + if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) { - TQString fieldVarName = "m_" + roleName.tqreplace(0, 1, roleName.left(1).lower()); + TQString fieldVarName = "m_" + roleName.replace(0, 1, roleName.left(1).lower()); java<<startline<<scope<<" "<<fieldClassName<<" "<<fieldVarName<<";"; } else @@ -589,9 +589,9 @@ void JavaWriter::writeAssociationRoleMethod (TQString fieldClassName, TQString r TQString description, Uml::Visibility visib, Uml::Changeability_Type change, TQTextStream &java) { - if(multi.isEmpty() || multi.tqcontains(TQRegExp("^[01]$"))) + if(multi.isEmpty() || multi.contains(TQRegExp("^[01]$"))) { - TQString fieldVarName = "m_" + roleName.tqreplace(0, 1, roleName.left(1).lower()); + TQString fieldVarName = "m_" + roleName.replace(0, 1, roleName.left(1).lower()); writeSingleAttributeAccessorMethods(fieldClassName, fieldVarName, roleName, description, visib, change, false, java); } |