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

[Andi Fischer]

SVN commit 1250626 by fischer:

Some code changes from trunk applied to branch to stay in sync.

 M  +91 -19    test/ATP.txt  
 M  +1 -3      umbrello/CMakeLists.txt  
 M  +34 -2     umbrello/_unused/plugin.h  
 M  +3 -7      umbrello/codeaccessormethod.h  
 M  +0 -1      umbrello/codeaccessormethodlist.h  
 M  +12 -7     umbrello/codegenerators/codeblock.cpp  
 M  +4 -7      umbrello/codegenerators/codeblock.h  
 M  +1 -1      umbrello/codegenerators/codeclassfield.cpp  
 M  +2 -2      umbrello/codegenerators/codeclassfielddeclarationblock.cpp  
 M  +1 -6      umbrello/codegenerators/codedocument.h  
 M  +1 -1      umbrello/codegenerators/codegenobjectwithtextblocks.cpp  
 M  +5 -10     umbrello/codegenerators/codemethodblock.cpp  
 M  +2 -2      umbrello/codegenerators/cpp/cppheadercodedocument.cpp  
 M  +2 -2      umbrello/codegenerators/cpp/cppheadercodeoperation.cpp  
 M  +2 -2      umbrello/codegenerators/d/dclassifiercodedocument.cpp  
 M  +2 -2      umbrello/codegenerators/d/dcodeoperation.cpp  
 M  +5 -5      umbrello/codegenerators/hierarchicalcodeblock.cpp  
 M  +2 -2      umbrello/codegenerators/java/javaclassifiercodedocument.cpp  
 M  +2 -2      umbrello/codegenerators/java/javacodeoperation.cpp  
 M  +1 -1      umbrello/codegenerators/ownedhierarchicalcodeblock.cpp  
 M  +2 -2      umbrello/codegenerators/ruby/rubycodeoperation.cpp  
 M  +20 -20    umbrello/codegenerators/textblock.cpp  
 U             umbrello/codegenerators/textblock.h  
 M  +31 -5     umbrello/codeimport/classimport.cpp  
 M  +10 -3     umbrello/codeimport/classimport.h  
 M  +3 -3      umbrello/codeimport/cppimport.cpp  
 M  +1 -1      umbrello/codeimport/cppimport.h  
 U             umbrello/codeimport/import_utils.cpp  
 M  +6 -3      umbrello/codeimport/javaimport.cpp  
 M  +1 -1      umbrello/codeimport/javaimport.h  
 M  +30 -9     umbrello/codeimport/kdevcppparser/cpptree2uml.cpp  
 M  +4 -2      umbrello/codeimport/kdevcppparser/cpptree2uml.h  
 M  +8 -6      umbrello/codeimport/nativeimportbase.cpp  
 M  +1 -1      umbrello/codeimport/nativeimportbase.h  
 M  +6 -5      umbrello/codeimport/pythonimport.cpp  
 M  +1 -1      umbrello/codeimport/pythonimport.h  
 M  +5 -1      umbrello/codeimpwizard/codeimportingwizard.cpp  
 M  +1 -1      umbrello/codeimpwizard/codeimportingwizard.h  
 M  +210 -237  umbrello/codeimpwizard/codeimpselectpage.cpp  
 M  +9 -20     umbrello/codeimpwizard/codeimpselectpage.h  
 M  +54 -35    umbrello/codeimpwizard/codeimpselectpage.ui  
 M  +91 -31    umbrello/codeimpwizard/codeimpstatuspage.cpp  
 M  +33 -22    umbrello/codeimpwizard/codeimpstatuspage.h  
 M  +77 -3     umbrello/codeimpwizard/codeimpstatuspage.ui  
 M  +39 -13    umbrello/codeimpwizard/codeimpthread.cpp  
 M  +12 -10    umbrello/codeimpwizard/codeimpthread.h  
 D             umbrello/codeimpwizard/treeitem.cpp  
 D             umbrello/codeimpwizard/treeitem.h  
 D             umbrello/codeimpwizard/treemodel.cpp  
 D             umbrello/codeimpwizard/treemodel.h  
 M  +532 -291  umbrello/dialogs/codeeditor.cpp  
 M  +27 -56    umbrello/dialogs/codeeditor.h  
 M  +8 -8      umbrello/dialogs/codeviewerdialog.cpp  
 M  +3 -3      umbrello/dialogs/codeviewerdialogbase.ui  
 M  +1 -7      umbrello/dialogs/codevieweroptionsbase.ui  
 M  +98 -33    umbrello/dialogs/settingsdlg.cpp  
 M  +11 -9     umbrello/dialogs/settingsdlg.h  
 M  +0 -2      umbrello/refactoring/refactoringassistant.h  
 M  +37 -3     umbrello/uml.cpp  
 M  +3 -2      umbrello/uml.h  
 M  +1 -1      umbrello/umldoc.cpp  
 M  +11 -6     umbrello/widgets/statusbartoolbutton.cpp  
 M  +2 -2      umbrello/widgets/statusbartoolbutton.h  


http://websvn.kde.org/?view=rev&revision=1250626