[Uml-devel] KDE/kdesdk/umbrello

Oliver Kellogg okellogg at users.sourceforge.net
Tue Sep 27 22:01:31 UTC 2005


SVN commit 464664 by okellogg:

Merge back changes from branches/KDE/3.5 up to commit 464599
but excluding autolayout.


 M  +8 -2      ChangeLog  
 M  +6 -0      THANKS  
 M  +1 -1      VERSION  
 M  +10 -3     umbrello/Makefile.am  
 M  +24 -39    umbrello/activitywidget.cpp  
 M  +10 -39    umbrello/activitywidget.h  
 M  +3 -3      umbrello/actor.h  
 M  +2 -2      umbrello/actorwidget.cpp  
 M  +4 -4      umbrello/actorwidget.h  
 A             umbrello/adaimport.cpp   [License: GPL (v2+)]
 A             umbrello/adaimport.h   [License: GPL (v2+)]
 M  +1 -1      umbrello/aligntoolbar.cpp  
 M  +2 -2      umbrello/aligntoolbar.h  
 M  +3 -3      umbrello/artifact.h  
 M  +14 -22    umbrello/artifactwidget.cpp  
 M  +3 -8      umbrello/artifactwidget.h  
 M  +35 -35    umbrello/association.cpp  
 M  +33 -33    umbrello/association.h  
 M  +318 -234  umbrello/associationwidget.cpp  
 M  +91 -75    umbrello/associationwidget.h  
 M  +112 -96   umbrello/assocrules.cpp  
 M  +19 -8     umbrello/attribute.cpp  
 M  +13 -13    umbrello/attribute.h  
 M  +15 -7     umbrello/boxwidget.cpp  
 M  +8 -3      umbrello/boxwidget.h  
 M  +82 -70    umbrello/classifier.cpp  
 M  +93 -109   umbrello/classifier.h  
 M  +35 -33    umbrello/classifiercodedocument.cpp  
 M  +15 -12    umbrello/classifiercodedocument.h  
 M  +5 -18     umbrello/classifierlistitem.cpp  
 M  +22 -22    umbrello/classifierlistitem.h  
 M  +34 -37    umbrello/classifierwidget.cpp  
 M  +29 -34    umbrello/classifierwidget.h  
 D             umbrello/classimport.cpp  
 M  +11 -108   umbrello/classimport.h  
 M  +0 -2      umbrello/classparser/ast_utils.cpp  
 M  +247 -247  umbrello/classparser/cpptree2uml.cpp  
 M  +1 -1      umbrello/classparser/cpptree2uml.h  
 M  +2 -2      umbrello/classparser/lexer.cpp  
 M  +0 -38     umbrello/classparser/readme  
 M  +29 -24    umbrello/clipboard/umlclipboard.cpp  
 M  +16 -16    umbrello/clipboard/umlclipboard.h  
 M  +24 -25    umbrello/clipboard/umldrag.cpp  
 M  +5 -5      umbrello/clipboard/umldrag.h  
 M  +17 -17    umbrello/codeaccessormethod.cpp  
 M  +1 -1      umbrello/codeaccessormethod.h  
 M  +1 -1      umbrello/codeblock.cpp  
 M  +2 -2      umbrello/codeblock.h  
 M  +1 -1      umbrello/codeblockwithcomments.cpp  
 M  +1 -1      umbrello/codeblockwithcomments.h  
 M  +13 -18    umbrello/codeclassfield.cpp  
 M  +5 -6      umbrello/codeclassfield.h  
 M  +4 -2      umbrello/codeclassfielddeclarationblock.cpp  
 M  +1 -1      umbrello/codeclassfielddeclarationblock.h  
 M  +9 -9      umbrello/codedocument.cpp  
 M  +9 -9      umbrello/codedocument.h  
 M  +23 -23    umbrello/codegenerator.cpp  
 M  +6 -6      umbrello/codegenerator.h  
 M  +27 -27    umbrello/codegenerators/Makefile.am  
 M  +2 -2      umbrello/codegenerators/adawriter.cpp  
 M  +4 -4      umbrello/codegenerators/classifierinfo.cpp  
 M  +2 -2      umbrello/codegenerators/codegen_utils.cpp  
 M  +1 -1      umbrello/codegenerators/codegen_utils.h  
 M  +13 -8     umbrello/codegenerators/codegenfactory.cpp  
 M  +1 -1      umbrello/codegenerators/cppcodecomment.cpp  
 M  +1 -1      umbrello/codegenerators/cppcodecomment.h  
 M  +1 -1      umbrello/codegenerators/cppcodedocumentation.cpp  
 M  +1 -1      umbrello/codegenerators/cppcodedocumentation.h  
 M  +9 -9      umbrello/codegenerators/cppcodegenerator.cpp  
 M  +3 -3      umbrello/codegenerators/cppcodegenerator.h  
 M  +4 -4      umbrello/codegenerators/cppheaderclassdeclarationblock.cpp  
 M  +1 -1      umbrello/codegenerators/cppheadercodeaccessormethod.cpp  
 M  +6 -2      umbrello/codegenerators/cppheadercodeclassfielddeclarationblock.cpp  
 M  +4 -4      umbrello/codegenerators/cppheadercodedocument.cpp  
 M  +10 -12    umbrello/codegenerators/cppheadercodeoperation.cpp  
 M  +1 -1      umbrello/codegenerators/cppmakecodedocument.cpp  
 M  +1 -1      umbrello/codegenerators/cppmakecodedocument.h  
 M  +4 -4      umbrello/codegenerators/cppsourcecodeclassfielddeclarationblock.cpp  
 M  +1 -1      umbrello/codegenerators/cppsourcecodedocument.cpp  
 M  +6 -7      umbrello/codegenerators/cppsourcecodeoperation.cpp  
 M  +44 -46    umbrello/codegenerators/cppwriter.cpp  
 M  +6 -11     umbrello/codegenerators/idlwriter.cpp  
 M  +4 -4      umbrello/codegenerators/javaantcodedocument.cpp  
 M  +1 -1      umbrello/codegenerators/javaantcodedocument.h  
 M  +1 -1      umbrello/codegenerators/javaclassifiercodedocument.cpp  
 M  +1 -1      umbrello/codegenerators/javaclassifiercodedocument.h  
 M  +1 -1      umbrello/codegenerators/javacodecomment.cpp  
 M  +1 -1      umbrello/codegenerators/javacodecomment.h  
 M  +1 -1      umbrello/codegenerators/javacodedocumentation.cpp  
 M  +1 -1      umbrello/codegenerators/javacodedocumentation.h  
 M  +7 -7      umbrello/codegenerators/javacodegenerator.h  
 M  +5 -5      umbrello/codegenerators/javawriter.cpp  
 M  +5 -5      umbrello/codegenerators/perlwriter.cpp  
 M  +6 -6      umbrello/codegenerators/php5writer.cpp  
 M  +5 -5      umbrello/codegenerators/phpwriter.cpp  
 M  +4 -1      umbrello/codegenerators/pythonwriter.cpp  
 M  +16 -16    umbrello/codegenerators/rubyclassifiercodedocument.cpp  
 M  +2 -1      umbrello/codegenerators/rubyclassifiercodedocument.h  
 A             umbrello/codegenerators/rubycodegenerationformbase.cpp   [License: no copyright]
 A             umbrello/codegenerators/rubycodegenerationformbase.h   [License: no copyright]
 M  +0 -1      umbrello/codegenerators/rubywriter.h  
 M  +8 -5      umbrello/codegenerators/simplecodegenerator.cpp  
 M  +3 -3      umbrello/codegenerators/simplecodegenerator.h  
 A             umbrello/codegenerators/tclwriter.cpp   [License: GPL (v2+)]
 A             umbrello/codegenerators/tclwriter.h   [License: GPL (v2+)]
 M  +1 -1      umbrello/codegenerators/xmlcodecomment.cpp  
 M  +1 -1      umbrello/codegenerators/xmlcodecomment.h  
 M  +11 -11    umbrello/codegenerators/xmlschemawriter.cpp  
 M  +22 -22    umbrello/codegenobjectwithtextblocks.cpp  
 M  +23 -23    umbrello/codegenobjectwithtextblocks.h  
 M  +1 -1      umbrello/codemethodblock.cpp  
 M  +3 -3      umbrello/codemethodblock.h  
 M  +1 -1      umbrello/codeoperation.cpp  
 M  +3 -1      umbrello/codeparameter.cpp  
 M  +3 -3      umbrello/component.h  
 M  +8 -20     umbrello/componentwidget.cpp  
 M  +5 -10     umbrello/componentwidget.h  
 M  +3 -3      umbrello/configurable.h  
 A             umbrello/cppimport.cpp   [License: no copyright GPL (v2+)]
 A             umbrello/cppimport.h   [License: GPL (v2+)]
 M  +1 -1      umbrello/datatype.cpp  
 M  +2 -2      umbrello/datatype.h  
 M  +5 -13     umbrello/datatypewidget.cpp  
 M  +3 -8      umbrello/datatypewidget.h  
 D             umbrello/diagram (directory)  
 M  +2 -2      umbrello/dialog_utils.cpp  
 M  +14 -14    umbrello/dialog_utils.h  
 M  +2 -2      umbrello/dialogs/activitydialog.cpp  
 M  +2 -2      umbrello/dialogs/activitydialog.h  
 M  +3 -3      umbrello/dialogs/activitypage.cpp  
 M  +9 -9      umbrello/dialogs/activitypage.h  
 M  +4 -71     umbrello/dialogs/assocgenpage.cpp  
 M  +12 -12    umbrello/dialogs/assocgenpage.h  
 M  +7 -7      umbrello/dialogs/assocpage.h  
 M  +5 -5      umbrello/dialogs/assocpropdlg.h  
 M  +4 -4      umbrello/dialogs/assocrolepage.cpp  
 M  +12 -12    umbrello/dialogs/assocrolepage.h  
 M  +57 -14    umbrello/dialogs/classgenpage.cpp  
 M  +40 -35    umbrello/dialogs/classgenpage.h  
 M  +13 -10    umbrello/dialogs/classifierlistpage.cpp  
 M  +14 -14    umbrello/dialogs/classifierlistpage.h  
 M  +1 -1      umbrello/dialogs/classoptionspage.h  
 M  +13 -13    umbrello/dialogs/classpropdlg.h  
 M  +2 -13     umbrello/dialogs/classwizard.cpp  
 M  +13 -13    umbrello/dialogs/classwizard.h  
 M  +3 -3      umbrello/dialogs/codeeditor.cpp  
 M  +2 -2      umbrello/dialogs/codeeditor.h  
 M  +31 -31    umbrello/dialogs/codegenerationwizard.cpp  
 M  +1 -1      umbrello/dialogs/codeviewerdialog.h  
 M  +0 -1      umbrello/dialogs/codevieweroptionsbase.ui  
 M  +14 -14    umbrello/dialogs/codevieweroptionspage.cpp  
 M  +1 -1      umbrello/dialogs/diagramprintpage.cpp  
 M  +5 -5      umbrello/dialogs/diagramprintpage.h  
 M  +4 -4      umbrello/dialogs/dialogpage.h  
 M  +3 -3      umbrello/dialogs/notedialog.h  
 M  +4 -4      umbrello/dialogs/parmpropdlg.cpp  
 M  +7 -7      umbrello/dialogs/parmpropdlg.h  
 M  +2 -2      umbrello/dialogs/pkgcontentspage.h  
 M  +15 -7     umbrello/dialogs/selectopdlg.cpp  
 M  +21 -14    umbrello/dialogs/selectopdlg.h  
 M  +1 -1      umbrello/dialogs/settingsdlg.cpp  
 M  +2 -2      umbrello/dialogs/statedialog.cpp  
 M  +4 -4      umbrello/dialogs/statedialog.h  
 M  +16 -11    umbrello/dialogs/umlattributedialog.cpp  
 M  +2 -2      umbrello/dialogs/umlattributedialog.h  
 M  +8 -8      umbrello/dialogs/umlentityattributedialog.cpp  
 M  +2 -2      umbrello/dialogs/umlentityattributedialog.h  
 M  +7 -8      umbrello/dialogs/umloperationdialog.cpp  
 M  +5 -5      umbrello/dialogs/umloperationdialog.h  
 M  +2 -2      umbrello/dialogs/umlroledialog.cpp  
 M  +3 -3      umbrello/dialogs/umlroledialog.h  
 M  +6 -6      umbrello/dialogs/umlroleproperties.h  
 M  +6 -6      umbrello/dialogs/umltemplatedialog.cpp  
 M  +2 -2      umbrello/dialogs/umltemplatedialog.h  
 M  +6 -6      umbrello/dialogs/umlviewdialog.cpp  
 M  +10 -10    umbrello/dialogs/umlviewdialog.h  
 M  +4 -4      umbrello/dialogs/umlwidgetcolorpage.cpp  
 M  +9 -9      umbrello/dialogs/umlwidgetcolorpage.h  
 M  +9 -9      umbrello/docwindow.cpp  
 M  +4 -4      umbrello/docwindow.h  
 M  +7 -25     umbrello/entity.cpp  
 M  +27 -36    umbrello/entity.h  
 M  +21 -21    umbrello/entityattribute.h  
 M  +7 -15     umbrello/entitywidget.cpp  
 M  +4 -9      umbrello/entitywidget.h  
 M  +16 -27    umbrello/enum.cpp  
 M  +29 -38    umbrello/enum.h  
 M  +4 -4      umbrello/enumliteral.h  
 M  +8 -16     umbrello/enumwidget.cpp  
 M  +6 -11     umbrello/enumwidget.h  
 A             umbrello/exportviewaction.cpp   [License: no copyright]
 A             umbrello/exportviewaction.h   [License: no copyright]
 M  +16 -15    umbrello/floatingtext.cpp  
 M  +31 -34    umbrello/floatingtext.h  
 A             umbrello/forkjoinwidget.cpp   [License: GPL (v2+)]
 A             umbrello/forkjoinwidget.h   [License: GPL (v2+)]
 M  +1 -1      umbrello/headings/heading.cpp  
 M  +1 -1      umbrello/headings/heading.h  
 M  +3 -3      umbrello/hierarchicalcodeblock.cpp  
 M  +3 -3      umbrello/hierarchicalcodeblock.h  
 M  +166 -231  umbrello/idlimport.cpp  
 M  +23 -4     umbrello/idlimport.h  
 A             umbrello/import_utils.cpp   [License: no copyright GPL (v2+)]
 A             umbrello/import_utils.h   [License: GPL (v2+) GENERATED FILE]
 M  +1 -1      umbrello/infowidget.cpp  
 M  +9 -9      umbrello/infowidget.h  
 M  +1 -1      umbrello/inputdialog.h  
 M  +16 -16    umbrello/linepath.cpp  
 M  +12 -12    umbrello/linepath.h  
 M  +0 -5      umbrello/linkwidget.cpp  
 M  +7 -6      umbrello/linkwidget.h  
 M  +32 -15    umbrello/listpopupmenu.cpp  
 M  +22 -21    umbrello/listpopupmenu.h  
 M  +15 -2     umbrello/main.cpp  
 M  +23 -36    umbrello/messagewidget.cpp  
 M  +30 -30    umbrello/messagewidget.h  
 M  +86 -27    umbrello/model_utils.cpp  
 M  +55 -44    umbrello/model_utils.h  
 A             umbrello/nativeimportbase.cpp   [License: GPL (v2+)]
 A             umbrello/nativeimportbase.h   [License: GPL (v2+)]
 M  +3 -3      umbrello/node.h  
 M  +6 -14     umbrello/nodewidget.cpp  
 M  +5 -10     umbrello/nodewidget.h  
 M  +13 -19    umbrello/notewidget.cpp  
 M  +10 -15    umbrello/notewidget.h  
 M  +23 -21    umbrello/objectwidget.cpp  
 M  +26 -43    umbrello/objectwidget.h  
 M  +50 -27    umbrello/operation.cpp  
 M  +44 -30    umbrello/operation.h  
 M  +7 -2      umbrello/ownedcodeblock.cpp  
 M  +1 -1      umbrello/ownedcodeblock.h  
 M  +3 -1      umbrello/ownedhierarchicalcodeblock.cpp  
 M  +15 -16    umbrello/package.cpp  
 M  +25 -24    umbrello/package.h  
 M  +7 -19     umbrello/packagewidget.cpp  
 M  +5 -10     umbrello/packagewidget.h  
 M  +2 -2      umbrello/pics/Makefile.am  
 D             umbrello/pics/cursor-end-state.png  
 A             umbrello/pics/cursor-end_state.png   umbrello/pics/cursor-end-state.png#464577
 D             umbrello/pics/cursor-initial-state.png  
 A             umbrello/pics/cursor-initial_state.png   umbrello/pics/cursor-initial-state.png#464577
 M  +10 -10    umbrello/plugin.h  
 M  +3 -3      umbrello/pluginloader.h  
 D             umbrello/plugins (directory)  
 M  +47 -43    umbrello/refactoring/refactoringassistant.cpp  
 M  +5 -7      umbrello/refactoring/refactoringassistant.h  
 M  +3 -3      umbrello/seqlinewidget.cpp  
 M  +7 -7      umbrello/seqlinewidget.h  
 M  +16 -24    umbrello/statewidget.cpp  
 M  +7 -27     umbrello/statewidget.h  
 M  +5 -5      umbrello/stereotype.h  
 M  +10 -10    umbrello/template.h  
 M  +1 -1      umbrello/textblock.cpp  
 M  +5 -5      umbrello/textblock.h  
 M  +33 -34    umbrello/toolbarstate.cpp  
 M  +3 -3      umbrello/toolbarstatearrow.cpp  
 M  +1 -3      umbrello/toolbarstatemessages.cpp  
 M  +30 -28    umbrello/toolbarstateother.cpp  
 M  +1 -0      umbrello/umbrelloui.rc  
 M  +46 -26    umbrello/uml.cpp  
 M  +58 -48    umbrello/uml.h  
 M  +79 -45    umbrello/umlcanvasobject.cpp  
 M  +35 -32    umbrello/umlcanvasobject.h  
 M  +68 -82    umbrello/umldoc.cpp  
 M  +150 -150  umbrello/umldoc.h  
 M  +137 -107  umbrello/umllistview.cpp  
 M  +56 -39    umbrello/umllistview.h  
 M  +50 -70    umbrello/umllistviewitem.cpp  
 M  +23 -23    umbrello/umllistviewitem.h  
 M  +24 -23    umbrello/umlnamespace.h  
 M  +38 -34    umbrello/umlobject.cpp  
 M  +37 -46    umbrello/umlobject.h  
 M  +1 -1      umbrello/umlrole.cpp  
 M  +17 -17    umbrello/umlrole.h  
 M  +134 -114  umbrello/umlview.cpp  
 M  +67 -78    umbrello/umlview.h  
 M  +1 -1      umbrello/umlviewcanvas.cpp  
 M  +4 -4      umbrello/umlviewcanvas.h  
 M  +37 -84    umbrello/umlwidget.cpp  
 M  +35 -93    umbrello/umlwidget.h  
 M  +5 -5      umbrello/usecase.h  
 M  +2 -2      umbrello/usecasewidget.cpp  
 M  +7 -7      umbrello/usecasewidget.h  
 M  +3 -3      umbrello/widget_utils.cpp  
 M  +5 -5      umbrello/widget_utils.h  
 M  +69 -4     umbrello/widgetbase.cpp  
 M  +94 -8     umbrello/widgetbase.h  
 M  +68 -188   umbrello/worktoolbar.cpp  
 M  +8 -8      umbrello/worktoolbar.h  






More information about the umbrello-devel mailing list