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

QmlDesigner.Instances: fix delemiting of type names

Browse Source 
Import are delemited with a "." and there is a "/" between
import and type.

e.g.: QtQuick.Layout/QQuickLayout

Change-Id: I7750b333296cceef99992610cca126530f777777
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
This commit is contained in:
Thomas Hartmann
2013-04-19 19:42:25 +02:00
parent 06cfc22fe2
commit 7076272bf5
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
share/qtcreator/qml/qmlpuppet/container/instancecontainer.cpp
View File

@@ -33,16 +33,25 @@
namespace QmlDesigner { namespace QmlDesigner {
static TypeName properDelemitingOfType(const TypeName &typeName)
{
TypeName convertedTypeName = typeName;
int lastIndex = typeName.lastIndexOf('.');
if (lastIndex > 0)
convertedTypeName[lastIndex] = '/';
return convertedTypeName;
}
InstanceContainer::InstanceContainer() InstanceContainer::InstanceContainer()
: m_instanceId(-1), m_majorNumber(-1), m_minorNumber(-1) : m_instanceId(-1), m_majorNumber(-1), m_minorNumber(-1)
{ {
} }
InstanceContainer::InstanceContainer(qint32 instanceId, const TypeName &type, int majorNumber, int minorNumber, const QString &componentPath, const QString &nodeSource, NodeSourceType nodeSourceType, NodeMetaType metaType) InstanceContainer::InstanceContainer(qint32 instanceId, const TypeName &type, int majorNumber, int minorNumber, const QString &componentPath, const QString &nodeSource, NodeSourceType nodeSourceType, NodeMetaType metaType)
: m_instanceId(instanceId), m_type(type), m_majorNumber(majorNumber), m_minorNumber(minorNumber), m_componentPath(componentPath), : m_instanceId(instanceId), m_type(properDelemitingOfType(type)), m_majorNumber(majorNumber), m_minorNumber(minorNumber), m_componentPath(componentPath),
m_nodeSource(nodeSource), m_nodeSourceType(nodeSourceType), m_metaType(metaType) m_nodeSource(nodeSource), m_nodeSourceType(nodeSourceType), m_metaType(metaType)
{ {
m_type.replace('.', '/');
} }
qint32 InstanceContainer::instanceId() const qint32 InstanceContainer::instanceId() const