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

QmlDesigner: remove unnecessary spaces/lines

Browse Source 
Change-Id: I867ab5afc82e67644b7004e97886b46250f5d3df
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Tim Jenssen
2014-10-09 13:28:32 +02:00
parent 80bc7f79bc
commit 0ecc1114bd
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.h
View File

@@ -84,7 +84,7 @@ private:
ObjectNodeInstanceWeakPointer m_nodeInstance;
PropertyName m_prefix;
QPointer<QQmlContext> m_context;
QPointer<QQmlContext> m_context;
QQmlOpenMetaObjectType *m_type;
QScopedPointer<MetaPropertyData> m_data;
//QAbstractDynamicMetaObject *m_parent;

4
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
View File

@@ -120,7 +120,7 @@ NodeInstanceServer::~NodeInstanceServer()
{
}
QList<ServerNodeInstance> NodeInstanceServer::createInstances(const QVector<InstanceContainer> &containerVector)
QList<ServerNodeInstance> NodeInstanceServer::createInstances(const QVector<InstanceContainer> &containerVector)
{
Q_ASSERT(declarativeView() || quickView());
QList<ServerNodeInstance> instanceList;
@@ -487,7 +487,7 @@ void NodeInstanceServer::setupDefaultDummyData()
refreshBindings();
}
QList<ServerNodeInstance> NodeInstanceServer::setupInstances(const CreateSceneCommand &command)
QList<ServerNodeInstance> NodeInstanceServer::setupInstances(const CreateSceneCommand &command)
{
QList<ServerNodeInstance> instanceList = createInstances(command.instances());

11
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
View File

@@ -961,7 +961,6 @@ void tweakObjects(QObject *object)
QObject *ObjectNodeInstance::createComponentWrap(const QString &nodeSource, const QByteArray &importCode, QQmlContext *context)
{
ComponentCompleteDisabler disableComponentComplete;
Q_UNUSED(disableComponentComplete)
QQmlComponent *component = new QQmlComponent(context->engine());
@@ -969,18 +968,14 @@ QObject *ObjectNodeInstance::createComponentWrap(const QString &nodeSource, cons
QByteArray data(nodeSource.toUtf8());
data.prepend(importCode);
component->setData(data, context->baseUrl().resolved(QUrl("createComponent.qml")));
QObject *object = component;
tweakObjects(object);
QQmlEngine::setContextForObject(object, context);
QQmlEngine::setObjectOwnership(object, QQmlEngine::CppOwnership);
return object;
}
//The component might also be shipped with Creator.
//To avoid trouble with import "." we use the component shipped with Creator.
static inline QString fixComponentPathForIncompatibleQt(const QString &componentPath)
@@ -1034,12 +1029,11 @@ QObject *ObjectNodeInstance::createComponent(const QString &componentPath, QQmlC
QObject *ObjectNodeInstance::createComponent(const QUrl &componentUrl, QQmlContext *context)
{
ComponentCompleteDisabler disableComponentComplete;
Q_UNUSED(disableComponentComplete)
QQmlComponent component(context->engine(), componentUrl);
QObject *object = component.beginCreate(context);
QObject *object = component.beginCreate(context);
tweakObjects(object);
component.completeCreate();
@@ -1057,7 +1051,6 @@ QObject *ObjectNodeInstance::createComponent(const QUrl &componentUrl, QQmlConte
QObject *ObjectNodeInstance::createCustomParserObject(const QString &nodeSource, const QByteArray &importCode, QQmlContext *context)
{
ComponentCompleteDisabler disableComponentComplete;
Q_UNUSED(disableComponentComplete)
QQmlComponent component(context->engine());
@@ -1065,11 +1058,9 @@ QObject *ObjectNodeInstance::createCustomParserObject(const QString &nodeSource,
QByteArray data(nodeSource.toUtf8());
data.prepend(importCode);
component.setData(data, context->baseUrl().resolved(QUrl("createCustomParserObject.qml")));
QObject *object = component.beginCreate(context);
tweakObjects(object);
component.completeCreate();
QQmlEngine::setObjectOwnership(object, QQmlEngine::CppOwnership);
return object;