[Kst] branches/work/kst/portto4/kst/src/libkstapp

[Peter Kümmel]

SVN commit 1182522 by kuemmel:

rename maybeReparent into updateViewItemParent

 M  +1 -1      circleitem.cpp  
 M  +1 -1      labelitem.cpp  
 M  +1 -1      lineitem.cpp  
 M  +1 -1      plotrenderitem.cpp  
 M  +1 -1      plotrenderitem.h  
 M  +7 -7      viewitem.cpp  
 M  +1 -1      viewitem.h  


--- branches/work/kst/portto4/kst/src/libkstapp/circleitem.cpp #1182521:1182522
@@ -79,7 +79,7 @@
     parentView()->disconnect(this, SLOT(deleteLater())); //Don't delete ourself
     parentView()->disconnect(this, SLOT(creationPolygonChanged(View::CreationEvent)));
     parentView()->setMouseMode(View::Default);
-    maybeReparent();
+    updateViewItemParent();
     emit creationComplete();
     return;
   }
--- branches/work/kst/portto4/kst/src/libkstapp/labelitem.cpp #1182521:1182522
@@ -181,7 +181,7 @@
     parentView()->disconnect(this, SLOT(deleteLater())); //Don't delete ourself
     parentView()->disconnect(this, SLOT(creationPolygonChanged(View::CreationEvent)));
     parentView()->setMouseMode(View::Default);
-    maybeReparent();
+    updateViewItemParent();
     emit creationComplete();
     setDirty();
     return;
--- branches/work/kst/portto4/kst/src/libkstapp/lineitem.cpp #1182521:1182522
@@ -149,7 +149,7 @@
     parentView()->disconnect(this, SLOT(deleteLater())); //Don't delete ourself
     parentView()->disconnect(this, SLOT(creationPolygonChanged(View::CreationEvent)));
     parentView()->setMouseMode(View::Default);
-    maybeReparent();
+    updateViewItemParent();
     _created = true;
     emit creationComplete();
     return;
--- branches/work/kst/portto4/kst/src/libkstapp/plotrenderitem.cpp #1182521:1182522
@@ -696,7 +696,7 @@
 }
 
 
-bool PlotRenderItem::maybeReparent() {
+bool PlotRenderItem::updateViewItemParent() {
   return false; //never reparent a plot renderer
 }
 
--- branches/work/kst/portto4/kst/src/libkstapp/plotrenderitem.h #1182521:1182522
@@ -95,7 +95,7 @@
     virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
 
     virtual QPainterPath shape() const;
-    virtual bool maybeReparent();
+    virtual bool updateViewItemParent();
 
   private Q_SLOTS:
     void updateGeometry();
--- branches/work/kst/portto4/kst/src/libkstapp/viewitem.cpp #1182521:1182522
@@ -893,7 +893,7 @@
     parentView()->disconnect(this, SLOT(creationPolygonChanged(View::CreationEvent)));
     parentView()->setMouseMode(View::Default);
 
-    maybeReparent();
+    updateViewItemParent();
     _creationState = Completed;
     setZValue(1);
     emit creationComplete();
@@ -1413,7 +1413,7 @@
 }
 
 
-bool ViewItem::maybeReparent() {
+bool ViewItem::updateViewItemParent() {
   if (lockParent() || skipNextParentCheck()) {
     setSkipNextParentCheck(false);
     return false;
@@ -1425,7 +1425,7 @@
   QPointF origin = mapToScene(QPointF(0,0));
 
 #if DEBUG_REPARENT
-  qDebug() << "maybeReparent" << this
+  qDebug() << "updateViewItemParent" << this
            << "topLevel:" << (topLevel ? "true" : "false")
            << "origin:" << origin
            << "rect:" << rect()
@@ -1816,7 +1816,7 @@
 {
   setPos(parentView()->snapPoint(pos));
   new MoveCommand(this, _originalPosition, pos);
-  maybeReparent();
+  updateViewItemParent();
   updateRelativeSize();
 }
 
@@ -1835,15 +1835,15 @@
   } else if (oldMode == View::Resize && _originalRect != rect()) {
     new ResizeCommand(this, _originalRect, rect());
 
-    maybeReparent();
+    updateViewItemParent();
   } else if (oldMode == View::Scale && _originalTransform != transform()) {
     new ScaleCommand(this, _originalTransform, transform());
 
-    maybeReparent();
+    updateViewItemParent();
   } else if (oldMode == View::Rotate && _originalTransform != transform()) {
     new RotateCommand(this, _originalTransform, transform());
 
-    maybeReparent();
+    updateViewItemParent();
   }
 }
 
--- branches/work/kst/portto4/kst/src/libkstapp/viewitem.h #1182521:1182522
@@ -248,7 +248,7 @@
     bool transformToRect(const QPolygonF &from, const QPolygonF &to);
     void rotateTowards(const QPointF &corner, const QPointF &point);
     QPointF lockOffset(const QPointF &offset, qreal ratio, bool oddCorner) const;
-    virtual bool maybeReparent();
+    virtual bool updateViewItemParent();
     GripMode nextGripMode(GripMode currentMode) const;
     void addTitle(QMenu *menu) const;
     void registerShortcut(QAction *action);