[Uml-devel] KDE/kdesdk/umbrello/umbrello

[Ralf Habacker]

SVN commit 1268418 by habacker:

merged UMLView::umlScene() related stuff from soc-umbrello branch

This reduces the differences between the branches and eases further merging.

 M  +2 -1      assocrules.cpp  
 M  +4 -3      docwindow.cpp  
 M  +8 -7      folder.cpp  
 M  +1 -0      model_utils.cpp  
 M  +37 -36    toolbarstate.cpp  
 M  +4 -4      toolbarstate.h  
 M  +7 -7      toolbarstatearrow.cpp  
 M  +1 -1      toolbarstatearrow.h  
 M  +12 -12    toolbarstateassociation.cpp  
 M  +1 -1      toolbarstateassociation.h  
 M  +6 -6      toolbarstatefactory.cpp  
 M  +1 -1      toolbarstatefactory.h  
 M  +21 -20    toolbarstatemessages.cpp  
 M  +1 -1      toolbarstatemessages.h  
 M  +25 -24    toolbarstateother.cpp  
 M  +1 -1      toolbarstateother.h  
 M  +3 -3      toolbarstatepool.cpp  
 M  +1 -1      toolbarstatepool.h  
 M  +43 -41    uml.cpp  
 M  +38 -36    umldoc.cpp  
 M  +25 -24    umllistview.cpp  
 A             umlscene.h   [License: GPL (v2+)]
 M  +4 -3      umlview.cpp  
 M  +7 -2      umlview.h  
 M  +7 -7      umlviewimageexporter.cpp  
 M  +5 -5      umlviewimageexporter.h  
 M  +66 -36    umlviewimageexportermodel.cpp  
 M  +7 -7      umlviewimageexportermodel.h  
 M  +9 -8      widgets/toolbarstateonewidget.cpp  
 M  +2 -2      widgets/toolbarstateonewidget.h  


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