OSDN Git Service

QmlDesigner.model: refactoring for nodeSource
authorThomas Hartmann <Thomas.Hartmann@nokia.com>
Wed, 8 Jun 2011 15:02:03 +0000 (17:02 +0200)
committerMarco Bubke <marco.bubke@nokia.com>
Wed, 8 Jun 2011 15:53:11 +0000 (17:53 +0200)
commit7939c270bd2e1c0e06533048dc207dbe17d25450
treebfe4c363b5c3756252d668ccbdf947e44f84fc5c
parent3d784b84ebef67a1525a0fd44f484ca68205b83c
QmlDesigner.model: refactoring for nodeSource

I changed customParserSource into nodeSource and use it also for
components. This means we do not use auxiliaryData anymore with some magic
__component_data identifier.
To distinguish between CustumParserSource and ComponentSource I introduced
the enum NodeSourceType.
Also in this patch I added auxiliaryData in the creation of a node. This was useful
for prototyping and will help with prototyping/testing in the future.

Change-Id: I2152c26c0c767f869f7dce7209abf43f594fd2ad
Reviewed-on: http://codereview.qt.nokia.com/399
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
49 files changed:
src/plugins/qmldesigner/components/integration/componentview.cpp
src/plugins/qmldesigner/components/integration/componentview.h
src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp
src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.h
src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.cpp
src/plugins/qmldesigner/components/itemlibrary/itemlibraryview.h
src/plugins/qmldesigner/components/navigator/navigatorview.cpp
src/plugins/qmldesigner/components/navigator/navigatorview.h
src/plugins/qmldesigner/designercore/designercore.pri
src/plugins/qmldesigner/designercore/include/abstractview.h
src/plugins/qmldesigner/designercore/include/modelnode.h
src/plugins/qmldesigner/designercore/include/nodeinstanceserverinterface.h
src/plugins/qmldesigner/designercore/include/nodeinstanceview.h
src/plugins/qmldesigner/designercore/include/qmlmodelview.h
src/plugins/qmldesigner/designercore/include/rewriterview.h
src/plugins/qmldesigner/designercore/instances/changenodesourcecommand.cpp [moved from src/plugins/qmldesigner/designercore/instances/changecustomparsersourcecommand.cpp with 67% similarity]
src/plugins/qmldesigner/designercore/instances/changenodesourcecommand.h [moved from src/plugins/qmldesigner/designercore/instances/changecustomparsersourcecommand.h with 67% similarity]
src/plugins/qmldesigner/designercore/instances/componentnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/componentnodeinstance.h
src/plugins/qmldesigner/designercore/instances/createscenecommand.cpp
src/plugins/qmldesigner/designercore/instances/createscenecommand.h
src/plugins/qmldesigner/designercore/instances/instancecontainer.cpp
src/plugins/qmldesigner/designercore/instances/instancecontainer.h
src/plugins/qmldesigner/designercore/instances/instances.pri
src/plugins/qmldesigner/designercore/instances/nodeinstanceclientproxy.cpp
src/plugins/qmldesigner/designercore/instances/nodeinstanceclientproxy.h
src/plugins/qmldesigner/designercore/instances/nodeinstanceserver.cpp
src/plugins/qmldesigner/designercore/instances/nodeinstanceserver.h
src/plugins/qmldesigner/designercore/instances/nodeinstanceserverinterface.cpp
src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.h
src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
src/plugins/qmldesigner/designercore/instances/objectnodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/objectnodeinstance.h
src/plugins/qmldesigner/designercore/instances/servernodeinstance.cpp
src/plugins/qmldesigner/designercore/instances/servernodeinstance.h
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
src/plugins/qmldesigner/designercore/model/abstractview.cpp
src/plugins/qmldesigner/designercore/model/internalnode.cpp
src/plugins/qmldesigner/designercore/model/internalnode_p.h
src/plugins/qmldesigner/designercore/model/model.cpp
src/plugins/qmldesigner/designercore/model/model_p.h
src/plugins/qmldesigner/designercore/model/modelnode.cpp
src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp
src/plugins/qmldesigner/designercore/model/rewriterview.cpp
src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
src/plugins/qmldesigner/designercore/model/texttomodelmerger.h
src/plugins/qmldesigner/designercore/model/viewlogger.cpp
src/plugins/qmldesigner/designercore/model/viewlogger.h