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

[Oliver Kellogg]

SVN commit 687101 by okellogg:

sync with trunk (681948:686570)

 M  +2 -2      activitywidget.h  
 M  +2 -2      actorwidget.h  
 M  +1 -1      artifactwidget.h  
 M  +19 -19    association.cpp  
 M  +9 -4      association.h  
 M  +50 -48    associationwidget.cpp  
 M  +6 -6      associationwidget.h  
 M  +6 -6      assocrules.cpp  
 M  +8 -7      attribute.cpp  
 M  +2 -2      attribute.h  
 M  +1 -1      boxwidget.h  
 M  +6 -6      classifier.cpp  
 M  +8 -8      classifier.h  
 M  +2 -2      classifierlistitem.cpp  
 M  +2 -2      classifierlistitem.h  
 M  +2 -2      classifierwidget.h  
 M  +1 -1      codeblockwithcomments.cpp  
 M  +1 -1      codeblockwithcomments.h  
 M  +3 -2      codeclassfield.cpp  
 M  +1 -1      codeclassfield.h  
 M  +5 -5      codedocument.cpp  
 M  +1 -1      codedocument.h  
 M  +2 -0      codedocumentlist.h  
 M  +4 -5      codegenerationpolicy.cpp  
 M  +1 -1      codegenerationpolicy.h  
 M  +1 -6      codegenerators/classifierinfo.h  
 M  +2 -2      codegenerators/cppheadercodeaccessormethod.h  
 M  +2 -2      codegenerators/cppwriter.cpp  
 M  +1 -6      codegenerators/xmlschemawriter.h  
 M  +1 -1      codegenobjectwithtextblocks.h  
 M  +7 -0      codeimport/import_utils.h  
 M  +1 -1      componentwidget.h  
 M  +2 -2      datatypewidget.h  
 M  +3 -3      dialogs/assocpage.h  
 M  +1 -1      dialogs/classifierlistpage.cpp  
 M  +1 -1      entity.h  
 M  +6 -6      entityattribute.cpp  
 M  +6 -5      entityattribute.h  
 M  +2 -2      entitywidget.h  
 M  +2 -2      enumwidget.h  
 M  +5 -0      floatingtextwidget.cpp  
 M  +7 -2      floatingtextwidget.h  
 M  +2 -2      folder.h  
 M  +2 -2      forkjoinwidget.h  
 M  +1 -1      hierarchicalcodeblock.cpp  
 M  +1 -1      hierarchicalcodeblock.h  
 M  +5 -1      import_rose.cpp  
 M  +4 -0      listpopupmenu.cpp  
 M  +3 -1      listpopupmenu.h  
 M  +4 -2      messagewidget.h  
 M  +1 -1      nodewidget.h  
 M  +3 -2      notewidget.h  
 M  +2 -2      objectwidget.h  
 M  +1 -1      packagewidget.h  
 M  +45 -9     petaltree2uml.cpp  
 M  +1 -3      refactoring/refactoringassistant.cpp  
 M  +1 -5      refactoring/refactoringassistant.h  
 M  +2 -2      statewidget.h  
 M  +2 -2      toolbarstate.cpp  
 M  +2 -2      toolbarstate.h  
 M  +1 -0      umlcanvasobject.h  
 M  +6 -5      umldoc.cpp  
 M  +5 -3      umldoc.h  
 M  +2 -2      umllistviewitem.h  
 M  +14 -13    umlobject.cpp  
 M  +3 -3      umlobject.h  
 M  +3 -1      umlrole.h  
 M  +2 -2      umlview.cpp  
 M  +11 -10    umlview.h  
 M  +1 -1      umlviewimageexportermodel.cpp  
 M  +1 -1      umlviewimageexportermodel.h  
 M  +3 -1      umlwidget.h  
 M  +2 -2      usecasewidget.h  
 M  +1 -1      widget_utils.cpp  
 M  +1 -1      widget_utils.h