diff options
Diffstat (limited to 'umbrello/umbrello/codeimport/import_utils.cpp')
| -rw-r--r-- | umbrello/umbrello/codeimport/import_utils.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/umbrello/umbrello/codeimport/import_utils.cpp b/umbrello/umbrello/codeimport/import_utils.cpp index 44c8f380..5afae684 100644 --- a/umbrello/umbrello/codeimport/import_utils.cpp +++ b/umbrello/umbrello/codeimport/import_utils.cpp @@ -97,9 +97,9 @@ TQString formatComment(const TQString &comment) { lines.pop_front(); // nothing interesting on this line } TQString& last = lines.last(); - int endpos = last.tqfind("*/"); + int endpos = last.find("*/"); if (endpos != -1) { - if (last.tqcontains(wordex)) + if (last.contains(wordex)) last = last.mid(0, endpos - 1); // remove comment end else lines.pop_back(); // nothing interesting on this line @@ -142,12 +142,12 @@ UMLObject *createUMLObject(Uml::Object_Type type, bNewUMLObjectWasCreated = false; if (o == NULL) { // Strip possible adornments and look again. - int isConst = name.tqcontains(TQRegExp("^const ")); + int isConst = name.contains(TQRegExp("^const ")); name.remove(TQRegExp("^const\\s+")); TQString typeName(name); - const int isAdorned = typeName.tqcontains( TQRegExp("[^\\w:\\. ]") ); - const int isPointer = typeName.tqcontains('*'); - const int isRef = typeName.tqcontains('&'); + const int isAdorned = typeName.contains( TQRegExp("[^\\w:\\. ]") ); + const int isPointer = typeName.contains('*'); + const int isRef = typeName.contains('&'); typeName.remove(TQRegExp("[^\\w:\\. ].*$")); typeName = typeName.simplifyWhiteSpace(); UMLObject *origType = umldoc->findUMLObject(typeName, Uml::ot_UMLObject, parentPkg); @@ -157,9 +157,9 @@ UMLObject *createUMLObject(Uml::Object_Type type, parentPkg = logicalView; // Find, or create, the scopes. TQStringList components; - if (typeName.tqcontains("::")) { + if (typeName.contains("::")) { components = TQStringList::split("::", typeName); - } else if (typeName.tqcontains(".")) { + } else if (typeName.contains(".")) { components = TQStringList::split(".", typeName); } if (components.count() > 1) { @@ -449,7 +449,7 @@ TQStringList includePathList() { } void addIncludePath(const TQString& path) { - if (! incPathList.tqcontains(path)) + if (! incPathList.contains(path)) incPathList.append(path); } |