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

QmlDesigner: Fix byte padding

Browse Source 
Change-Id: I6c7562883e9ade627fad4cdf553765e164ceaf81
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-02-19 11:40:16 +01:00
committed by Thomas Hartmann
parent ee4bf638ca
commit 29bef4c280
4 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,10 +58,10 @@ namespace QmlDesigner {
namespace Internal { namespace Internal {
ObjectNodeInstance::ObjectNodeInstance(QObject *object) ObjectNodeInstance::ObjectNodeInstance(QObject *object)
: m_instanceId(-1), : m_object(object),
m_deleteHeldInstance(true),
m_object(object),
m_metaObject(0), m_metaObject(0),
m_instanceId(-1),
m_deleteHeldInstance(true),
m_isInPositioner(false) m_isInPositioner(false)
{ {

5
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
View File

@@ -191,15 +191,16 @@ private:
QHash<PropertyName, QWeakPointer<QQmlAbstractBinding> > m_resetBindingHash; QHash<PropertyName, QWeakPointer<QQmlAbstractBinding> > m_resetBindingHash;
QHash<PropertyName, ServerNodeInstance> m_modelAbstractPropertyHash; QHash<PropertyName, ServerNodeInstance> m_modelAbstractPropertyHash;
mutable QHash<PropertyName, bool> m_hasBindingHash; mutable QHash<PropertyName, bool> m_hasBindingHash;
qint32 m_instanceId;
QString m_id; QString m_id;
QPointer<NodeInstanceServer> m_nodeInstanceServer; QPointer<NodeInstanceServer> m_nodeInstanceServer;
PropertyName m_parentProperty; PropertyName m_parentProperty;
bool m_deleteHeldInstance;
QPointer<QObject> m_object; QPointer<QObject> m_object;
NodeInstanceMetaObject *m_metaObject; NodeInstanceMetaObject *m_metaObject;
NodeInstanceSignalSpy m_signalSpy; NodeInstanceSignalSpy m_signalSpy;
qint32 m_instanceId;
bool m_deleteHeldInstance;
bool m_isInPositioner; bool m_isInPositioner;
}; };

6
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp
View File

@@ -61,10 +61,10 @@ namespace QmlDesigner {
namespace Internal { namespace Internal {
ObjectNodeInstance::ObjectNodeInstance(QObject *object) ObjectNodeInstance::ObjectNodeInstance(QObject *object)
: m_instanceId(-1), : m_object(object),
m_deleteHeldInstance(true),
m_object(object),
m_metaObject(0), m_metaObject(0),
m_instanceId(-1),
m_deleteHeldInstance(true),
m_isInPositioner(false) m_isInPositioner(false)
{ {

4
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
View File

@@ -193,15 +193,15 @@ private:
QHash<PropertyName, QWeakPointer<QDeclarativeAbstractBinding> > m_resetBindingHash; QHash<PropertyName, QWeakPointer<QDeclarativeAbstractBinding> > m_resetBindingHash;
QHash<PropertyName, ServerNodeInstance> m_modelAbstractPropertyHash; QHash<PropertyName, ServerNodeInstance> m_modelAbstractPropertyHash;
mutable QHash<PropertyName, bool> m_hasBindingHash; mutable QHash<PropertyName, bool> m_hasBindingHash;
qint32 m_instanceId;
QString m_id; QString m_id;
QWeakPointer<NodeInstanceServer> m_nodeInstanceServer; QWeakPointer<NodeInstanceServer> m_nodeInstanceServer;
PropertyName m_parentProperty; PropertyName m_parentProperty;
bool m_deleteHeldInstance;
QWeakPointer<QObject> m_object; QWeakPointer<QObject> m_object;
NodeInstanceMetaObject *m_metaObject; NodeInstanceMetaObject *m_metaObject;
NodeInstanceSignalSpy m_signalSpy; NodeInstanceSignalSpy m_signalSpy;
qint32 m_instanceId;
bool m_deleteHeldInstance;
bool m_isInPositioner; bool m_isInPositioner;
}; };