[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/krita/ui
From:       Dmitry Kazakov <dimula73 () gmail ! com>
Date:       2010-10-23 20:53:13
Message-ID: 20101023205313.A8C7CAC89A () svn ! kde ! org
[Download RAW message or body]

SVN commit 1189047 by dkazakov:

Deprecated KisShapeLayer::add/removeChild methods

Now KisShapeLayer uses his own container model so it is not needed
anymore.
TODO:port KisShapeSelection and KisNodeShape as well.


 M  +1 -1      flake/kis_shape_controller.cpp  
 M  +3 -31     flake/kis_shape_layer.cc  
 M  +0 -4      flake/kis_shape_layer.h  
 M  +1 -1      flake/kis_shape_layer_paste.h  
 M  +1 -1      tests/util.h  


--- trunk/koffice/krita/ui/flake/kis_shape_controller.cpp #1189046:1189047
@@ -233,7 +233,7 @@
             canvas->view()->nodeManager()->activateNode(shapeLayer);
         }
 
-        shapeLayer->addChild(shape);
+        shapeLayer->addShape(shape);
     }
 
     m_d->doc->setModified(true);
--- trunk/koffice/krita/ui/flake/kis_shape_layer.cc #1189046:1189047
@@ -85,19 +85,17 @@
     ShapeLayerContainerModel(KisShapeLayer *parent) : q(parent) {}
 
     void add(KoShape *child) {
-        QRect updatedRect = \
q->converter()->documentToView(child->boundingRect()).toRect(); +        // QRect \
updatedRect = q->converter()->documentToView(child->boundingRect()).toRect();  
         SimpleShapeContainerModel::add(child);
         q->shapeManager()->addShape(child);
-        q->setDirty(updatedRect);
     }
 
     void remove(KoShape *child) {
-        QRect updatedRect = \
q->converter()->documentToView(child->boundingRect()).toRect(); +        // QRect \
updatedRect = q->converter()->documentToView(child->boundingRect()).toRect();  
         q->shapeManager()->remove(child);
         SimpleShapeContainerModel::remove(child);
-        q->setDirty(updatedRect);
     }
 
 private:
@@ -135,8 +133,6 @@
         , KoShapeLayer(new ShapeLayerContainerModel(this)) //no _rhs here otherwise \
both layer have the same KoShapeContainerModel  , m_d(new Private())
 {
-    kDebug() << "copying rhs" << &_rhs << "to" << this;
-
     KoShapeContainer::setParent(_rhs.KoShapeContainer::parent());
     initShapeLayer(_rhs.m_d->controller);
 
@@ -150,10 +146,7 @@
     KisShapeLayerShapePaste paste(this, m_d->controller);
     bool success = paste.paste(KoOdf::Text, mimeData);
     Q_ASSERT(success);
-    if (!success) {
-        warnUI << "Could not paste shape layer";
     }
-}
 
 KisShapeLayer::~KisShapeLayer()
 {
@@ -192,27 +185,6 @@
     return node->inherits("KisMask");
 }
 
-void KisShapeLayer::addChild(KoShape *object, bool update)
-{
-    KoShapeLayer::addShape(object);
-    m_d->canvas->shapeManager()->addShape(object);
-
-    if (update) {
-        QRect updatedRect = \
                m_d->converter->documentToView(object->boundingRect()).toRect();   
-        setDirty(updatedRect);
-    }
-}
-
-void KisShapeLayer::removeChild(KoShape *object)
-{
-    QRect updatedRect = \
                m_d->converter->documentToView(object->boundingRect()).toRect();
-
-    m_d->canvas->shapeManager()->remove(object);
-    KoShapeLayer::removeShape(object);
-
-    setDirty(updatedRect);
-}
-
 QIcon KisShapeLayer::icon() const
 {
     return KIcon("bookmark-new");
@@ -452,7 +424,7 @@
     forEachElement(child, page) {
         KoShape * shape = KoShapeRegistry::instance()->createShapeFromOdf(child, \
shapeContext);  if (shape) {
-            addChild(shape);
+            addShape(shape);
         }
     }
 
--- trunk/koffice/krita/ui/flake/kis_shape_layer.h #1189046:1189047
@@ -73,10 +73,6 @@
         return false;
     }
 
-    // KoShapeContainer overrides
-    void addChild(KoShape *object, bool update = true);
-    void removeChild(KoShape *object);
-
     // KisExternalLayer implementation
     QIcon icon() const;
 
--- trunk/koffice/krita/ui/flake/kis_shape_layer_paste.h #1189046:1189047
@@ -47,7 +47,7 @@
                 KisShapeLayer* shapeLayer = \
dynamic_cast<KisShapeLayer*>(m_container);  if (shapeLayer) {
                     //don't update as the setDirty call would create shared pointer \
                that would delete the layer
-                    shapeLayer->addChild(shape, false);
+                    shapeLayer->addShape(shape);
                 } else {
                     KisShapeSelection* shapeSelection = \
dynamic_cast<KisShapeSelection*>(m_container);  shapeSelection->addChild(shape);
--- trunk/koffice/krita/ui/tests/util.h #1189046:1189047
@@ -146,7 +146,7 @@
     path->close();
     path->normalize();
     KisShapeLayerSP shapeLayer = new KisShapeLayer(parentContainer, \
                doc->shapeController(), image, "shapeLayer1", 75);
-    shapeLayer->addChild(path);
+    shapeLayer->addShape(path);
     image->addNode(shapeLayer, group1);
     image->addNode(adjustmentLayer2, group1);
 


[prev in list] [next in list] [prev in thread] [next in thread]