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

[Oliver Kellogg]

SVN commit 1281808 by okellogg:

Merge 1273090:1273378 from trunk.
Manually transfer changes from umbrello/dialogs/umlwidgetstylepage.cpp to
umlwidgetcolorpage.cpp (required due to previously excluded r1272804)


 M  +3 -3      cmds/widget/cmd_changeFillColor.cpp  
 M  +1 -1      cmds/widget/cmd_changeLineColor.cpp  
 M  +1 -1      dialogs/classpropdlg.cpp  
 M  +1 -1      dialogs/classpropdlg.h  
 M  +1 -1      dialogs/umlviewdialog.cpp  
 M  +4 -4      dialogs/umlwidgetcolorpage.cpp  
 M  +11 -11    linepath.cpp  
 M  +2 -2      linepath.h  
 M  +14 -14    listpopupmenu.cpp  
 M  +2 -1      package.cpp  
 M  +1 -1      toolbarstateassociation.cpp  
 M  +2 -2      toolbarstatemessages.cpp  
 M  +9 -9      umlview.cpp  
 M  +4 -4      umlview.h  
 M  +9 -9      widgets/activitywidget.cpp  
 M  +2 -2      widgets/actorwidget.cpp  
 M  +2 -2      widgets/artifactwidget.cpp  
 M  +6 -6      widgets/associationwidget.cpp  
 M  +1 -1      widgets/associationwidget.h  
 M  +2 -2      widgets/boxwidget.cpp  
 M  +2 -2      widgets/categorywidget.cpp  
 M  +2 -2      widgets/classifierwidget.cpp  
 M  +2 -2      widgets/combinedfragmentwidget.cpp  
 M  +2 -2      widgets/componentwidget.cpp  
 M  +2 -2      widgets/datatypewidget.cpp  
 M  +2 -2      widgets/entitywidget.cpp  
 M  +2 -2      widgets/enumwidget.cpp  
 M  +2 -2      widgets/nodewidget.cpp  
 M  +2 -2      widgets/notewidget.cpp  
 M  +2 -2      widgets/objectnodewidget.cpp  
 M  +6 -6      widgets/objectwidget.cpp  
 M  +2 -2      widgets/packagewidget.cpp  
 M  +2 -2      widgets/pinwidget.cpp  
 M  +2 -2      widgets/preconditionwidget.cpp  
 M  +6 -6      widgets/signalwidget.cpp  
 M  +2 -2      widgets/statewidget.cpp  
 M  +36 -72    widgets/umlwidget.cpp  
 M  +3 -56     widgets/umlwidget.h  
 M  +2 -2      widgets/usecasewidget.cpp  
 M  +158 -34   widgets/widgetbase.cpp  
 M  +32 -7     widgets/widgetbase.h  


http://websvn.kde.org/?view=rev&revision=1281808