diff options
| author | Marco Bubke <marco.bubke@nokia.com> | 2010-12-01 17:48:14 +0100 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@nokia.com> | 2010-12-01 18:28:30 +0100 |
| commit | 80d0b18f17409bfef76ab55f226d77ba58b9c688 (patch) | |
| tree | 01cf0c1b16cd8f0202a05831777f641d5c7fc201 /src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp | |
| parent | a91d137d00c89972669ebb4263d085fe6fcb8294 (diff) | |
QmlDesigner.NodeInstances: Use internalId for instanceId
Diffstat (limited to 'src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp index d9cd5636e1..d15272c124 100644 --- a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp +++ b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp @@ -12,8 +12,7 @@ class ProxyNodeInstanceData { public: ProxyNodeInstanceData() - : instanceId(-1), - parentInstanceId(-1), + : parentInstanceId(-1), penWidth(1), isAnchoredBySibling(false), isAnchoredByChildren(false), @@ -23,7 +22,6 @@ public: isInPositioner(false) {} - qint32 instanceId; qint32 parentInstanceId; ModelNode modelNode; QRectF boundingRect; @@ -58,12 +56,11 @@ NodeInstance::NodeInstance(ProxyNodeInstanceData *dPointer) { } -NodeInstance NodeInstance::create(const ModelNode &node, qint32 instanceId) +NodeInstance NodeInstance::create(const ModelNode &node) { ProxyNodeInstanceData *d = new ProxyNodeInstanceData; d->modelNode = node; - d->instanceId = instanceId; return NodeInstance(d); } @@ -95,7 +92,7 @@ ModelNode NodeInstance::modelNode() const qint32 NodeInstance::instanceId() const { if (d) { - return d->instanceId; + return d->modelNode.internalId(); } else { return -1; } @@ -109,7 +106,7 @@ bool NodeInstance::isValid() const void NodeInstance::makeInvalid() { if (d) - d->instanceId = -1; + d->modelNode = ModelNode(); } QRectF NodeInstance::boundingRect() const |