[Uml-devel] KDE/kdesdk/umbrello

Oliver Kellogg okellogg at users.sourceforge.net
Mon Jun 5 19:33:42 UTC 2006


SVN commit 548518 by okellogg:

merge changes from branches/KDE/3.5 up to commit 548269

 M  +9 -1      ChangeLog  
 M  +22 -14    umbrello/activitywidget.cpp  
 M  +6 -8      umbrello/activitywidget.h  
 M  +2 -3      umbrello/aligntoolbar.cpp  
 M  +2 -0      umbrello/aligntoolbar.h  
 M  +60 -60    umbrello/associationwidget.cpp  
 M  +44 -44    umbrello/associationwidget.h  
 M  +1 -0      umbrello/assocrules.cpp  
 M  +2 -2      umbrello/attribute.cpp  
 M  +4 -4      umbrello/attribute.h  
 M  +3 -3      umbrello/classifier.cpp  
 M  +3 -3      umbrello/classifier.h  
 M  +52 -34    umbrello/classifiercodedocument.cpp  
 M  +8 -23     umbrello/classifiercodedocument.h  
 M  +2 -2      umbrello/classifierlistitem.h  
 M  +2 -2      umbrello/classparser/ast.cpp  
 M  +2 -2      umbrello/classparser/ast.h  
 M  +1 -1      umbrello/classparser/cpptree2uml.cpp  
 M  +1 -1      umbrello/classparser/parser.h  
 M  +2 -2      umbrello/clipboard/umlclipboard.cpp  
 M  +2 -2      umbrello/codeaccessormethod.cpp  
 M  +2 -2      umbrello/codeblock.h  
 M  +8 -11     umbrello/codeblockwithcomments.cpp  
 M  +1 -1      umbrello/codeblockwithcomments.h  
 M  +20 -24    umbrello/codeclassfield.cpp  
 M  +4 -12     umbrello/codeclassfield.h  
 M  +3 -2      umbrello/codeclassfielddeclarationblock.h  
 M  +57 -122   umbrello/codedocument.cpp  
 M  +11 -66    umbrello/codedocument.h  
 M  +146 -44   umbrello/codegenerationpolicy.cpp  
 M  +84 -26    umbrello/codegenerationpolicy.h  
 M  +56 -131   umbrello/codegenerator.cpp  
 M  +19 -58    umbrello/codegenerator.h  
 M  +1 -1      umbrello/codegenerators/classifierinfo.h  
 M  +226 -15   umbrello/codegenerators/codegenfactory.cpp  
 M  +94 -8     umbrello/codegenerators/codegenfactory.h  
 A             umbrello/codegenerators/codegenpolicyext.h   [License: GPL (v2+)]
 M  +7 -5      umbrello/codegenerators/cppcodeclassfield.cpp  
 M  +4 -3      umbrello/codegenerators/cppcodeclassfield.h  
 M  +20 -18    umbrello/codegenerators/cppcodedocumentation.cpp  
 M  +2 -2      umbrello/codegenerators/cppcodedocumentation.h  
 M  +2 -2      umbrello/codegenerators/cppcodegenerationformbase.ui  
 M  +18 -87    umbrello/codegenerators/cppcodegenerationpolicy.cpp  
 M  +11 -39    umbrello/codegenerators/cppcodegenerationpolicy.h  
 M  +12 -17    umbrello/codegenerators/cppcodegenerationpolicypage.cpp  
 M  +2 -1      umbrello/codegenerators/cppcodegenerationpolicypage.h  
 M  +24 -39    umbrello/codegenerators/cppcodegenerator.cpp  
 M  +5 -26     umbrello/codegenerators/cppcodegenerator.h  
 M  +8 -6      umbrello/codegenerators/cppheaderclassdeclarationblock.cpp  
 M  +15 -7     umbrello/codegenerators/cppheadercodeaccessormethod.cpp  
 M  +8 -2      umbrello/codegenerators/cppheadercodeaccessormethod.h  
 M  +57 -114   umbrello/codegenerators/cppheadercodedocument.cpp  
 M  +3 -36     umbrello/codegenerators/cppheadercodedocument.h  
 M  +22 -24    umbrello/codegenerators/cppheadercodeoperation.cpp  
 M  +2 -5      umbrello/codegenerators/cppheadercodeoperation.h  
 M  +3 -2      umbrello/codegenerators/cppmakecodedocument.cpp  
 M  +3 -4      umbrello/codegenerators/cppmakecodedocument.h  
 M  +15 -8     umbrello/codegenerators/cppsourcecodeaccessormethod.cpp  
 M  +7 -2      umbrello/codegenerators/cppsourcecodeaccessormethod.h  
 M  +20 -67    umbrello/codegenerators/cppsourcecodedocument.cpp  
 M  +3 -40     umbrello/codegenerators/cppsourcecodedocument.h  
 M  +84 -25    umbrello/codegenerators/cppsourcecodeoperation.cpp  
 M  +2 -5      umbrello/codegenerators/cppsourcecodeoperation.h  
 M  +8 -8      umbrello/codegenerators/cppwriter.cpp  
 M  +13 -17    umbrello/codegenerators/javaantcodedocument.cpp  
 M  +3 -6      umbrello/codegenerators/javaantcodedocument.h  
 M  +9 -5      umbrello/codegenerators/javaclassdeclarationblock.cpp  
 M  +35 -70    umbrello/codegenerators/javaclassifiercodedocument.cpp  
 M  +3 -30     umbrello/codegenerators/javaclassifiercodedocument.h  
 M  +18 -21    umbrello/codegenerators/javacodeaccessormethod.cpp  
 M  +8 -6      umbrello/codegenerators/javacodeaccessormethod.h  
 M  +9 -8      umbrello/codegenerators/javacodeclassfield.cpp  
 M  +3 -3      umbrello/codegenerators/javacodeclassfield.h  
 M  +10 -7     umbrello/codegenerators/javacodeclassfielddeclarationblock.cpp  
 M  +14 -12    umbrello/codegenerators/javacodedocumentation.cpp  
 M  +2 -2      umbrello/codegenerators/javacodegenerationformbase.ui  
 M  +13 -94    umbrello/codegenerators/javacodegenerationpolicy.cpp  
 M  +12 -60    umbrello/codegenerators/javacodegenerationpolicy.h  
 M  +18 -25    umbrello/codegenerators/javacodegenerationpolicypage.cpp  
 M  +2 -1      umbrello/codegenerators/javacodegenerationpolicypage.h  
 M  +9 -39     umbrello/codegenerators/javacodegenerator.cpp  
 M  +8 -39     umbrello/codegenerators/javacodegenerator.h  
 M  +16 -22    umbrello/codegenerators/javacodeoperation.cpp  
 M  +2 -5      umbrello/codegenerators/javacodeoperation.h  
 M  +4 -4      umbrello/codegenerators/javawriter.cpp  
 M  +83 -24    umbrello/codegenerators/perlwriter.cpp  
 M  +0 -1      umbrello/codegenerators/pythonwriter.cpp  
 M  +10 -7     umbrello/codegenerators/rubyclassdeclarationblock.cpp  
 M  +35 -82    umbrello/codegenerators/rubyclassifiercodedocument.cpp  
 M  +1 -34     umbrello/codegenerators/rubyclassifiercodedocument.h  
 M  +18 -22    umbrello/codegenerators/rubycodeaccessormethod.cpp  
 M  +6 -3      umbrello/codegenerators/rubycodeaccessormethod.h  
 M  +9 -7      umbrello/codegenerators/rubycodeclassfield.cpp  
 M  +3 -3      umbrello/codegenerators/rubycodeclassfield.h  
 M  +10 -13    umbrello/codegenerators/rubycodeclassfielddeclarationblock.cpp  
 M  +13 -10    umbrello/codegenerators/rubycodedocumentation.cpp  
 M  +2 -2      umbrello/codegenerators/rubycodegenerationformbase.ui  
 M  +8 -99     umbrello/codegenerators/rubycodegenerationpolicy.cpp  
 M  +11 -60    umbrello/codegenerators/rubycodegenerationpolicy.h  
 M  +14 -21    umbrello/codegenerators/rubycodegenerationpolicypage.cpp  
 M  +2 -1      umbrello/codegenerators/rubycodegenerationpolicypage.h  
 M  +6 -35     umbrello/codegenerators/rubycodegenerator.cpp  
 M  +6 -38     umbrello/codegenerators/rubycodegenerator.h  
 M  +19 -23    umbrello/codegenerators/rubycodeoperation.cpp  
 M  +0 -4      umbrello/codegenerators/rubycodeoperation.h  
 M  +5 -5      umbrello/codegenerators/rubywriter.cpp  
 M  +15 -17    umbrello/codegenerators/simplecodegenerator.cpp  
 M  +3 -10     umbrello/codegenerators/simplecodegenerator.h  
 M  +6 -6      umbrello/codegenerators/tclwriter.cpp  
 M  +6 -6      umbrello/codegenerators/xmlschemawriter.cpp  
 M  +48 -66    umbrello/codegenobjectwithtextblocks.cpp  
 M  +23 -30    umbrello/codegenobjectwithtextblocks.h  
 M  +7 -12     umbrello/codemethodblock.cpp  
 M  +0 -1      umbrello/codemethodblock.h  
 M  +5 -4      umbrello/codeoperation.cpp  
 M  +7 -9      umbrello/codeparameter.cpp  
 M  +2 -5      umbrello/codeparameter.h  
 M  +1 -1      umbrello/configurable.h  
 M  +1 -1      umbrello/datatype.h  
 M  +5 -2      umbrello/dialogs/assocgenpage.cpp  
 M  +2 -2      umbrello/dialogs/assocgenpage.h  
 M  +1 -0      umbrello/dialogs/classgenpage.cpp  
 M  +6 -6      umbrello/dialogs/classifierlistpage.h  
 M  +2 -2      umbrello/dialogs/classoptionspage.h  
 M  +2 -2      umbrello/dialogs/classpropdlg.h  
 M  +10 -9     umbrello/dialogs/codeeditor.cpp  
 M  +20 -41    umbrello/dialogs/codegenerationoptionspage.cpp  
 M  +10 -9     umbrello/dialogs/codegenerationoptionspage.h  
 M  +2 -0      umbrello/dialogs/codegenerationpolicypage.h  
 M  +37 -29    umbrello/dialogs/codegenerationwizard.cpp  
 M  +21 -3     umbrello/dialogs/codegenerationwizard.h  
 M  +6 -0      umbrello/dialogs/codegenerationwizardbase.ui  
 M  +1 -1      umbrello/dialogs/codeviewerdialog.h  
 M  +1 -1      umbrello/dialogs/overwritedialogue.h  
 M  +9 -3      umbrello/dialogs/parmpropdlg.cpp  
 M  +7 -0      umbrello/dialogs/parmpropdlg.h  
 M  +10 -2     umbrello/dialogs/selectopdlg.cpp  
 M  +7 -2      umbrello/dialogs/selectopdlg.h  
 M  +41 -18    umbrello/dialogs/settingsdlg.cpp  
 M  +19 -8     umbrello/dialogs/settingsdlg.h  
 M  +11 -5     umbrello/dialogs/umlentityattributedialog.cpp  
 M  +4 -0      umbrello/dialogs/umlentityattributedialog.h  
 M  +9 -3      umbrello/dialogs/umltemplatedialog.cpp  
 M  +7 -1      umbrello/dialogs/umltemplatedialog.h  
 M  +4 -4      umbrello/entity.cpp  
 M  +2 -2      umbrello/entity.h  
 M  +2 -2      umbrello/entityattribute.cpp  
 M  +10 -10    umbrello/entityattribute.h  
 M  +1 -1      umbrello/enum.cpp  
 M  +2 -2      umbrello/enum.h  
 M  +1 -1      umbrello/enumliteral.h  
 D             umbrello/floatingtext.cpp  
 D             umbrello/floatingtext.h  
 A             umbrello/floatingtextwidget.cpp   [License: GPL (v2+)]
 A             umbrello/floatingtextwidget.h   [License: GPL (v2+)]
 A             umbrello/floatingtextwidgetcontroller.cpp   [License: GPL (v2+)]
 A             umbrello/floatingtextwidgetcontroller.h   [License: GPL (v2+)]
 M  +17 -49    umbrello/hierarchicalcodeblock.cpp  
 M  +3 -24     umbrello/hierarchicalcodeblock.h  
 M  +8 -0      umbrello/javaimport.cpp  
 M  +19 -19    umbrello/linkwidget.h  
 M  +29 -3     umbrello/listpopupmenu.cpp  
 M  +2 -0      umbrello/listpopupmenu.h  
 M  +6 -7      umbrello/main.cpp  
 M  +35 -100   umbrello/messagewidget.cpp  
 M  +26 -33    umbrello/messagewidget.h  
 A             umbrello/messagewidgetcontroller.cpp   [License: GPL (v2+)]
 A             umbrello/messagewidgetcontroller.h   [License: GPL (v2+)]
 M  +20 -5     umbrello/model_utils.cpp  
 M  +4 -31     umbrello/notewidget.cpp  
 M  +4 -20     umbrello/notewidget.h  
 A             umbrello/notewidgetcontroller.cpp   [License: GPL (v2+)]
 A             umbrello/notewidgetcontroller.h   [License: GPL (v2+)]
 M  +52 -39    umbrello/object_factory.cpp  
 M  +7 -1      umbrello/object_factory.h  
 M  +8 -24     umbrello/objectwidget.cpp  
 M  +2 -10     umbrello/objectwidget.h  
 A             umbrello/objectwidgetcontroller.cpp   [License: GPL (v2+)]
 A             umbrello/objectwidgetcontroller.h   [License: GPL (v2+)]
 M  +2 -2      umbrello/operation.cpp  
 M  +4 -4      umbrello/operation.h  
 M  +5 -3      umbrello/ownedcodeblock.cpp  
 M  +11 -5     umbrello/packagewidget.cpp  
 M  +16 -15    umbrello/petaltree2uml.cpp  
 M  +0 -273    umbrello/pics/sources/align_hori_distribute.svg  
 M  +0 -272    umbrello/pics/sources/align_vert_distribute.svg  
 A             umbrello/pics/sources/subsystem.svg  
 AM            umbrello/pics/subsystem.png  
 M  +27 -16    umbrello/statewidget.cpp  
 M  +10 -11    umbrello/statewidget.h  
 M  +1 -1      umbrello/stereotype.h  
 M  +2 -2      umbrello/template.cpp  
 M  +1 -1      umbrello/template.h  
 M  +9 -6      umbrello/textblock.cpp  
 M  +1 -1      umbrello/toolbarstateassociation.cpp  
 M  +2 -2      umbrello/toolbarstatemessages.cpp  
 M  +3 -3      umbrello/toolbarstateother.cpp  
 M  +99 -163   umbrello/uml.cpp  
 M  +67 -15    umbrello/uml.h  
 M  +33 -85    umbrello/umldoc.cpp  
 M  +4 -52     umbrello/umldoc.h  
 M  +84 -22    umbrello/umllistview.cpp  
 M  +3 -1      umbrello/umllistview.h  
 M  +5 -1      umbrello/umllistviewitem.cpp  
 M  +1 -0      umbrello/umlnamespace.h  
 M  +9 -5      umbrello/umlobject.cpp  
 M  +61 -54    umbrello/umlview.cpp  
 M  +18 -11    umbrello/umlview.h  
 M  +37 -262   umbrello/umlwidget.cpp  
 M  +31 -37    umbrello/umlwidget.h  
 A             umbrello/umlwidgetcontroller.cpp   [License: GPL (v2+)]
 A             umbrello/umlwidgetcontroller.h   [License: GPL (v2+)]
 M  +1 -1      umbrello/worktoolbar.cpp  






More information about the umbrello-devel mailing list