From 29bef4c28003d6638b96d43f82a9a1f3a3f3b030 Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@digia.com>
Date: Tue, 19 Feb 2013 11:40:16 +0100
Subject: [PATCH] QmlDesigner: Fix byte padding

Change-Id: I6c7562883e9ade627fad4cdf553765e164ceaf81
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
---
 .../qml2puppet/instances/objectnodeinstance.cpp        | 10 +++++-----
 .../qml2puppet/instances/objectnodeinstance.h          |  5 +++--
 .../qmlpuppet/instances/objectnodeinstance.cpp         | 10 +++++-----
 .../qmlpuppet/qmlpuppet/instances/objectnodeinstance.h |  4 ++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
index b4c54a7e791..b95d65e7af3 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
@@ -58,11 +58,11 @@ namespace QmlDesigner {
 namespace Internal {
 
 ObjectNodeInstance::ObjectNodeInstance(QObject *object)
-    : m_instanceId(-1),
-    m_deleteHeldInstance(true),
-    m_object(object),
-    m_metaObject(0),
-    m_isInPositioner(false)
+    : m_object(object),
+      m_metaObject(0),
+      m_instanceId(-1),
+      m_deleteHeldInstance(true),
+      m_isInPositioner(false)
 {
 
 }
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
index 4feb35aaccc..32bba4bc69a 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
@@ -191,15 +191,16 @@ private:
     QHash<PropertyName, QWeakPointer<QQmlAbstractBinding> > m_resetBindingHash;
     QHash<PropertyName, ServerNodeInstance> m_modelAbstractPropertyHash;
     mutable QHash<PropertyName, bool> m_hasBindingHash;
-    qint32 m_instanceId;
     QString m_id;
 
     QPointer<NodeInstanceServer> m_nodeInstanceServer;
     PropertyName m_parentProperty;
-    bool m_deleteHeldInstance;
+
     QPointer<QObject> m_object;
     NodeInstanceMetaObject *m_metaObject;
     NodeInstanceSignalSpy m_signalSpy;
+    qint32 m_instanceId;
+    bool m_deleteHeldInstance;
     bool m_isInPositioner;
 };
 
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp
index c32bdda19c7..561fd77eb35 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.cpp
@@ -61,11 +61,11 @@ namespace QmlDesigner {
 namespace Internal {
 
 ObjectNodeInstance::ObjectNodeInstance(QObject *object)
-    : m_instanceId(-1),
-    m_deleteHeldInstance(true),
-    m_object(object),
-    m_metaObject(0),
-    m_isInPositioner(false)
+    : m_object(object),
+      m_metaObject(0),
+      m_instanceId(-1),
+      m_deleteHeldInstance(true),
+      m_isInPositioner(false)
 {
 
 }
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
index 64ff48f0e35..9c99414f238 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/objectnodeinstance.h
@@ -193,15 +193,15 @@ private:
     QHash<PropertyName, QWeakPointer<QDeclarativeAbstractBinding> > m_resetBindingHash;
     QHash<PropertyName, ServerNodeInstance> m_modelAbstractPropertyHash;
     mutable QHash<PropertyName, bool> m_hasBindingHash;
-    qint32 m_instanceId;
     QString m_id;
 
     QWeakPointer<NodeInstanceServer> m_nodeInstanceServer;
     PropertyName m_parentProperty;
-    bool m_deleteHeldInstance;
     QWeakPointer<QObject> m_object;
     NodeInstanceMetaObject *m_metaObject;
     NodeInstanceSignalSpy m_signalSpy;
+    qint32 m_instanceId;
+    bool m_deleteHeldInstance;
     bool m_isInPositioner;
 };