From d54be468ca69036f2ea595eaba6bdbb4a687e431 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Tue, 23 Jul 2013 15:56:22 +0200
Subject: [PATCH] QmlDesigner: Make AbstractView parameter const
Otherwise we can not past a const AbstractView in a const method.
Change-Id: I59dab8b6c5cfb3a3b56bd13f61d237a8a94df3b0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
---
src/plugins/qmldesigner/designercore/include/modelnode.h | 2 +-
src/plugins/qmldesigner/designercore/model/modelnode.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h
index b57c765930d..9dfbaa5851f 100644
--- a/src/plugins/qmldesigner/designercore/include/modelnode.h
+++ b/src/plugins/qmldesigner/designercore/include/modelnode.h
@@ -90,7 +90,7 @@ public:
};
ModelNode();
- ModelNode(const Internal::InternalNodePointer &internalNode, Model *model, AbstractView *view);
+ ModelNode(const Internal::InternalNodePointer &internalNode, Model *model, const AbstractView *view);
ModelNode(const ModelNode modelNode, AbstractView *view);
ModelNode(const ModelNode &other);
~ModelNode();
diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
index 4c232c7bfba..932be459c47 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
@@ -77,10 +77,10 @@ All the manipulation functions are generating undo commands internally.
/*! \brief internal constructor
*/
-ModelNode::ModelNode(const InternalNodePointer &internalNode, Model *model, AbstractView *view):
+ModelNode::ModelNode(const InternalNodePointer &internalNode, Model *model, const AbstractView *view):
m_internalNode(internalNode),
m_model(model),
- m_view(view)
+ m_view(const_cast<AbstractView*>(view))
{
Q_ASSERT(!m_model || m_view);
}
--
GitLab