[Uml-devel] branches/work/soc-umbrello/umbrello

[Andi Fischer]

SVN commit 973723 by fischer:

sync with trunk to reduce the differences.

 M  +52 -12    controller/messagewidgetcontroller.cpp  
 M  +3 -12     controller/messagewidgetcontroller.h  
 M  +28 -8     controller/notewidgetcontroller.cpp  
 M  +7 -19     controller/notewidgetcontroller.h  
 M  +63 -20    controller/objectwidgetcontroller.cpp  
 M  +5 -18     controller/objectwidgetcontroller.h  
 M  +36 -20    controller/umlwidgetcontroller.cpp  
 M  +3 -24     controller/umlwidgetcontroller.h  
 M  +2 -2      dialogs/notedialog.cpp  
 M  +1 -3      listpopupmenu.cpp  
 M  +25 -12    toolbarstateassociation.cpp  
 M  +2 -16     toolbarstateassociation.h  
 M  +12 -4     toolbarstatemessages.cpp  
 M  +5 -18     toolbarstatemessages.h  
 M  +7 -8      toolbarstateother.cpp  
 M  +27 -5     toolbarstatepool.cpp  
 M  +5 -22     toolbarstatepool.h