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

refactor NodeInstanceMetaObject

Browse Source 
Reduce the use of NodeInstanceMetaObject in QtQuickDesigner code
to two static methods:
 - registerNodeInstanceMetaObject
 - createNewDynamicProperty

Change-Id: I0ef8ee96995184e968467b799147c6b4c80fbccc
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Tim Jenssen
2015-05-18 14:43:44 +02:00
committed by Thomas Hartmann
parent 8409c6a724
commit 3c9efc3e72
8 changed files with 30 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
+2 -18
View File
@@ -31,6 +31,7 @@
#include "objectnodeinstance.h"
#include <enumeration.h>
#include <nodeinstancemetaobject.h>
#include <QEvent>
#include <QQmlContext>
@@ -106,7 +107,6 @@ namespace Internal {
ObjectNodeInstance::ObjectNodeInstance(QObject *object)
: m_object(object),
m_metaObject(0),
m_instanceId(-1),
m_deleteHeldInstance(true),
m_isInLayoutable(false)
@@ -145,7 +145,6 @@ void ObjectNodeInstance::destroy()
}
}
m_metaObject = 0;
m_instanceId = -1;
}
@@ -171,14 +170,9 @@ void ObjectNodeInstance::setNodeInstanceServer(NodeInstanceServer *server)
m_nodeInstanceServer = server;
}
void ObjectNodeInstance::initializePropertyWatcher(const ObjectNodeInstance::Pointer &objectNodeInstance)
{
m_metaObject = NodeInstanceMetaObject::createNodeInstanceMetaObject(objectNodeInstance);
}
void ObjectNodeInstance::initialize(const ObjectNodeInstance::Pointer &objectNodeInstance)
{
initializePropertyWatcher(objectNodeInstance);
NodeInstanceMetaObject::registerNodeInstanceMetaObject(objectNodeInstance);
}
void ObjectNodeInstance::setId(const QString &id)
@@ -1402,16 +1396,6 @@ int ObjectNodeInstance::penWidth() const
return 0;
}
void ObjectNodeInstance::createDynamicProperty(const QString &name, const QString &/*typeName*/)
{
if (m_metaObject == 0) {
qWarning() << "ObjectNodeInstance.createDynamicProperty: No Metaobject.";
return;
}
m_metaObject->createNewProperty(name);
}
bool ObjectNodeInstance::updateStateVariant(const ObjectNodeInstance::Pointer &/*target*/, const PropertyName &/*propertyName*/, const QVariant &/*value*/)
{
return false;