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

[Andi Fischer]

SVN commit 956009 by fischer:

Sync with trunk and branch to reduce the difference.

 M  +38 -11    assocrules.cpp  
 M  +14 -34    assocrules.h  
 M  +3 -3      codegenerators/codemethodblock.h  
 M  +0 -4      codeimport/javaimport.cpp  
 M  +4 -4      codeimport/nativeimportbase.h  
 M  +0 -2      codeimport/pascalimport.cpp  
 M  +16 -16    component.cpp  
 M  +2 -16     component.h  
 M  +24 -10    docwindow.cpp  
 M  +9 -45     docwindow.h  
 M  +0 -25     entity.cpp  
 M  +64 -39    entityattribute.cpp  
 M  +13 -43    entityattribute.h  
 M  +32 -17    entityconstraint.cpp  
 M  +6 -24     entityconstraint.h  
 M  +34 -25    enum.cpp  
 M  +6 -26     enum.h  
 M  +3 -13     uml.cpp  
 M  +2 -2      uml.h