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

[Caroline Bourdeu d'Aguerre]

SVN commit 631264 by bourdeu:

SVN MERGE 631214


 M  +0 -1      CMakeLists.txt  
 M  +0 -17     cervisia/cervisiashell.cpp  
 M  +1 -1      cervisia/cvsservice/cvsservice.cpp  
 M  +2 -2      cmake/scripts/am2cmake  
 M  +2 -1      doc/CMakeLists.txt  
 M  +41 -28    ebn/krazy/krazy  
 M  +4 -2      ebn/krazy/krazyall  
 M  +1 -0      ebn/krazy/plugins/Makefile  
 M  +4 -2      ebn/krazy/plugins/explicit  
 M  +16 -5     ebn/krazy/plugins/inline  
 M  +106 -39   ebn/krazy/tplugins/constmethods  
 M  +1 -0      ebn/krazy/tplugins/visibility  
 M  +1 -1      kbabel/kbabeldict/aboutmoduledlg.cpp  
 M  +2 -2      kbabel/kbabeldict/aboutmoduledlg.h  
 M  +4 -4      kbabel/kbabeldict/kbabeldictbox.cpp  
 M  +17 -7     kcachegrind/kcachegrind/callgraphview.cpp  
 M  +9 -0      scripts/cmakelint.pl  
 M  +1 -1      scripts/kde-emacs/kde-emacs-bindings.el  
 M  +4 -4      scripts/kdesvn-buildrc-sample  
 M  +3 -1      umbrello/ChangeLog  
 M  +24 -15    umbrello/umbrello/clipboard/umlclipboard.cpp  
 M  +3 -3      umbrello/umbrello/codegenerators/cppwriter.cpp  
 M  +2 -2      umbrello/umbrello/codegenerators/javawriter.cpp  
 M  +2 -2      umbrello/umbrello/codegenerators/tclwriter.cpp  
 M  +2 -2      umbrello/umbrello/codegenerators/xmlschemawriter.cpp  
 M  +67 -31    umbrello/umbrello/codeimport/adaimport.cpp  
 M  +1 -1      umbrello/umbrello/codeimport/idlimport.cpp  
 M  +3 -2      umbrello/umbrello/codeimport/import_utils.cpp  
 M  +2 -1      umbrello/umbrello/codeimport/import_utils.h  
 M  +12 -3     umbrello/umbrello/objectwidget.cpp  
 M  +8 -1      umbrello/umbrello/objectwidget.h  
 M  +20 -25    umbrello/umbrello/seqlinewidget.cpp  
 M  +13 -6     umbrello/umbrello/seqlinewidget.h  
 M  +26 -19    umbrello/umbrello/umlcanvasobject.cpp  
 M  +6 -5      umbrello/umbrello/umlcanvasobject.h  
 M  +2 -7      umbrello/umbrello/umldoc.cpp  
 M  +28 -10    umbrello/umbrello/umlview.cpp  
 M  +1 -21     umbrello/umbrello/umlview.h