[Uml-devel] branches/work/isi-umbrello/umbrello

[Thibault Normand]

SVN commit 614966 by tnormand:

# MERGE 614964

 M  +1 -0      ChangeLog  
 M  +1 -0      THANKS  
 M  +5 -3      umbrello/attribute.cpp  
 M  +4 -2      umbrello/attribute.h  
 M  +12 -9     umbrello/classifier.cpp  
 M  +6 -5      umbrello/classifier.h  
 M  +3 -2      umbrello/classifierlistitem.cpp  
 M  +3 -1      umbrello/classifierlistitem.h  
 M  +1 -1      umbrello/codegenerator.cpp  
 M  +1 -1      umbrello/codegenerator.h  
 M  +1 -1      umbrello/codegenerators/pythonwriter.cpp  
 M  +1 -1      umbrello/codegenerators/pythonwriter.h  
 M  +4 -1      umbrello/codegenerators/rubywriter.cpp  
 M  +2 -1      umbrello/codegenerators/rubywriter.h  
 M  +5 -5      umbrello/codeimport/adaimport.cpp  
 M  +2 -2      umbrello/codeimport/adaimport.h  
 M  +1 -1      umbrello/codeimport/classimport.h  
 M  +2 -2      umbrello/codeimport/cppimport.cpp  
 M  +2 -2      umbrello/codeimport/cppimport.h  
 M  +2 -2      umbrello/codeimport/idlimport.cpp  
 M  +2 -2      umbrello/codeimport/idlimport.h  
 M  +25 -17    umbrello/codeimport/import_utils.cpp  
 M  +18 -13    umbrello/codeimport/import_utils.h  
 M  +2 -2      umbrello/codeimport/javaimport.cpp  
 M  +2 -2      umbrello/codeimport/javaimport.h  
 M  +6 -5      umbrello/codeimport/nativeimportbase.cpp  
 M  +3 -3      umbrello/codeimport/nativeimportbase.h  
 M  +2 -2      umbrello/codeimport/pascalimport.cpp  
 M  +1 -1      umbrello/codeimport/pascalimport.h  
 M  +1 -1      umbrello/codeimport/pythonimport.cpp  
 M  +1 -1      umbrello/codeimport/pythonimport.h  
 M  +5 -4      umbrello/dialog_utils.cpp  
 M  +5 -4      umbrello/dialog_utils.h  
 M  +7 -2      umbrello/dialogs/exportallviewsdialog.cpp  
 M  +3 -2      umbrello/dialogs/exportallviewsdialog.h  
 M  +4 -1      umbrello/dialogs/overwritedialogue.cpp  
 M  +2 -1      umbrello/dialogs/overwritedialogue.h  
 M  +4 -3      umbrello/entityattribute.cpp  
 M  +4 -2      umbrello/entityattribute.h  
 M  +2 -1      umbrello/enumliteral.cpp  
 M  +2 -1      umbrello/enumliteral.h  
 M  +1 -1      umbrello/floatingtextwidget.cpp  
 M  +1 -1      umbrello/floatingtextwidget.h  
 M  +3 -3      umbrello/folder.cpp  
 M  +3 -3      umbrello/folder.h  
 M  +3 -3      umbrello/import_rose.cpp  
 M  +5 -1      umbrello/kplayerslideraction.cpp  
 M  +3 -1      umbrello/model_utils.cpp  
 M  +2 -1      umbrello/model_utils.h  
 M  +4 -3      umbrello/object_factory.cpp  
 M  +4 -3      umbrello/object_factory.h  
 M  +6 -5      umbrello/operation.cpp  
 M  +6 -3      umbrello/operation.h  
 M  +2 -2      umbrello/petalnode.cpp  
 M  +2 -2      umbrello/petalnode.h  
 M  +17 -12    umbrello/petaltree2uml.cpp  
 M  +2 -1      umbrello/template.cpp  
 M  +2 -2      umbrello/template.h  
 M  +7 -5      umbrello/textblock.cpp  
 M  +6 -4      umbrello/textblock.h  
 M  +26 -29    umbrello/uml.cpp  
 M  +1 -1      umbrello/umldoc.cpp  
 M  +1 -1      umbrello/umldoc.h  
 M  +3 -1      umbrello/umlnamespace.cpp  
 M  +1 -1      umbrello/umlnamespace.h  
 M  +2 -2      umbrello/umlobject.cpp  
 M  +2 -2      umbrello/umlobject.h  
 M  +13 -13    umbrello/umlviewimageexportermodel.cpp  
 M  +2 -2      umbrello/umlviewimageexportermodel.h  
 M  +9 -14     umbrello/umlwidgetcontroller.cpp  
 M  +2 -1      umbrello/widget_factory.cpp  
 M  +2 -1      umbrello/widget_factory.h