← Back to branch summary

~ubuntu-branches/ubuntu/precise/koffice/precise

« back to all changes in this revision

Viewing changes to libs/flake/commands/KoShapeCreateCommand.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Alessandro Ghersi
  • Date: 2010-10-27 17:52:57 UTC
  • mfrom: (0.12.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101027175257-s04zqqk5bs8ckm9o
Tags: 1:2.2.83-0ubuntu1
* Merge with Debian git remaining changes:
 - Add build-deps on librcps-dev, opengtl-dev, libqtgtl-dev, freetds-dev,
   create-resources, libspnav-dev
 - Remove needless build-dep on libwv2-dev
 - koffice-libs recommends create-resources
 - krita recommends pstoedit
 - Keep our patches
* New upstream release 2.3 beta 3
  - Remove debian/patches fixed by upstream
  - Update install files

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/flake/commands/KoShapeCreateCommand.cpp
63
63
    Q_ASSERT(d->shape);
64
64
    Q_ASSERT(d->controller);
65
65
    if (d->shapeParent)
66
 
        d->shapeParent->addChild(d->shape);
 
66
        d->shapeParent->addShape(d->shape);
67
67
    // the parent has to be there when it is added to the KoShapeControllerBase
68
68
    d->controller->addShape(d->shape);
69
69
    d->shapeParent = d->shape->parent(); // update parent if the 'addShape' changed it
78
78
    // the parent has to be there when it is removed from the KoShapeControllerBase
79
79
    d->controller->removeShape(d->shape);
80
80
    if (d->shapeParent)
81
 
        d->shapeParent->removeChild(d->shape);
 
81
        d->shapeParent->removeShape(d->shape);
82
82
    d->deleteShape = true;
83
83
}