[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

On C++ class import, show the file currently processed in the status bar.


  M +4 -0      classimport.cpp   1.29
  M +1 -2      uml.cpp   1.94
  M +6 -2      umldoc.cpp   1.139
  M +5 -0      umldoc.h   1.64


--- kdesdk/umbrello/umbrello/classimport.cpp  #1.28:1.29
@@ -201,6 +201,9 @@ void ClassImport::importCPP(QStringList 
                                    fileIT != headerFileList.end(); ++fileIT) {
                 QString fileName = (*fileIT);
+                m_umldoc->writeToStatusBar("Importing file: " + fileName);
                 m_driver->parseFile( fileName );
                 TranslationUnitAST *ast = m_driver->translationUnit( fileName );
+                if (ast == NULL)
+                        continue;
                 CppTree2Uml modelFeeder( fileName, this );
                 kdDebug() << "Now calling modelFeeder.parseTranslationUnit for file "
@@ -208,4 +211,5 @@ void ClassImport::importCPP(QStringList 
                 modelFeeder.parseTranslationUnit( ast );
         }
+        m_umldoc->writeToStatusBar("Ready.");
 }
 

--- kdesdk/umbrello/umbrello/uml.cpp  #1.93:1.94
@@ -810,5 +810,4 @@ void UMLApp::slotStatusMsg(const QString
         m_statusLabel->setText( text );
 
-        if ( loading )
                 m_statusLabel->repaint();
 }

--- kdesdk/umbrello/umbrello/umldoc.cpp  #1.138:1.139
@@ -617,6 +617,10 @@ void UMLDoc::addUMLObject(UMLObject* obj
         }
 }
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// a simple removeal of an object
+
+void UMLDoc::writeToStatusBar(const QString &text) {
+        emit sigWriteToStatusBar(text);
+}
+
+// simple removal of an object
 void UMLDoc::slotRemoveUMLObject(UMLObject* object)  {
         objectList.remove(object);

--- kdesdk/umbrello/umbrello/umldoc.h  #1.63:1.64
@@ -946,4 +946,9 @@ public:
         QString uniqObjectName(const UMLObject_Type type, QString prefix = "");
 
+        /**
+         * Write text to the status bar.
+         */
+        void writeToStatusBar(const QString &text);
+
 private: