← Back to branch summary

~ubuntu-branches/ubuntu/vivid/kdesdk/vivid

« back to all changes in this revision

Viewing changes to umbrello/umbrello/clipboard/umldragdata.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-06-06 11:49:54 UTC
  • mfrom: (0.4.21)
  • Revision ID: package-import@ubuntu.com-20120606114954-rdls73fzlpzxglbx
Tags: 4:4.8.80-0ubuntu1
* New uptream beta release
* Update dont_export_private_classes.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
umbrello/umbrello/clipboard/umldragdata.cpp
17
17
#include "uml.h"
18
18
#include "umldoc.h"
19
19
#include "umlscene.h"
 
20
#include "umlview.h"
20
21
#include "umlobject.h"
21
22
#include "folder.h"
22
23
#include "classifier.h"
153
154
    xmiclip.appendChild(viewsTag);
154
155
 
155
156
    foreach( UMLView* view, diagrams ) {
156
 
        view->saveToXMI(domDoc, viewsTag);
 
157
        view->umlScene()->saveToXMI(domDoc, viewsTag);
157
158
    }
158
159
 
159
160
    QDomElement itemsTag = domDoc.createElement("umllistviewitems");
435
436
        }
436
437
        UMLFolder *f = static_cast<UMLFolder*>(po);
437
438
        UMLView* view = new UMLView(f);
438
 
        view->loadFromXMI(diagramElement);
 
439
        view->umlScene()->loadFromXMI(diagramElement);
439
440
        diagrams.append(view);
440
441
        diagramNode = diagramNode.nextSibling();
441
442
        diagramElement = diagramNode.toElement();
672
673
    }
673
674
 
674
675
    UMLView *view = UMLApp::app()->currentView();
 
676
    UMLScene *scene = view->umlScene();
675
677
    while ( !widgetElement.isNull() ) {
676
678
 
677
 
        UMLWidget* widget = view->loadWidgetFromXMI(widgetElement);
 
679
        UMLWidget* widget = scene->loadWidgetFromXMI(widgetElement);
678
680
        if (widget)
679
681
            widgets.append(widget);
680
682
 
688
690
    QDomElement associationWidgetElement = associationWidgetNode.toElement();
689
691
    while ( !associationWidgetElement.isNull() ) {
690
692
        AssociationWidget* associationWidget = AssociationWidget::create(view->umlScene());
691
 
        if (associationWidget->loadFromXMI(associationWidgetElement, widgets))
 
693
        if (associationWidget->loadFromXMI(associationWidgetElement, widgets, 0))
692
694
            associations.append(associationWidget);
693
695
        else {
694
 
            //associationWidget->cleanup();
695
696
            delete associationWidget;
696
697
        }
697
698
        associationWidgetNode = associationWidgetNode.nextSibling();