summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEduardo M. Fleury <eduardo.fleury@openbossa.org>2009-09-15 23:01:45 (GMT)
committerJan-Arve Sæther <jan-arve.saether@nokia.com>2009-09-17 11:58:13 (GMT)
commiteafa92ec86c61d6da6700f832de263829cb84dd3 (patch)
tree1110eeaaf5f839a3f251389ba584737720661588 /src
parentecb7f47897049014d2956396d5634e3d418bdcb9 (diff)
downloadQt-eafa92ec86c61d6da6700f832de263829cb84dd3.zip
Qt-eafa92ec86c61d6da6700f832de263829cb84dd3.tar.gz
Qt-eafa92ec86c61d6da6700f832de263829cb84dd3.tar.bz2
QGraphicsAnchorLayout: Remove QGALPrivate::deleteAnchorData()
This method, formerly called by the QGraphicsAnchor destructor, to remove the anchor associated to it, is no longer needed. That destructor now calls QGALPrivate::removeAnchor(), a method analagous to addAnchor(), that provides the high level feature of "anchor removal". Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Jesus Sanchez-Palencia <jesus.palencia@openbossa.org>
Diffstat (limited to 'src')
-rw-r--r--src/gui/graphicsview/qgraphicsanchorlayout_p.cpp13
-rw-r--r--src/gui/graphicsview/qgraphicsanchorlayout_p.h1
2 files changed, 1 insertions, 13 deletions
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
index f2eddde..b02adf4 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.cpp
@@ -59,7 +59,7 @@ QGraphicsAnchorPrivate::QGraphicsAnchorPrivate(int version)
QGraphicsAnchorPrivate::~QGraphicsAnchorPrivate()
{
- layoutPrivate->deleteAnchorData(data);
+ layoutPrivate->removeAnchor(data->from, data->to);
}
void QGraphicsAnchorPrivate::setSpacing(qreal value)
@@ -1277,17 +1277,6 @@ void QGraphicsAnchorLayoutPrivate::removeAnchor_helper(AnchorVertex *v1, AnchorV
\internal
Only called from outside. (calls invalidate())
*/
-void QGraphicsAnchorLayoutPrivate::deleteAnchorData(AnchorData *data)
-{
- Q_Q(QGraphicsAnchorLayout);
- removeAnchor_helper(data->from, data->to);
- q->invalidate();
-}
-
-/*!
- \internal
- Only called from outside. (calls invalidate())
-*/
void QGraphicsAnchorLayoutPrivate::setAnchorSize(AnchorData *data, const qreal *anchorSize)
{
Q_Q(QGraphicsAnchorLayout);
diff --git a/src/gui/graphicsview/qgraphicsanchorlayout_p.h b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
index 5a91baa..4d746bf 100644
--- a/src/gui/graphicsview/qgraphicsanchorlayout_p.h
+++ b/src/gui/graphicsview/qgraphicsanchorlayout_p.h
@@ -422,7 +422,6 @@ public:
void removeAnchor(AnchorVertex *firstVertex, AnchorVertex *secondVertex);
void removeAnchor_helper(AnchorVertex *v1, AnchorVertex *v2);
- void deleteAnchorData(AnchorData *data);
void setAnchorSize(AnchorData *data, const qreal *anchorSize);
void anchorSize(const AnchorData *data,
qreal *minSize = 0,