diff options
Diffstat (limited to 'umbrello/umbrello/codeimport/javaimport.cpp')
-rw-r--r-- | umbrello/umbrello/codeimport/javaimport.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/umbrello/umbrello/codeimport/javaimport.cpp b/umbrello/umbrello/codeimport/javaimport.cpp index 0ff5b689..7f62a1a9 100644 --- a/umbrello/umbrello/codeimport/javaimport.cpp +++ b/umbrello/umbrello/codeimport/javaimport.cpp @@ -172,15 +172,15 @@ UMLObject* JavaImport::resolveClass (TQString className) { spawnImport( aFile ); // we need to set the package for the class that will be resolved // start at the root package - UMLPackage *tqparent = m_scope[0]; + UMLPackage *parent = m_scope[0]; UMLPackage *current = NULL; for (TQStringList::Iterator it = split.begin(); it != split.end(); ++it) { TQString name = (*it); UMLObject *ns = Import_Utils::createUMLObject(Uml::ot_Package, - name, tqparent); + name, parent); current = static_cast<UMLPackage*>(ns); - tqparent = current; + parent = current; } // for if ( isArray ) { // we have imported the type. For arrays we want to return @@ -292,9 +292,9 @@ bool JavaImport::parseStmt() { const TQString& baseName = advance(); // try to resolve the class we are extending, or if impossible // create a placeholder - UMLObject *tqparent = resolveClass( baseName ); - if ( tqparent ) { - Import_Utils::createGeneralization(m_klass, static_cast<UMLClassifier*>(tqparent)); + UMLObject *parent = resolveClass( baseName ); + if ( parent ) { + Import_Utils::createGeneralization(m_klass, static_cast<UMLClassifier*>(parent)); } else { kDebug() << "importJava parentClass " << baseName << " is not resolveable. Creating placeholder" << endl; |