[Uml-devel] branches/KDE/3.5/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 449042 by okellogg:

parseFile(): Set "with" to work.

 M  +16 -0     adaimport.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/adaimport.cpp #449041:449042
@@ -69,6 +69,12 @@
 }
 
 void AdaImport::parseFile(QString filename) {
+    if (filename.contains('/')) {
+        QString path = filename;
+        path.remove( QRegExp("/[^/]+$") );
+        kdDebug() << "IDLImport::parseFile: adding path " << path << endl;
+        Import_Utils::addIncludePath(path);
+    }
     if (! QFile::exists(filename)) {
         if (filename.startsWith("/")) {
             kdError() << "AdaImport::parseFile(" << filename
@@ -136,7 +142,17 @@
                 }
                 filename.replace(".", "-");
                 filename.append(".ads");
+                // Save current m_source and m_srcIndex.
+                QStringList source(m_source);
+                uint srcIndex = m_srcIndex;
+                m_source.clear();
                 parseFile(filename);
+                // Restore m_source and m_srcIndex.
+                m_source = source;
+                m_srcIndex = srcIndex;
+                // Also reset m_currentAccess.
+                // CHECK: need to reset more stuff?
+                m_currentAccess = Uml::Public;
                 if (advance() != ",")
                     break;
             }