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

QmlDesigner.NodeInstances: Fix id getter

Browse Source 
Add getter for id in node instances.
This commit is contained in:
Thomas Hartmann
2010-09-23 15:57:28 +02:00
parent 1a9bd5b140
commit 48ff3f7a29
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/designercore/include/nodeinstance.h
View File

@@ -141,6 +141,8 @@ public:
static void registerDeclarativeTypes(); static void registerDeclarativeTypes();
QString id() const;
#ifdef QTCREATOR_TEST #ifdef QTCREATOR_TEST
QObject* testHandle() const; QObject* testHandle() const;
Internal::ObjectNodeInstance* internalInstance() const; Internal::ObjectNodeInstance* internalInstance() const;

5
src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
View File

@@ -644,6 +644,11 @@ void NodeInstance::registerDeclarativeTypes()
// qmlRegisterType<QmlDesigner::Internal::QmlPropertyChangesObject>(); // qmlRegisterType<QmlDesigner::Internal::QmlPropertyChangesObject>();
} }
QString NodeInstance::id() const
{
return m_nodeInstance->id();
}
#ifdef QTCREATOR_TEST #ifdef QTCREATOR_TEST
QObject* NodeInstance::testHandle() const QObject* NodeInstance::testHandle() const
{ {

4
src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
View File

@@ -699,8 +699,8 @@ void NodeInstanceView::removeIdFromContext(QObject *object)
{ {
if (hasInstanceForObject(object)) { if (hasInstanceForObject(object)) {
NodeInstance instance = instanceForObject(object); NodeInstance instance = instanceForObject(object);
if (instance.internalInstance()) { if (instance.isValid()) {
QString id = instance.internalInstance()->id(); QString id = instance.id();
if (!id.isEmpty()) if (!id.isEmpty())
engine()->rootContext()->setContextProperty(id, 0); engine()->rootContext()->setContextProperty(id, 0);
} }