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

[Andi Fischer]

SVN commit 1280248 by fischer:

Changes from trunk applied. Compiler warnings about unused variables fixed.

 M  +3 -3      CMakeLists.txt  
 M  +8 -8      umbrello/association.cpp  
 M  +2 -2      umbrello/codegenerators/cpp/cppheadercodeaccessormethod.cpp  
 M  +3 -3      umbrello/codegenerators/cpp/cppwriter.cpp  
 M  +7 -1      umbrello/codegenerators/php/php5writer.cpp  
 M  +1 -3      umbrello/codeimport/adaimport.cpp  
 M  +4 -3      umbrello/codeimport/csharp/csharpimport.cpp  
 U             umbrello/codeimport/idlimport.cpp  
 M  +6 -1      umbrello/codeimport/import_utils.cpp  
 M  +20 -4     umbrello/codeimport/javaimport.cpp  
 M  +21 -21    umbrello/codeimport/kdevcppparser/cpptree2uml.cpp  
 M  +2 -1      umbrello/codeimport/kdevcppparser/preprocesslexer.cpp  
 M  +1 -0      umbrello/codeimport/kdevcppparser/preprocesslexer.h  
 M  +1 -0      umbrello/codeimpwizard/codeimpselectpage.cpp  
 M  +2 -2      umbrello/codeimpwizard/codeimpthread.cpp  
 M  +1 -1      umbrello/dialogs/classgenpage.cpp  
 M  +6 -6      umbrello/dialogs/codeeditor.cpp  
 M  +1 -0      umbrello/dialogs/dialogbase.cpp  
 M  +0 -3      umbrello/dialogs/exportallviewsdialogbase.ui  
 M  +6 -7      umbrello/foreignkeyconstraint.cpp  
 M  +6 -0      umbrello/stereotype.h  
 M  +25 -2     umbrello/umldoc.cpp  
 M  +0 -12     umbrello/umllistview.cpp  
 M  +0 -1      umbrello/umllistview.h  
 M  +9 -2      umbrello/umlobject.cpp  
 M  +1 -1      umbrello/widgets/associationspacemanager.cpp  
 M  +0 -3      umbrello/widgets/associationwidget.cpp  
 M  +1 -2      umbrello/widgets/floatingtextwidget.cpp  
 M  +1 -3      umbrello/widgets/notewidget.cpp  
 M  +1 -2      umbrello/widgets/seqlinewidget.cpp  


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