forked from qt-creator/qt-creator
Fix warnings introduced by reordering member variables
Change-Id: I37bc8f9bc874de52281b8597838ef8addae1a1a3 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
@@ -547,14 +547,14 @@ Preprocessor::State::State()
|
|||||||
, m_skipping(MAX_LEVEL)
|
, m_skipping(MAX_LEVEL)
|
||||||
, m_trueTest(MAX_LEVEL)
|
, m_trueTest(MAX_LEVEL)
|
||||||
, m_ifLevel(0)
|
, m_ifLevel(0)
|
||||||
, m_tokenBuffer(0)
|
|
||||||
, m_tokenBufferDepth(0)
|
, m_tokenBufferDepth(0)
|
||||||
|
, m_tokenBuffer(0)
|
||||||
, m_inPreprocessorDirective(false)
|
, m_inPreprocessorDirective(false)
|
||||||
, m_result(0)
|
|
||||||
, m_markExpandedTokens(true)
|
, m_markExpandedTokens(true)
|
||||||
, m_noLines(false)
|
, m_noLines(false)
|
||||||
, m_inCondition(false)
|
, m_inCondition(false)
|
||||||
, m_offsetRef(0)
|
, m_offsetRef(0)
|
||||||
|
, m_result(0)
|
||||||
, m_lineRef(1)
|
, m_lineRef(1)
|
||||||
, m_expansionStatus(NotExpanding)
|
, m_expansionStatus(NotExpanding)
|
||||||
, m_includeGuardState(IncludeGuardState_BeforeIfndef)
|
, m_includeGuardState(IncludeGuardState_BeforeIfndef)
|
||||||
|
|||||||
@@ -65,8 +65,8 @@ QmlToolsClient::QmlToolsClient(QmlDebugConnection *client)
|
|||||||
: BaseToolsClient(client, QLatin1String("QmlInspector")),
|
: BaseToolsClient(client, QLatin1String("QmlInspector")),
|
||||||
m_connection(client),
|
m_connection(client),
|
||||||
m_requestId(0),
|
m_requestId(0),
|
||||||
m_slowDownFactor(1),
|
|
||||||
m_reloadQueryId(-1),
|
m_reloadQueryId(-1),
|
||||||
|
m_slowDownFactor(1),
|
||||||
m_destroyObjectQueryId(-1)
|
m_destroyObjectQueryId(-1)
|
||||||
{
|
{
|
||||||
setObjectName(name());
|
setObjectName(name());
|
||||||
|
|||||||
@@ -64,8 +64,8 @@ GradientLine::GradientLine(QWidget *parent) :
|
|||||||
m_activeColor(Qt::black),
|
m_activeColor(Qt::black),
|
||||||
m_gradientName(QLatin1String("gradient")),
|
m_gradientName(QLatin1String("gradient")),
|
||||||
m_colorIndex(0),
|
m_colorIndex(0),
|
||||||
m_yOffset(0),
|
|
||||||
m_dragActive(false),
|
m_dragActive(false),
|
||||||
|
m_yOffset(0),
|
||||||
m_create(false),
|
m_create(false),
|
||||||
m_active(false),
|
m_active(false),
|
||||||
m_dragOff(false),
|
m_dragOff(false),
|
||||||
|
|||||||
@@ -54,6 +54,7 @@ QStyleItem::QStyleItem(QDeclarativeItem *parent)
|
|||||||
: QDeclarativeItem(parent),
|
: QDeclarativeItem(parent),
|
||||||
m_dummywidget(0),
|
m_dummywidget(0),
|
||||||
m_styleoption(0),
|
m_styleoption(0),
|
||||||
|
m_itemType(Undefined),
|
||||||
m_sunken(false),
|
m_sunken(false),
|
||||||
m_raised(false),
|
m_raised(false),
|
||||||
m_active(true),
|
m_active(true),
|
||||||
@@ -62,7 +63,6 @@ QStyleItem::QStyleItem(QDeclarativeItem *parent)
|
|||||||
m_on(false),
|
m_on(false),
|
||||||
m_horizontal(true),
|
m_horizontal(true),
|
||||||
m_sharedWidget(false),
|
m_sharedWidget(false),
|
||||||
m_type(Undefined),
|
|
||||||
m_minimum(0),
|
m_minimum(0),
|
||||||
m_maximum(100),
|
m_maximum(100),
|
||||||
m_value(0),
|
m_value(0),
|
||||||
|
|||||||
@@ -45,7 +45,8 @@ using namespace Core::Internal;
|
|||||||
#define CANCELBUTTON_SIZE 15
|
#define CANCELBUTTON_SIZE 15
|
||||||
|
|
||||||
ProgressBar::ProgressBar(QWidget *parent)
|
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);
|
setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
|
||||||
setMouseTracking(true);
|
setMouseTracking(true);
|
||||||
|
|||||||
Reference in New Issue
Block a user