QmlDesigner: Type of the propertyname is now PropertyName

And PropertyName is a typedef for QByteArray. Because we don't use the
features of QString and the source would be cluttered with QLatin1Strings
we changed the property name to QByteArray.

Change-Id: Ib70ef136bbc411504b450456bd9bb705ae93dd25
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

share/qtcreator/qml/qmlpuppet/container/instancecontainer.cpp

@@ -38,11 +38,11 @@ InstanceContainer::InstanceContainer()
 {
 }
 
-InstanceContainer::InstanceContainer(qint32 instanceId, const QString &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_nodeSource(nodeSource), m_nodeSourceType(nodeSourceType), m_metaType(metaType)
 {
-    m_type.replace(QLatin1Char('.'), QLatin1Char('/'));
+    m_type.replace('.', '/');
 }
 
 qint32 InstanceContainer::instanceId() const
@@ -50,7 +50,7 @@ qint32 InstanceContainer::instanceId() const
     return m_instanceId;
 }
 
-QString InstanceContainer::type() const
+TypeName InstanceContainer::type() const
 {
     return m_type;
 }

share/qtcreator/qml/qmlpuppet/container/instancecontainer.h

@@ -34,6 +34,8 @@
 #include <QString>
 #include <QDataStream>
 
+#include "nodeinstanceglobal.h"
+
 namespace QmlDesigner {
 
 class InstanceContainer;
@@ -58,10 +60,10 @@ public:
     };
 
     InstanceContainer();
-    InstanceContainer(qint32 instanceId, const QString &type, int majorNumber, int minorNumber, const QString &componentPath, const QString &nodeSource, NodeSourceType nodeSourceType, NodeMetaType metaType);
+    InstanceContainer(qint32 instanceId, const TypeName &type, int majorNumber, int minorNumber, const QString &componentPath, const QString &nodeSource, NodeSourceType nodeSourceType, NodeMetaType metaType);
 
     qint32 instanceId() const;
-    QString type() const;
+    TypeName type() const;
     int majorNumber() const;
     int minorNumber() const;
     QString componentPath() const;
@@ -71,7 +73,7 @@ public:
 
 private:
     qint32 m_instanceId;
-    QString m_type;
+    TypeName m_type;
     qint32 m_majorNumber;
     qint32 m_minorNumber;
     QString m_componentPath;

share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.cpp

@@ -36,7 +36,7 @@ PropertyAbstractContainer::PropertyAbstractContainer()
 {
 }
 
-PropertyAbstractContainer::PropertyAbstractContainer(qint32 instanceId, const QString &name, const QString &dynamicTypeName)
+PropertyAbstractContainer::PropertyAbstractContainer(qint32 instanceId, const PropertyName &name, const QString &dynamicTypeName)
     : m_instanceId(instanceId),
     m_name(name),
     m_dynamicTypeName(dynamicTypeName)
@@ -48,7 +48,7 @@ qint32 PropertyAbstractContainer::instanceId() const
     return m_instanceId;
 }
 
-QString PropertyAbstractContainer::name() const
+PropertyName PropertyAbstractContainer::name() const
 {
     return m_name;
 }

share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.h

@@ -34,6 +34,7 @@
 #include <qmetatype.h>
 #include <QString>
 
+#include "nodeinstanceglobal.h"
 
 namespace QmlDesigner {
 
@@ -49,16 +50,16 @@ class PropertyAbstractContainer
     friend QDataStream &operator>>(QDataStream &in, PropertyAbstractContainer &container);
 public:
     PropertyAbstractContainer();
-    PropertyAbstractContainer(qint32 instanceId, const QString &name, const QString &dynamicTypeName);
+    PropertyAbstractContainer(qint32 instanceId, const PropertyName &name, const QString &dynamicTypeName);
 
     qint32 instanceId() const;
-    QString name() const;
+    PropertyName name() const;
     bool isDynamic() const;
     QString dynamicTypeName() const;
 
 private:
     qint32 m_instanceId;
-    QString m_name;
+    PropertyName m_name;
     QString m_dynamicTypeName;
 };
 

share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.cpp

@@ -37,7 +37,7 @@ PropertyBindingContainer::PropertyBindingContainer()
 {
 }
 
-PropertyBindingContainer::PropertyBindingContainer(qint32 instanceId, const QString &name, const QString &expression, const QString &dynamicTypeName)
+PropertyBindingContainer::PropertyBindingContainer(qint32 instanceId, const PropertyName &name, const QString &expression, const TypeName &dynamicTypeName)
     : m_instanceId(instanceId),
     m_name(name),
     m_expression(expression),
@@ -50,7 +50,7 @@ qint32 PropertyBindingContainer::instanceId() const
     return m_instanceId;
 }
 
-QString PropertyBindingContainer::name() const
+PropertyName PropertyBindingContainer::name() const
 {
     return m_name;
 }
@@ -65,7 +65,7 @@ bool PropertyBindingContainer::isDynamic() const
     return !m_dynamicTypeName.isEmpty();
 }
 
-QString PropertyBindingContainer::dynamicTypeName() const
+TypeName PropertyBindingContainer::dynamicTypeName() const
 {
     return m_dynamicTypeName;
 }

share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.h

@@ -34,6 +34,7 @@
 #include <qmetatype.h>
 #include <QString>
 
+#include "nodeinstanceglobal.h"
 
 namespace QmlDesigner {
 
@@ -43,19 +44,19 @@ class PropertyBindingContainer
 
 public:
     PropertyBindingContainer();
-    PropertyBindingContainer(qint32 instanceId, const QString &name, const QString &expression, const QString &dynamicTypeName);
+    PropertyBindingContainer(qint32 instanceId, const PropertyName &name, const QString &expression, const TypeName &dynamicTypeName);
 
     qint32 instanceId() const;
-    QString name() const;
+    PropertyName name() const;
     QString expression() const;
     bool isDynamic() const;
-    QString dynamicTypeName() const;
+    TypeName dynamicTypeName() const;
 
 private:
     qint32 m_instanceId;
-    QString m_name;
+    PropertyName m_name;
     QString m_expression;
-    QString m_dynamicTypeName;
+    TypeName m_dynamicTypeName;
 };
 
 QDataStream &operator<<(QDataStream &out, const PropertyBindingContainer &container);

share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.cpp

@@ -36,7 +36,7 @@ PropertyValueContainer::PropertyValueContainer()
 {
 }
 
-PropertyValueContainer::PropertyValueContainer(qint32 instanceId, const QString &name, const QVariant &value, const QString &dynamicTypeName)
+PropertyValueContainer::PropertyValueContainer(qint32 instanceId, const PropertyName &name, const QVariant &value, const TypeName &dynamicTypeName)
     : m_instanceId(instanceId),
     m_name(name),
     m_value(value),
@@ -49,7 +49,7 @@ qint32 PropertyValueContainer::instanceId() const
     return m_instanceId;
 }
 
-QString PropertyValueContainer::name() const
+PropertyName PropertyValueContainer::name() const
 {
     return m_name;
 }
@@ -64,7 +64,7 @@ bool PropertyValueContainer::isDynamic() const
     return !m_dynamicTypeName.isEmpty();
 }
 
-QString PropertyValueContainer::dynamicTypeName() const
+TypeName PropertyValueContainer::dynamicTypeName() const
 {
     return m_dynamicTypeName;
 }

share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.h

@@ -35,8 +35,9 @@
 #include <QVariant>
 #include <QString>
 
-namespace QmlDesigner {
+#include "nodeinstanceglobal.h"
 
+namespace QmlDesigner {
 
 class PropertyValueContainer
 {
@@ -44,19 +45,19 @@ class PropertyValueContainer
 
 public:
     PropertyValueContainer();
-    PropertyValueContainer(qint32 instanceId, const QString &name, const QVariant &value, const QString &dynamicTypeName);
+    PropertyValueContainer(qint32 instanceId, const PropertyName &name, const QVariant &value, const TypeName &dynamicTypeName);
 
     qint32 instanceId() const;
-    QString name() const;
+    PropertyName name() const;
     QVariant value() const;
     bool isDynamic() const;
-    QString dynamicTypeName() const;
+    TypeName dynamicTypeName() const;
 
 private:
     qint32 m_instanceId;
-    QString m_name;
+    PropertyName m_name;
     QVariant m_value;
-    QString m_dynamicTypeName;
+    TypeName m_dynamicTypeName;
 };
 
 QDataStream &operator<<(QDataStream &out, const PropertyValueContainer &container);

share/qtcreator/qml/qmlpuppet/container/reparentcontainer.cpp

@@ -42,9 +42,9 @@ ReparentContainer::ReparentContainer()
 
 ReparentContainer::ReparentContainer(qint32 instanceId,
                   qint32 oldParentInstanceId,
-                  const QString &oldParentProperty,
+                  const PropertyName &oldParentProperty,
                   qint32 newParentInstanceId,
-                  const QString &newParentProperty)
+                  const PropertyName &newParentProperty)
     : m_instanceId(instanceId),
     m_oldParentInstanceId(oldParentInstanceId),
     m_oldParentProperty(oldParentProperty),
@@ -63,7 +63,7 @@ qint32 ReparentContainer::oldParentInstanceId() const
     return m_oldParentInstanceId;
 }
 
-QString ReparentContainer::oldParentProperty() const
+PropertyName ReparentContainer::oldParentProperty() const
 {
     return m_oldParentProperty;
 }
@@ -73,7 +73,7 @@ qint32 ReparentContainer::newParentInstanceId() const
     return m_newParentInstanceId;
 }
 
-QString ReparentContainer::newParentProperty() const
+PropertyName ReparentContainer::newParentProperty() const
 {
     return m_newParentProperty;
 }

share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h

@@ -34,6 +34,8 @@
 #include <QString>
 #include <QDataStream>
 
+#include "nodeinstanceglobal.h"
+
 namespace QmlDesigner {
 
 class ReparentContainer
@@ -43,22 +45,22 @@ public:
     ReparentContainer();
     ReparentContainer(qint32 instanceId,
                       qint32 oldParentInstanceId,
-                      const QString &oldParentProperty,
+                      const PropertyName &oldParentProperty,
                       qint32 newParentInstanceId,
-                      const QString &newParentProperty);
+                      const PropertyName &newParentProperty);
 
     qint32 instanceId() const;
     qint32 oldParentInstanceId() const;
-    QString oldParentProperty() const;
+    PropertyName oldParentProperty() const;
     qint32 newParentInstanceId() const;
-    QString newParentProperty() const;
+    PropertyName newParentProperty() const;
 
 private:
     qint32 m_instanceId;
     qint32 m_oldParentInstanceId;
-    QString m_oldParentProperty;
+    PropertyName m_oldParentProperty;
     qint32 m_newParentInstanceId;
-    QString m_newParentProperty;
+    PropertyName m_newParentProperty;
 };
 
 QDataStream &operator<<(QDataStream &out, const ReparentContainer &container);

share/qtcreator/qml/qmlpuppet/interfaces/interfaces.pri

 INCLUDEPATH += $$PWD/
 
 HEADERS += $$PWD/nodeinstanceclientinterface.h
+HEADERS += $$PWD/interfaces/nodeinstanceglobal.h
 HEADERS += $$PWD/nodeinstanceserverinterface.h
 HEADERS += $$PWD/commondefines.h
 

share/qtcreator/qml/qmlpuppet/interfaces/nodeinstanceglobal.h

+#ifndef NODEINSTANCEGLOBAL_H
+#define NODEINSTANCEGLOBAL_H
+
+namespace QmlDesigner {
+
+typedef QByteArray PropertyName;
+typedef QList<PropertyName> PropertyNameList;
+typedef QByteArray TypeName;
+}
+
+#endif // NODEINSTANCEGLOBAL_H

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.cpp

@@ -55,7 +55,7 @@ BehaviorNodeInstance::Pointer BehaviorNodeInstance::create(QObject *object)
     return instance;
 }
 
-void BehaviorNodeInstance::setPropertyVariant(const QString &name, const QVariant &value)
+void BehaviorNodeInstance::setPropertyVariant(const PropertyName &name, const QVariant &value)
 {
     if (name == "enabled")
         return;
@@ -63,7 +63,7 @@ void BehaviorNodeInstance::setPropertyVariant(const QString &name, const QVarian
     ObjectNodeInstance::setPropertyVariant(name, value);
 }
 
-void BehaviorNodeInstance::setPropertyBinding(const QString &name, const QString &expression)
+void BehaviorNodeInstance::setPropertyBinding(const PropertyName &name, const QString &expression)
 {
     if (name == "enabled")
         return;
@@ -71,7 +71,7 @@ void BehaviorNodeInstance::setPropertyBinding(const QString &name, const QString
     ObjectNodeInstance::setPropertyBinding(name, expression);
 }
 
-QVariant BehaviorNodeInstance::property(const QString &name) const
+QVariant BehaviorNodeInstance::property(const PropertyName &name) const
 {
     if (name == "enabled")
         return QVariant::fromValue(m_isEnabled);
@@ -79,7 +79,7 @@ QVariant BehaviorNodeInstance::property(const QString &name) const
     return ObjectNodeInstance::property(name);
 }
 
-void BehaviorNodeInstance::resetProperty(const QString &name)
+void BehaviorNodeInstance::resetProperty(const PropertyName &name)
 {
     if (name == "enabled")
         m_isEnabled = true;

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h

@@ -45,12 +45,12 @@ public:
 
     static Pointer create(QObject *objectToBeWrapped);
 
-    void setPropertyVariant(const QString &name, const QVariant &value);
-    void setPropertyBinding(const QString &name, const QString &expression);
+    void setPropertyVariant(const PropertyName &name, const QVariant &value);
+    void setPropertyBinding(const PropertyName &name, const QString &expression);
 
 
-    QVariant property(const QString &name) const;
-    void resetProperty(const QString &name);
+    QVariant property(const PropertyName &name) const;
+    void resetProperty(const PropertyName &name);
 
 private:
     bool m_isEnabled;

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.cpp

@@ -120,7 +120,7 @@ NodeInstanceMetaObject *NodeInstanceMetaObject::createNodeInstanceMetaObject(con
     return new NodeInstanceMetaObject(nodeInstance, engine);
 }
 
-NodeInstanceMetaObject *NodeInstanceMetaObject::createNodeInstanceMetaObject(const ObjectNodeInstancePointer &nodeInstance, QObject *object, const QString &prefix, QQmlEngine *engine)
+NodeInstanceMetaObject *NodeInstanceMetaObject::createNodeInstanceMetaObject(const ObjectNodeInstancePointer &nodeInstance, QObject *object, const PropertyName &prefix, QQmlEngine *engine)
 {
     //Avoid setting up multiple NodeInstanceMetaObjects on the same QObject
     QObjectPrivate *op = QObjectPrivate::get(nodeInstance->object());
@@ -175,7 +175,7 @@ NodeInstanceMetaObject::NodeInstanceMetaObject(const ObjectNodeInstance::Pointer
 
 }
 
-NodeInstanceMetaObject::NodeInstanceMetaObject(const ObjectNodeInstancePointer &nodeInstance, QObject *object, const QString &prefix, QQmlEngine *engine)
+NodeInstanceMetaObject::NodeInstanceMetaObject(const ObjectNodeInstancePointer &nodeInstance, QObject *object, const PropertyName &prefix, QQmlEngine *engine)
     : QQmlVMEMetaObject(object, cacheForObject(object, engine), vMEMetaDataForObject(object)),
       m_nodeInstance(nodeInstance),
       m_prefix(prefix),
@@ -199,7 +199,7 @@ NodeInstanceMetaObject::~NodeInstanceMetaObject()
 
 void NodeInstanceMetaObject::createNewProperty(const QString &name)
 {
-    int id = createProperty(name.toLatin1(), 0);
+    int id = createProperty(name.toUtf8(), 0);
     setValue(id, QVariant());
     Q_ASSERT(id >= 0);
     Q_UNUSED(id);

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstancemetaobject.h

@@ -35,7 +35,10 @@
 #include <private/qqmlopenmetaobject_p.h>
 #include <private/qqmlvmemetaobject_p.h>
 
+#include "nodeinstanceglobal.h"
+
 namespace QmlDesigner {
+
 namespace Internal {
 
 class ObjectNodeInstance;
@@ -48,13 +51,13 @@ class NodeInstanceMetaObject : public QQmlVMEMetaObject
 {
 public:
     static NodeInstanceMetaObject *createNodeInstanceMetaObject(const ObjectNodeInstancePointer &nodeInstance, QQmlEngine *engine);
-    static NodeInstanceMetaObject *createNodeInstanceMetaObject(const ObjectNodeInstancePointer &nodeInstance, QObject *object, const QString &prefix, QQmlEngine *engine);
+    static NodeInstanceMetaObject *createNodeInstanceMetaObject(const ObjectNodeInstancePointer &nodeInstance, QObject *object, const PropertyName &prefix, QQmlEngine *engine);
     ~NodeInstanceMetaObject();
     void createNewProperty(const QString &name);
 
 protected:
     NodeInstanceMetaObject(const ObjectNodeInstancePointer &nodeInstance, QQmlEngine *engine);
-    NodeInstanceMetaObject(const ObjectNodeInstancePointer &nodeInstance, QObject *object, const QString &prefix, QQmlEngine *engine);
+    NodeInstanceMetaObject(const ObjectNodeInstancePointer &nodeInstance, QObject *object, const PropertyName &prefix, QQmlEngine *engine);
 
     int openMetaCall(QMetaObject::Call _c, int _id, void **_a);
     int metaCall(QMetaObject::Call _c, int _id, void **_a);
@@ -93,7 +96,7 @@ private:
     void init(QObject *, QQmlEngine *engine);
 
     ObjectNodeInstanceWeakPointer m_nodeInstance;
-    QString m_prefix;
+    PropertyName m_prefix;
     QPointer<QQmlContext>  m_context;
     QQmlOpenMetaObjectType *m_type;
     QScopedPointer<MetaPropertyData> m_data;

share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp

@@ -661,7 +661,7 @@ Internal::ChildrenChangeEventFilter *NodeInstanceServer::childrenChangeEventFilt
     return m_childrenChangeEventFilter.data();
 }
 
-void NodeInstanceServer::addFilePropertyToFileSystemWatcher(QObject *object, const QString &propertyName, const QString &path)
+void NodeInstanceServer::addFilePropertyToFileSystemWatcher(QObject *object, const PropertyName &propertyName, const QString &path)
 {
     if (!m_fileSystemWatcherHash.contains(path)) {
         m_fileSystemWatcherHash.insert(path, ObjectPropertyPair(object, propertyName));
@@ -669,7 +669,7 @@ void NodeInstanceServer::addFilePropertyToFileSystemWatcher(QObject *object, con
     }
 }
 
-void NodeInstanceServer::removeFilePropertyFromFileSystemWatcher(QObject *object, const QString &propertyName, const QString &path)
+void NodeInstanceServer::removeFilePropertyFromFileSystemWatcher(QObject *object, const PropertyName &propertyName, const QString &path)
 {
     if (m_fileSystemWatcherHash.contains(path)) {
         fileSystemWatcher()->removePath(path);
@@ -682,7 +682,7 @@ void NodeInstanceServer::refreshLocalFileProperty(const QString &path)
     if (m_fileSystemWatcherHash.contains(path)) {
         foreach (const ObjectPropertyPair &objectPropertyPair, m_fileSystemWatcherHash) {
             QObject *object = objectPropertyPair.first.data();
-            QString propertyName = objectPropertyPair.second;
+            PropertyName propertyName = objectPropertyPair.second;
 
             if (hasInstanceForObject(object)) {
                 instanceForObject(object).refreshProperty(propertyName);
@@ -734,7 +734,7 @@ void NodeInstanceServer::resetInstanceProperty(const PropertyAbstractContainer &
         ServerNodeInstance instance = instanceForId(propertyContainer.instanceId());
         Q_ASSERT(instance.isValid());
 
-        const QString name = propertyContainer.name();
+        const PropertyName name = propertyContainer.name();
 
         if (activeStateInstance().isValid() && !instance.isSubclassOf("QtQuick/PropertyChanges")) {
             bool statePropertyWasReseted = activeStateInstance().resetStateProperty(instance, name, instance.resetVariant(name));
@@ -755,7 +755,7 @@ void NodeInstanceServer::setInstancePropertyBinding(const PropertyBindingContain
     if (hasInstanceForId(bindingContainer.instanceId())) {
         ServerNodeInstance instance = instanceForId(bindingContainer.instanceId());
 
-        const QString name = bindingContainer.name();
+        const PropertyName name = bindingContainer.name();
         const QString expression = bindingContainer.expression();
 
 
@@ -789,7 +789,7 @@ void NodeInstanceServer::setInstancePropertyVariant(const PropertyValueContainer
         ServerNodeInstance instance = instanceForId(valueContainer.instanceId());
 
 
-        const QString name = valueContainer.name();
+        const PropertyName name = valueContainer.name();
         const QVariant value = valueContainer.value();
 
 
@@ -816,8 +816,8 @@ void NodeInstanceServer::setInstancePropertyVariant(const PropertyValueContainer
 void NodeInstanceServer::setInstanceAuxiliaryData(const PropertyValueContainer &auxiliaryContainer)
 {
     //instanceId() == 0: the item is root
-    if (auxiliaryContainer.instanceId() == 0 && (auxiliaryContainer.name() == QLatin1String("width") ||
-                                        auxiliaryContainer.name() == QLatin1String("height"))) {
+    if (auxiliaryContainer.instanceId() == 0 && (auxiliaryContainer.name() == "width" ||
+                                        auxiliaryContainer.name() == "height")) {
 
         if (!auxiliaryContainer.value().isNull()) {
             setInstancePropertyVariant(auxiliaryContainer);
@@ -825,8 +825,8 @@ void NodeInstanceServer::setInstanceAuxiliaryData(const PropertyValueContainer &
             rootNodeInstance().resetProperty(auxiliaryContainer.name());
         }
     }
-    if (auxiliaryContainer.name().endsWith(QLatin1String("@NodeInstance"))) {
-        QString propertyName = auxiliaryContainer.name().leftRef(auxiliaryContainer.name().count() - 12).toString();
+    if (auxiliaryContainer.name().endsWith("@NodeInstance")) {
+        PropertyName propertyName = auxiliaryContainer.name().left(auxiliaryContainer.name().count() - 12);
         if (!auxiliaryContainer.value().isNull()) {
             setInstancePropertyVariant(PropertyValueContainer(auxiliaryContainer.instanceId(),
                                                               propertyName,
@@ -897,51 +897,51 @@ static QVector<InformationContainer> createInformationVector(const QList<ServerN
         informationVector.append(InformationContainer(instance.instanceId(), IsAnchoredByChildren, instance.isAnchoredByChildren()));
         informationVector.append(InformationContainer(instance.instanceId(), IsAnchoredBySibling, instance.isAnchoredBySibling()));
 
-        informationVector.append(InformationContainer(instance.instanceId(), HasAnchor, QString("anchors.fill"), instance.hasAnchor("anchors.fill")));
-        informationVector.append(InformationContainer(instance.instanceId(), HasAnchor, QString("anchors.centerIn"), instance.hasAnchor("anchors.centerIn")));
-        informationVector.append(InformationContainer(instance.instanceId(), HasAnchor, QString("anchors.right"), instance.hasAnchor("anchors.right")));
-        informationVector.append(InformationContainer(instance.instanceId(), HasAnchor, QString("anchors.top"), instance.hasAnchor("anchors.top")));
-        informationVector.append(InformationContainer(instance.instanceId(), HasAnchor, QString("anchors.left"), instance.hasAnchor("anchors.left")));
-        informationVector.append(InformationContainer(instance.instanceId(), HasAnchor, QString("anchors.bottom"), instance.hasAnchor("anchors.bottom")));
-        informationVector.append(InformationContainer(instance.instanceId(), HasAnchor, QString("anchors.horizontalCenter"), instance.hasAnchor("anchors.horizontalCenter")));
-        informationVector.append(InformationContainer(instance.instanceId(), HasAnchor, QString("anchors.verticalCenter"), instance.hasAnchor("anchors.verticalCenter")));
-        informationVector.append(InformationContainer(instance.instanceId(), HasAnchor, QString("anchors.baseline"), instance.hasAnchor("anchors.baseline")));
+        informationVector.append(InformationContainer(instance.instanceId(), HasAnchor, PropertyName("anchors.fill"), instance.hasAnchor("anchors.fill")));
+        informationVector.append(InformationContainer(instance.instanceId(), HasAnchor, PropertyName("anchors.centerIn"), instance.hasAnchor("anchors.centerIn")));
+        informationVector.append(InformationContainer(instance.instanceId(), HasAnchor, PropertyName("anchors.right"), instance.hasAnchor("anchors.right")));
+        informationVector.append(InformationContainer(instance.instanceId(), HasAnchor, PropertyName("anchors.top"), instance.hasAnchor("anchors.top")));
+        informationVector.append(InformationContainer(instance.instanceId(), HasAnchor, PropertyName("anchors.left"), instance.hasAnchor("anchors.left")));
+        informationVector.append(InformationContainer(instance.instanceId(), HasAnchor, PropertyName("anchors.bottom"), instance.hasAnchor("anchors.bottom")));
+        informationVector.append(InformationContainer(instance.instanceId(), HasAnchor, PropertyName("anchors.horizontalCenter"), instance.hasAnchor("anchors.horizontalCenter")));
+        informationVector.append(InformationContainer(instance.instanceId(), HasAnchor, PropertyName("anchors.verticalCenter"), instance.hasAnchor("anchors.verticalCenter")));
+        informationVector.append(InformationContainer(instance.instanceId(), HasAnchor, PropertyName("anchors.baseline"), instance.hasAnchor("anchors.baseline")));
 
-        QPair<QString, ServerNodeInstance> anchorPair = instance.anchor("anchors.fill");
-        informationVector.append(InformationContainer(instance.instanceId(), Anchor, QString("anchors.fill"), anchorPair.first, anchorPair.second.instanceId()));
+        QPair<PropertyName, ServerNodeInstance> anchorPair = instance.anchor("anchors.fill");
+        informationVector.append(InformationContainer(instance.instanceId(), Anchor, PropertyName("anchors.fill"), anchorPair.first, anchorPair.second.instanceId()));
 
         anchorPair = instance.anchor("anchors.centerIn");
-        informationVector.append(InformationContainer(instance.instanceId(), Anchor, QString("anchors.centerIn"), anchorPair.first, anchorPair.second.instanceId()));
+        informationVector.append(InformationContainer(instance.instanceId(), Anchor, PropertyName("anchors.centerIn"), anchorPair.first, anchorPair.second.instanceId()));
 
         anchorPair = instance.anchor("anchors.right");
-        informationVector.append(InformationContainer(instance.instanceId(), Anchor, QString("anchors.right"), anchorPair.first, anchorPair.second.instanceId()));
+        informationVector.append(InformationContainer(instance.instanceId(), Anchor, PropertyName("anchors.right"), anchorPair.first, anchorPair.second.instanceId()));
 
         anchorPair = instance.anchor("anchors.top");
-        informationVector.append(InformationContainer(instance.instanceId(), Anchor, QString("anchors.top"), anchorPair.first, anchorPair.second.instanceId()));
+        informationVector.append(InformationContainer(instance.instanceId(), Anchor, PropertyName("anchors.top"), anchorPair.first, anchorPair.second.instanceId()));
 
         anchorPair = instance.anchor("anchors.left");
-        informationVector.append(InformationContainer(instance.instanceId(), Anchor, QString("anchors.left"), anchorPair.first, anchorPair.second.instanceId()));
+        informationVector.append(InformationContainer(instance.instanceId(), Anchor, PropertyName("anchors.left"), anchorPair.first, anchorPair.second.instanceId()));
 
         anchorPair = instance.anchor("anchors.bottom");
-        informationVector.append(InformationContainer(instance.instanceId(), Anchor, QString("anchors.bottom"), anchorPair.first, anchorPair.second.instanceId()));
+        informationVector.append(InformationContainer(instance.instanceId(), Anchor, PropertyName("anchors.bottom"), anchorPair.first, anchorPair.second.instanceId()));
 
         anchorPair = instance.anchor("anchors.horizontalCenter");
-        informationVector.append(InformationContainer(instance.instanceId(), Anchor, QString("anchors.horizontalCenter"), anchorPair.first, anchorPair.second.instanceId()));
+        informationVector.append(InformationContainer(instance.instanceId(), Anchor, PropertyName("anchors.horizontalCenter"), anchorPair.first, anchorPair.second.instanceId()));
 
         anchorPair = instance.anchor("anchors.verticalCenter");
-        informationVector.append(InformationContainer(instance.instanceId(), Anchor, QString("anchors.verticalCenter"), anchorPair.first, anchorPair.second.instanceId()));
+        informationVector.append(InformationContainer(instance.instanceId(), Anchor, PropertyName("anchors.verticalCenter"), anchorPair.first, anchorPair.second.instanceId()));
 
         anchorPair = instance.anchor("anchors.baseline");
-        informationVector.append(InformationContainer(instance.instanceId(), Anchor, QString("anchors.baseline"), anchorPair.first, anchorPair.second.instanceId()));
+        informationVector.append(InformationContainer(instance.instanceId(), Anchor, PropertyName("anchors.baseline"), anchorPair.first, anchorPair.second.instanceId()));
 
-        QStringList propertyNames = instance.propertyNames();
+        PropertyNameList propertyNames = instance.propertyNames();