Reduce padding in often-used structs

Reduce the padding in some often-used structs for 64bit machines.
32bit machines should also profit from most changes, but to a
lesser degree.

Change-Id: Ic4c67b94e962731de4f31164c52a372d78944ccc
Reviewed-by: Tobias Hunger <[email protected]>
Reviewed-by: Oswald Buddenhagen <[email protected]>

7 files changed, 9 insertions, 10 deletions

diff --git a/src/libs/cplusplus/CppDocument.h b/src/libs/cplusplus/CppDocument.h
index 11ae2e6a365..6e770145a50 100644
--- a/src/libs/cplusplus/CppDocument.h
+++ b/src/libs/cplusplus/CppDocument.h
@@ -146,8 +146,8 @@ public:
                           const QString &text,
                           unsigned length = 0)
             : _level(level),
-              _fileName(fileName),
               _line(line),
+              _fileName(fileName),
               _column(column),
               _length(length),
               _text(text)
@@ -185,8 +185,8 @@ public:
 
     private:
         int _level;
-        QString _fileName;
         unsigned _line;
+        QString _fileName;
         unsigned _column;
         unsigned _length;
         QString _text;
diff --git a/src/libs/cplusplus/Macro.h b/src/libs/cplusplus/Macro.h
index e45c9ff0310..aad4f9209c6 100644
--- a/src/libs/cplusplus/Macro.h
+++ b/src/libs/cplusplus/Macro.h
@@ -143,9 +143,7 @@ public:
 private:
     friend class Environment;
     Macro *_next;
-    unsigned _hashcode;
 
-private:
     QString decoratedName() const;
 
     struct Flags
@@ -160,6 +158,7 @@ private:
     QVector<PPToken> _definitionTokens;
     QVector<QByteArray> _formals;
     QString _fileName;
+    unsigned _hashcode;
     unsigned _fileRevision;
     unsigned _line;
     unsigned _offset;
diff --git a/src/libs/cplusplus/pp-engine.h b/src/libs/cplusplus/pp-engine.h
index 2bad2a5f6d6..1b318c74c8b 100644
--- a/src/libs/cplusplus/pp-engine.h
+++ b/src/libs/cplusplus/pp-engine.h
@@ -118,17 +118,17 @@ private:
         QBitArray m_skipping;
         QBitArray m_trueTest;
         int m_ifLevel;
-        Internal::TokenBuffer *m_tokenBuffer;
         unsigned m_tokenBufferDepth;
+        Internal::TokenBuffer *m_tokenBuffer;
         bool m_inPreprocessorDirective;
 
-        QByteArray *m_result;
         bool m_markExpandedTokens;
 
         bool m_noLines;
         bool m_inCondition;
 
         unsigned m_offsetRef;
+        QByteArray *m_result;
         unsigned m_lineRef;
 
         ExpansionStatus m_expansionStatus;
diff --git a/src/libs/qmldebug/qmltoolsclient.h b/src/libs/qmldebug/qmltoolsclient.h
index 76911c68e68..b153842da1e 100644
--- a/src/libs/qmldebug/qmltoolsclient.h
+++ b/src/libs/qmldebug/qmltoolsclient.h
@@ -79,8 +79,8 @@ private:
     QList<int> m_currentDebugIds;
     QmlDebugConnection *m_connection;
     int m_requestId;
-    qreal m_slowDownFactor;
     int m_reloadQueryId;
+    qreal m_slowDownFactor;
     int m_destroyObjectQueryId;
 };
 
diff --git a/src/libs/qmleditorwidgets/gradientline.cpp b/src/libs/qmleditorwidgets/gradientline.cpp
index c1f1cdf9e0d..7de37c087b7 100644
--- a/src/libs/qmleditorwidgets/gradientline.cpp
+++ b/src/libs/qmleditorwidgets/gradientline.cpp
@@ -64,8 +64,8 @@ GradientLine::GradientLine(QWidget *parent) :
         m_activeColor(Qt::black),
         m_gradientName(QLatin1String("gradient")),
         m_colorIndex(0),
-        m_dragActive(false),
         m_yOffset(0),
+        m_dragActive(false),
         m_create(false),
         m_active(false),
         m_dragOff(false),
diff --git a/src/libs/qmljs/qmljsinterpreter.h b/src/libs/qmljs/qmljsinterpreter.h
index 9c6df29c8de..cff537800a9 100644
--- a/src/libs/qmljs/qmljsinterpreter.h
+++ b/src/libs/qmljs/qmljsinterpreter.h
@@ -908,9 +908,9 @@ public:
 
 private:
     Type _type;
+    LanguageUtils::ComponentVersion _version;
     QString _name;
     QString _path;
-    LanguageUtils::ComponentVersion _version;
     QString _as;
     AST::UiImport *_ast;
 };
diff --git a/src/libs/qtcomponents/styleitem/qstyleitem.cpp b/src/libs/qtcomponents/styleitem/qstyleitem.cpp
index 21076342f8f..c0ce9521937 100644
--- a/src/libs/qtcomponents/styleitem/qstyleitem.cpp
+++ b/src/libs/qtcomponents/styleitem/qstyleitem.cpp
@@ -54,7 +54,6 @@ QStyleItem::QStyleItem(QDeclarativeItem *parent)
     : QDeclarativeItem(parent),
     m_dummywidget(0),
     m_styleoption(0),
-    m_type(Undefined),
     m_sunken(false),
     m_raised(false),
     m_active(true),
@@ -63,6 +62,7 @@ QStyleItem::QStyleItem(QDeclarativeItem *parent)
     m_on(false),
     m_horizontal(true),
     m_sharedWidget(false),
+    m_type(Undefined),
     m_minimum(0),
     m_maximum(100),
     m_value(0),