feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Use internalId instead of ModelNode in ComponentView

Browse Source 
Change-Id: I63e81291bf909bff95d9f11f62fd79f321589ebd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-09-25 18:08:50 +02:00
parent d3995c38f2
commit 5920203a48
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmldesigner/components/integration/componentview.cpp
View File

@@ -60,7 +60,7 @@ ModelNode ComponentView::modelNode(int index) const
{ {
if (m_standardItemModel->hasIndex(index, 0)) { if (m_standardItemModel->hasIndex(index, 0)) {
QStandardItem *item = m_standardItemModel->item(index, 0); QStandardItem *item = m_standardItemModel->item(index, 0);
return item->data(ModelNodeRole).value<ModelNode>(); return modelNodeForInternalId(qint32(item->data(ModelNodeRole).toInt()));
} }
return ModelNode(); return ModelNode();
@@ -74,7 +74,7 @@ void ComponentView::setComponentNode(const ModelNode &node)
void ComponentView::removeSingleNodeFromList(const ModelNode &node) void ComponentView::removeSingleNodeFromList(const ModelNode &node)
{ {
for (int row = 0; row < m_standardItemModel->rowCount(); row++) { for (int row = 0; row < m_standardItemModel->rowCount(); row++) {
if (m_standardItemModel->item(row)->data(ModelNodeRole).value<ModelNode>() == node) if (m_standardItemModel->item(row)->data(ModelNodeRole).toInt() == node.internalId())
m_standardItemModel->removeRow(row); m_standardItemModel->removeRow(row);
} }
} }
@@ -83,7 +83,7 @@ void ComponentView::removeSingleNodeFromList(const ModelNode &node)
int ComponentView::indexForNode(const ModelNode &node) int ComponentView::indexForNode(const ModelNode &node)
{ {
for (int row = 0; row < m_standardItemModel->rowCount(); row++) { for (int row = 0; row < m_standardItemModel->rowCount(); row++) {
if (m_standardItemModel->item(row)->data(ModelNodeRole).value<ModelNode>() == node) if (m_standardItemModel->item(row)->data(ModelNodeRole).toInt() == node.internalId())
return row; return row;
} }
return -1; return -1;
@@ -133,7 +133,7 @@ void ComponentView::searchForComponentAndAddToList(const ModelNode &node)
if (node.nodeSourceType() == ModelNode::NodeWithComponentSource) { if (node.nodeSourceType() == ModelNode::NodeWithComponentSource) {
if (!node.id().isEmpty()) { if (!node.id().isEmpty()) {
QStandardItem *item = new QStandardItem(node.id()); QStandardItem *item = new QStandardItem(node.id());
item->setData(QVariant::fromValue(node), ModelNodeRole); item->setData(QVariant::fromValue(node.internalId()), ModelNodeRole);
item->setEditable(false); item->setEditable(false);
removeSingleNodeFromList(node); //remove node if already present removeSingleNodeFromList(node); //remove node if already present
m_standardItemModel->appendRow(item); m_standardItemModel->appendRow(item);
@@ -149,7 +149,7 @@ void ComponentView::searchForComponentAndAddToList(const ModelNode &node)
} }
description += node.parentProperty().name(); description += node.parentProperty().name();
QStandardItem *item = new QStandardItem(description); QStandardItem *item = new QStandardItem(description);
item->setData(QVariant::fromValue(node), ModelNodeRole); item->setData(QVariant::fromValue(node.internalId()), ModelNodeRole);
item->setEditable(false); item->setEditable(false);
removeSingleNodeFromList(node); //remove node if already present removeSingleNodeFromList(node); //remove node if already present
m_standardItemModel->appendRow(item); m_standardItemModel->appendRow(item);