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

[Caroline Bourdeu d'Aguerre]

SVN commit 645152 by bourdeu:

SVN MERGE 645151


 M  +1 -5      activitywidget.cpp  
 M  +1 -3      activitywidget.h  
 M  +68 -0     attribute.cpp  
 M  +13 -0     attribute.h  
 M  +0 -2      clipboard/umlclipboard.cpp  
 M  +0 -1      clipboard/umldrag.cpp  
 M  +1 -1      codegenerationpolicy.cpp  
 M  +20 -4     codegenerators/codegenfactory.cpp  
 M  +1 -5      codegenerators/cppcodegenerationpolicy.cpp  
 M  +1 -3      codegenerators/cppcodegenerationpolicypage.cpp  
 M  +106 -126  codegenerators/cppwriter.cpp  
 M  +4 -37     codegenerators/cppwriter.h  
 M  +7 -4      codegenerators/javacodegenerationpolicypage.cpp  
 M  +1 -2      codegenerators/rubycodegenerationpolicypage.cpp  
 M  +50 -7     codeimport/import_utils.cpp  
 M  +6 -0      codeimport/import_utils.h  
 M  +1 -1      dialogs/codegenerationpolicypage.cpp  
 M  +3 -3      dialogs/codegenerationpolicypage.h  
 M  +1 -1      dialogs/defaultcodegenpolicypage.cpp  
 M  +2 -2      dialogs/defaultcodegenpolicypage.h  
 M  +0 -3      dialogs/settingsdlg.cpp  
 M  +14 -5     dialogs/umlattributedialog.cpp  
 M  +1 -4      objectwidget.cpp  
 M  +1 -3      objectwidget.h  
 M  +1 -5      statewidget.cpp  
 M  +1 -3      statewidget.h  
 M  +1 -5      uml.cpp  
 M  +3 -3      umldoc.cpp  
 M  +49 -35    umlview.cpp  
 M  +10 -0     umlview.h  
 M  +8 -8      umlviewimageexportermodel.cpp  
 M  +0 -3      umlwidget.cpp