[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

UMLObject::resolveTypes(): New. Generalizes the type resolution methods
 for loading foreign XMI files introduced in the previous commit. The new
 type resolution pass is done at the end of UMLDoc::loadUMLObjectFromXMI().
UMLClassifier::m_List: Replaces m_OpsList. Contains all UMLClassifierListItems
 for the classes inheriting from UMLClassifier. Remove special lists at
 the inheriting classes.
UMLClassifier::getFilteredOperationsList(): Remove. Replaced by getOpsList().
UMLClassifier::getFilteredList(): New. Replaces getFiltered{Attributes,
 Templates}List().
UMLClass::findChildObject(UMLObject_Type, QString): Remove. Use parent method.
UMLClass::findChildObject(int): Remove. Use parent method.

Temporarily comment various calls to deleteLater() because of crashes.

Change iteration scheme on several loops. In certain cases, the scheme

     for (UMLClass *obj = m_List.first(); obj; obj = m_List.next()) {
       ....
     }

 does not work. I haven't yet found out why (see UMLClassifier::resolveTypes).
 Replaced by:

     for (UMLClassListIt it(m_List); it.current(); ++it) {
       UMLClass *obj = it.current;
       ....
     }


  M +77 -27    association.cpp   1.46
  M +10 -0     association.h   1.24
  M +1 -1      associationwidget.cpp   1.113
  M +7 -0      attribute.cpp   1.13
  M +42 -130   class.cpp   1.40
  M +10 -60    class.h   1.31
  M +48 -49    classifier.cpp   1.48
  M +9 -8      classifier.h   1.35
  M +1 -1      classifiercodedocument.cpp   1.33
  M +19 -19    classwidget.cpp   1.30
  M +1 -1      codegenerator.cpp   1.54
  M +0 -3      enum.cpp   1.12
  M +3 -5      interface.cpp   1.21
  M +6 -6      interfacewidget.cpp   1.26
  M +4 -3      operation.cpp   1.24
  M +2 -2      operation.h   1.22
  M +17 -9     package.cpp   1.23
  M +10 -0     package.h   1.20
  M +1 -1      textblock.cpp   1.9
  M +4 -3      umlcanvasobject.cpp   1.23
  M +33 -15    umldoc.cpp   1.177
  M +5 -0      umlobject.cpp   1.42
  M +9 -0      umlobject.h   1.36
  M +37 -25    umlrole.cpp   1.19
  M +14 -2     umlrole.h   1.16
  M +1 -1      codegenerators/adawriter.cpp   1.25
  M +2 -2      codegenerators/aswriter.cpp   1.16
  M +1 -1      codegenerators/classifierinfo.cpp   1.8
  M +1 -1      codegenerators/cppheadercodedocument.cpp   1.29
  M +1 -1      codegenerators/idlwriter.cpp   1.22
  M +1 -1      codegenerators/javaclassifiercodedocument.cpp   1.29
  M +1 -1      codegenerators/jswriter.cpp   1.16
  M +1 -1      codegenerators/perlwriter.cpp   1.16
  M +1 -1      codegenerators/phpwriter.cpp   1.20
  M +1 -1      codegenerators/pythonwriter.cpp   1.12
  M +2 -1      codegenerators/simplecodegenerator.cpp   1.15
  M +4 -4      dialogs/classifierlistpage.cpp   1.16
  M +4 -4      dialogs/classwizard.cpp   1.12
  M +2 -2      dialogs/selectopdlg.cpp   1.14
  M +1 -1      refactoring/refactoringassistant.cpp   1.24