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

QmlDesigner.Instances: use TypeName instead of QString

Browse Source 
A dynamicTypeName has to be always latin1 so we should use TypeName
instead of QString.

Change-Id: I06c945aa61f677788285cbc8ff8f5811f6c61b0b
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
Thomas Hartmann
2015-02-13 10:11:39 +01:00
committed by Thomas Hartmann
parent 17bbb4eb8c
commit 83e128ec79
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.cpp
+2 -2
View File
@@ -39,7 +39,7 @@ PropertyAbstractContainer::PropertyAbstractContainer()
{
}
PropertyAbstractContainer::PropertyAbstractContainer(qint32 instanceId, const PropertyName &name, const QString &dynamicTypeName)
PropertyAbstractContainer::PropertyAbstractContainer(qint32 instanceId, const PropertyName &name, const TypeName &dynamicTypeName)
: m_instanceId(instanceId),
m_name(name),
m_dynamicTypeName(dynamicTypeName)
@@ -61,7 +61,7 @@ bool PropertyAbstractContainer::isDynamic() const
return !m_dynamicTypeName.isEmpty();
}
QString PropertyAbstractContainer::dynamicTypeName() const
TypeName PropertyAbstractContainer::dynamicTypeName() const
{
return m_dynamicTypeName;
}
share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.h
+3 -3
View File
@@ -52,17 +52,17 @@ class PropertyAbstractContainer
friend QDebug operator <<(QDebug debug, const PropertyAbstractContainer &container);
public:
PropertyAbstractContainer();
PropertyAbstractContainer(qint32 instanceId, const PropertyName &name, const QString &dynamicTypeName);
PropertyAbstractContainer(qint32 instanceId, const PropertyName &name, const TypeName &dynamicTypeName);
qint32 instanceId() const;
PropertyName name() const;
bool isDynamic() const;
QString dynamicTypeName() const;
TypeName dynamicTypeName() const;
private:
qint32 m_instanceId;
PropertyName m_name;
QString m_dynamicTypeName;
TypeName m_dynamicTypeName;
};
QDebug operator <<(QDebug debug, const PropertyAbstractContainer &container);