From 3ae8323d546291e653b28d9f30dcc12bdb66dc9e Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@digia.com>
Date: Thu, 21 Feb 2013 14:12:36 +0100
Subject: [PATCH] Fix warnings introduced by reordering member variables

Change-Id: I37bc8f9bc874de52281b8597838ef8addae1a1a3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
 src/libs/cplusplus/pp-engine.cpp                       | 4 ++--
 src/libs/qmldebug/qmltoolsclient.cpp                   | 2 +-
 src/libs/qmleditorwidgets/gradientline.cpp             | 2 +-
 src/libs/qtcomponents/styleitem/qstyleitem.cpp         | 2 +-
 src/plugins/coreplugin/progressmanager/progressbar.cpp | 3 ++-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp
index 1e3b186f0bf..1c45e61e2a8 100644
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -547,14 +547,14 @@ Preprocessor::State::State()
     , m_skipping(MAX_LEVEL)
     , m_trueTest(MAX_LEVEL)
     , m_ifLevel(0)
-    , m_tokenBuffer(0)
     , m_tokenBufferDepth(0)
+    , m_tokenBuffer(0)
     , m_inPreprocessorDirective(false)
-    , m_result(0)
     , m_markExpandedTokens(true)
     , m_noLines(false)
     , m_inCondition(false)
     , m_offsetRef(0)
+    , m_result(0)
     , m_lineRef(1)
     , m_expansionStatus(NotExpanding)
     , m_includeGuardState(IncludeGuardState_BeforeIfndef)
diff --git a/src/libs/qmldebug/qmltoolsclient.cpp b/src/libs/qmldebug/qmltoolsclient.cpp
index 7c19e056552..12f876b2b8e 100644
--- a/src/libs/qmldebug/qmltoolsclient.cpp
+++ b/src/libs/qmldebug/qmltoolsclient.cpp
@@ -65,8 +65,8 @@ QmlToolsClient::QmlToolsClient(QmlDebugConnection *client)
     : BaseToolsClient(client, QLatin1String("QmlInspector")),
       m_connection(client),
       m_requestId(0),
-      m_slowDownFactor(1),
       m_reloadQueryId(-1),
+      m_slowDownFactor(1),
       m_destroyObjectQueryId(-1)
 {
     setObjectName(name());
diff --git a/src/libs/qmleditorwidgets/gradientline.cpp b/src/libs/qmleditorwidgets/gradientline.cpp
index 7de37c087b7..c1f1cdf9e0d 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_yOffset(0),
         m_dragActive(false),
+        m_yOffset(0),
         m_create(false),
         m_active(false),
         m_dragOff(false),
diff --git a/src/libs/qtcomponents/styleitem/qstyleitem.cpp b/src/libs/qtcomponents/styleitem/qstyleitem.cpp
index c0ce9521937..d7f23334679 100644
--- a/src/libs/qtcomponents/styleitem/qstyleitem.cpp
+++ b/src/libs/qtcomponents/styleitem/qstyleitem.cpp
@@ -54,6 +54,7 @@ QStyleItem::QStyleItem(QDeclarativeItem *parent)
     : QDeclarativeItem(parent),
     m_dummywidget(0),
     m_styleoption(0),
+    m_itemType(Undefined),
     m_sunken(false),
     m_raised(false),
     m_active(true),
@@ -62,7 +63,6 @@ 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),
diff --git a/src/plugins/coreplugin/progressmanager/progressbar.cpp b/src/plugins/coreplugin/progressmanager/progressbar.cpp
index 63e75195d9d..156c6d217e8 100644
--- a/src/plugins/coreplugin/progressmanager/progressbar.cpp
+++ b/src/plugins/coreplugin/progressmanager/progressbar.cpp
@@ -45,7 +45,8 @@ using namespace Core::Internal;
 #define CANCELBUTTON_SIZE 15
 
 ProgressBar::ProgressBar(QWidget *parent)
-    : QWidget(parent), m_error(false), m_minimum(1), m_maximum(100), m_value(1), m_cancelButtonFader(0), m_finished(false)
+    : QWidget(parent), m_minimum(1), m_maximum(100), m_value(1), m_cancelButtonFader(0),
+      m_finished(false), m_error(false)
 {
     setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
     setMouseTracking(true);