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

[Oliver Kellogg]

SVN commit 1281916 by okellogg:

Merge 1276286:1281298 from trunk, excluding i18n changes at
  umbrello/dialogs/classgenpage.cpp:127
  umbrello/codegenwizard/codegenstatuspage.cpp::189,212,226
  umbrello/codeimpwizard/codeimpstatuspage.cpp:300,314

This commit brings the branch to par with trunk and completes delivery of
promises made at
trunk/www/sites/www/announcements/changelogs/changelog_branch_4_8.xml


 A             CMakeLists-StandaloneIncl.txt   trunk/KDE/kdesdk/umbrello/CMakeLists-StandaloneIncl.txt#1281298
 M  +3 -0      CMakeLists.txt  
 M  +9 -1      ChangeLog  
 M  +20 -9     umbrello/actor.cpp  
 M  +4 -10     umbrello/actor.h  
 M  +8 -8      umbrello/association.cpp  
 M  +66 -46    umbrello/assocrules.cpp  
 M  +2 -7      umbrello/assocrules.h  
 M  +1 -1      umbrello/clipboard/umldragdata.cpp  
 D             umbrello/cmd_id.h  
 M  +6 -6      umbrello/cmds.h  
 M  +4 -3      umbrello/cmds/cmd_create_activitydiag.cpp  
 M  +2 -3      umbrello/cmds/cmd_create_activitydiag.h  
 M  +4 -3      umbrello/cmds/cmd_create_classdiag.cpp  
 M  +2 -3      umbrello/cmds/cmd_create_classdiag.h  
 M  +4 -3      umbrello/cmds/cmd_create_collaborationdiag.cpp  
 M  +2 -3      umbrello/cmds/cmd_create_collaborationdiag.h  
 M  +4 -3      umbrello/cmds/cmd_create_componentdiag.cpp  
 M  +2 -3      umbrello/cmds/cmd_create_componentdiag.h  
 M  +4 -3      umbrello/cmds/cmd_create_deploydiag.cpp  
 M  +2 -3      umbrello/cmds/cmd_create_deploydiag.h  
 M  +4 -3      umbrello/cmds/cmd_create_entityrelationdiag.cpp  
 M  +2 -3      umbrello/cmds/cmd_create_entityrelationdiag.h  
 M  +4 -3      umbrello/cmds/cmd_create_seqdiag.cpp  
 M  +2 -3      umbrello/cmds/cmd_create_seqdiag.h  
 M  +4 -3      umbrello/cmds/cmd_create_statediag.cpp  
 M  +2 -3      umbrello/cmds/cmd_create_statediag.h  
 M  +4 -3      umbrello/cmds/cmd_create_usecasediag.cpp  
 M  +2 -3      umbrello/cmds/cmd_create_usecasediag.h  
 M  +4 -2      umbrello/cmds/cmd_handle_rename.cpp  
 M  +1 -1      umbrello/cmds/cmd_handle_rename.h  
 M  +3 -2      umbrello/cmds/generic/cmd_create_umlobject.cpp  
 M  +1 -1      umbrello/cmds/generic/cmd_create_umlobject.h  
 M  +3 -3      umbrello/codegenerators/ada/adawriter.cpp  
 M  +2 -1      umbrello/codegenerators/as/aswriter.cpp  
 M  +21 -34    umbrello/codegenerators/codegenerator.cpp  
 M  +3 -9      umbrello/codegenerators/codegenerator.h  
 M  +7 -15     umbrello/codegenerators/cpp/cppcodegenerator.cpp  
 M  +1 -3      umbrello/codegenerators/cpp/cppcodegenerator.h  
 M  +2 -2      umbrello/codegenerators/cpp/cppheadercodeaccessormethod.cpp  
 M  +3 -3      umbrello/codegenerators/cpp/cppwriter.cpp  
 M  +2 -1      umbrello/codegenerators/csharp/csharpwriter.cpp  
 M  +4 -21     umbrello/codegenerators/d/dcodegenerator.cpp  
 M  +1 -4      umbrello/codegenerators/d/dcodegenerator.h  
 M  +2 -1      umbrello/codegenerators/idl/idlwriter.cpp  
 M  +11 -28    umbrello/codegenerators/java/javacodegenerator.cpp  
 M  +2 -5      umbrello/codegenerators/java/javacodegenerator.h  
 M  +2 -1      umbrello/codegenerators/js/jswriter.cpp  
 M  +4 -3      umbrello/codegenerators/pascal/pascalwriter.cpp  
 M  +2 -1      umbrello/codegenerators/perl/perlwriter.cpp  
 M  +9 -2      umbrello/codegenerators/php/php5writer.cpp  
 M  +2 -1      umbrello/codegenerators/php/phpwriter.cpp  
 M  +2 -1      umbrello/codegenerators/python/pythonwriter.cpp  
 M  +6 -19     umbrello/codegenerators/ruby/rubycodegenerator.cpp  
 M  +1 -3      umbrello/codegenerators/ruby/rubycodegenerator.h  
 M  +15 -26    umbrello/codegenerators/simplecodegenerator.cpp  
 M  +1 -7      umbrello/codegenerators/simplecodegenerator.h  
 M  +2 -1      umbrello/codegenerators/sql/sqlwriter.cpp  
 M  +5 -1      umbrello/codegenerators/tcl/tclwriter.cpp  
 M  +2 -1      umbrello/codegenerators/vala/valawriter.cpp  
 M  +5 -4      umbrello/codegenerators/xml/xmlschemawriter.cpp  
 M  +71 -4     umbrello/codegenwizard/codegenstatuspage.cpp  
 M  +4 -1      umbrello/codegenwizard/codegenstatuspage.h  
 M  +75 -2     umbrello/codegenwizard/codegenstatuspage.ui  
 M  +1 -3      umbrello/codeimport/adaimport.cpp  
 M  +19 -41    umbrello/codeimport/csharp/csharpimport.cpp  
 U             umbrello/codeimport/idlimport.cpp  
 M  +6 -1      umbrello/codeimport/import_utils.cpp  
 M  +20 -4     umbrello/codeimport/javaimport.cpp  
 M  +21 -21    umbrello/codeimport/kdevcppparser/cpptree2uml.cpp  
 M  +2 -1      umbrello/codeimport/kdevcppparser/preprocesslexer.cpp  
 M  +1 -0      umbrello/codeimport/kdevcppparser/preprocesslexer.h  
 M  +4 -0      umbrello/codeimport/nativeimportbase.cpp  
 M  +1 -0      umbrello/codeimpwizard/codeimpselectpage.cpp  
 M  +24 -7     umbrello/codeimpwizard/codeimpstatuspage.cpp  
 M  +2 -2      umbrello/codeimpwizard/codeimpthread.cpp  
 M  +1 -3      umbrello/controller/umlwidgetcontroller.cpp  
 M  +2 -1      umbrello/dialogs/classgenpage.cpp  
 M  +6 -6      umbrello/dialogs/codeeditor.cpp  
 M  +0 -3      umbrello/dialogs/exportallviewsdialogbase.ui  
 M  +1 -0      umbrello/dialogs/settingsdlg.cpp  
 M  +6 -7      umbrello/foreignkeyconstraint.cpp  
 M  +4 -4      umbrello/model_utils.cpp  
 M  +6 -0      umbrello/stereotype.h  
 M  +2 -2      umbrello/toolbarstatearrow.cpp  
 M  +1 -1      umbrello/toolbarstatearrow.h  
 M  +3 -3      umbrello/toolbarstateassociation.cpp  
 M  +1 -1      umbrello/toolbarstateassociation.h  
 M  +2 -2      umbrello/toolbarstatemessages.cpp  
 M  +1 -1      umbrello/toolbarstatemessages.h  
 M  +89 -11    umbrello/umbrello.kcfg  
 M  +1 -1      umbrello/umlcanvasobject.cpp  
 M  +28 -3     umbrello/umldoc.cpp  
 M  +39 -21    umbrello/umllistview.cpp  
 M  +2 -1      umbrello/umllistview.h  
 M  +6 -7      umbrello/umllistviewitem.cpp  
 M  +2 -1      umbrello/umllistviewitem.h  
 M  +9 -2      umbrello/umlobject.cpp  
 M  +5 -4      umbrello/umlscene.h  
 M  +20 -20    umbrello/umlview.cpp  
 M  +534 -515  umbrello/widgets/associationline.cpp  
 M  +47 -49    umbrello/widgets/associationline.h  
 M  +821 -682  umbrello/widgets/associationwidget.cpp  
 M  +56 -601   umbrello/widgets/associationwidget.h  
 M  +1 -6      umbrello/widgets/pinwidget.cpp  
 M  +4 -4      umbrello/widgets/seqlinewidget.cpp  
 M  +3 -3      umbrello/widgets/seqlinewidget.h  
 M  +4 -4      umbrello/widgets/umlwidget.cpp  
 M  +9 -9      umbrello/widgets/umlwidget.h  
 M  +3 -3      umbrello/widgets/widget_utils.cpp  
 M  +1 -1      umbrello/widgets/widget_utils.h  
 M  +2 -1      umbrello/widgets/widgetbase.cpp  


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