diff options
author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2015-05-20 18:09:54 +0200 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2015-05-21 10:11:40 +0000 |
commit | 0321f6e1a73cc5a032f578754494aab0582ae946 (patch) | |
tree | 461728870c3c0fac60f40fc25949ccd7ca784285 /share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp | |
parent | 4a0a1a2b75203fc48e6a3e91c58bf84c3f6cf02e (diff) |
QmlPuppet: Clean up private API usage in ServerNodeInstance
Change-Id: Ic0890c8c6740ad2c4567b58ec9b51933d0293fc1
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp')
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp | 26 |
1 files changed, 4 insertions, 22 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp index e243527e99..1d548cb4c4 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp @@ -46,6 +46,8 @@ #include "nodeinstanceserver.h" #include "instancecontainer.h" +#include <qmlprivategate.h> + #include <QHash> #include <QSet> #include <QDebug> @@ -53,9 +55,6 @@ #include <QQmlEngine> -#include <private/qqmlmetatype_p.h> -#include <private/qqmlengine_p.h> - /*! \class QmlDesigner::NodeInstance \ingroup CoreInstance @@ -129,23 +128,7 @@ bool ServerNodeInstance::isRootNodeInstance() const bool ServerNodeInstance::isSubclassOf(QObject *object, const QByteArray &superTypeName) { - if (object == 0) - return false; - - const QMetaObject *metaObject = object->metaObject(); - - while (metaObject) { - QQmlType *qmlType = QQmlMetaType::qmlType(metaObject); - if (qmlType && qmlType->qmlTypeName() == superTypeName) // ignore version numbers - return true; - - if (metaObject->className() == superTypeName) - return true; - - metaObject = metaObject->superClass(); - } - - return false; + return Internal::QmlPrivateGate::isSubclassOf(object, superTypeName); } void ServerNodeInstance::setNodeSource(const QString &source) @@ -242,8 +225,7 @@ ServerNodeInstance ServerNodeInstance::create(NodeInstanceServer *nodeInstanceSe } } - - QQmlEnginePrivate::get(nodeInstanceServer->engine())->cache(object->metaObject()); + Internal::QmlPrivateGate::getPropertyCache(object, nodeInstanceServer->engine()); ServerNodeInstance instance(createInstance(object)); |