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

[Andi Fischer]

SVN commit 956010 by fischer:

Sync with trunk and branch to reduce the difference.

 M  +60 -33    assocrules.cpp  
 M  +14 -57    assocrules.h  
 M  +3 -3      clipboard/umlclipboard.cpp  
 M  +5 -5      cmds/widget/cmd_changeFillColor.cpp  
 M  +3 -6      cmds/widget/cmd_changeFillColor.h  
 M  +8 -7      cmds/widget/cmd_changeLineColor.cpp  
 M  +0 -1      codeimport/import_utils.h  
 M  +1 -1      codeimport/javaimport.h  
 M  +1 -1      codeimport/nativeimportbase.cpp  
 M  +1 -1      codeimport/nativeimportbase.h  
 M  +3 -3      codeimport/pythonimport.cpp  
 M  +32 -12    component.cpp  
 M  +2 -40     component.h  
 M  +5 -5      dialogs/activitydialog.cpp  
 M  +2 -2      dialogs/assocgenpage.cpp  
 M  +10 -10    dialogs/classgenpage.cpp  
 M  +3 -3      dialogs/classoptionspage.cpp  
 M  +9 -9      dialogs/classpropdlg.cpp  
 M  +3 -3      dialogs/objectnodedialog.cpp  
 M  +5 -5      dialogs/statedialog.cpp  
 M  +2 -2      dialogs/umlwidgetcolorpage.cpp  
 M  +84 -24    docwindow.cpp  
 M  +10 -101   docwindow.h  
 M  +127 -25   entityattribute.cpp  
 M  +13 -118   entityattribute.h  
 M  +36 -17    entityconstraint.cpp  
 M  +3 -27     entityconstraint.h  
 M  +84 -9     enum.cpp  
 M  +6 -89     enum.h  
 M  +2 -3      linepath.cpp  
 M  +13 -14    listpopupmenu.cpp  
 M  +2 -2      main.cpp  
 M  +2 -3      toolbarstate.cpp  
 M  +5 -6      toolbarstateassociation.cpp  
 M  +2 -3      toolbarstatemessages.cpp  
 M  +54 -60    umlview.cpp  
 M  +5 -6      widgets/activitywidget.cpp  
 M  +2 -3      widgets/activitywidget.h  
 M  +28 -28    widgets/associationwidget.cpp  
 M  +2 -3      widgets/floatingdashlinewidget.cpp  
 M  +9 -10     widgets/messagewidget.cpp  
 M  +2 -3      widgets/objectwidget.cpp  
 M  +3 -4      widgets/pinwidget.cpp  
 M  +4 -5      widgets/seqlinewidget.cpp  
 M  +2 -3      widgets/signalwidget.cpp  
 M  +5 -6      widgets/statewidget.cpp  
 M  +2 -3      widgets/statewidget.h  
 M  +4 -5      widgets/toolbarstateonewidget.cpp  
 M  +6 -6      widgets/umlwidget.cpp  
 M  +2 -3      widgets/umlwidget.h  
 M  +4 -5      widgets/widget_utils.cpp  
 M  +31 -18    widgets/widgetbase.cpp  
 M  +7 -8      widgets/widgetbase.h