summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2012-04-30 14:14:11 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-01 07:11:13 +0200
commite1d53553259e7edefb2a76712fd6a1ddc072d22d (patch)
treee658fb2f72153548a918e466f45bfe6bc5003255
parent62185f07f8ac1515b9e884452b33978c5a521549 (diff)
Fix warning about narrowing inside {}
Such as qdialogbuttonbox.cpp:259:1: warning: narrowing conversion of ‘2147483650u’ from ‘unsigned int’ to ‘const int’ inside { } [-Wnarrowing] Change-Id: I00d66d96ef3af1a46935a58119668a20f8fd58c7 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
-rw-r--r--src/gui/opengl/qtriangulator.cpp2
-rw-r--r--src/widgets/widgets/qdialogbuttonbox.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/opengl/qtriangulator.cpp b/src/gui/opengl/qtriangulator.cpp
index c82b2a4ca8..74d33cd7e9 100644
--- a/src/gui/opengl/qtriangulator.cpp
+++ b/src/gui/opengl/qtriangulator.cpp
@@ -1133,7 +1133,7 @@ void QTriangulator<T>::ComplexToSimple::initEdges()
} else {
Q_ASSERT(i + 1 < m_parent->m_indices.size());
// {node, from, to, next, previous, winding, mayIntersect, pointingUp, originallyPointingUp}
- Edge edge = {0, m_parent->m_indices.at(i), m_parent->m_indices.at(i + 1), -1, -1, 0, true, false, false};
+ Edge edge = {0, int(m_parent->m_indices.at(i)), int(m_parent->m_indices.at(i + 1)), -1, -1, 0, true, false, false};
m_edges.add(edge);
}
}
diff --git a/src/widgets/widgets/qdialogbuttonbox.cpp b/src/widgets/widgets/qdialogbuttonbox.cpp
index 14643e77f6..b787522a50 100644
--- a/src/widgets/widgets/qdialogbuttonbox.cpp
+++ b/src/widgets/widgets/qdialogbuttonbox.cpp
@@ -211,7 +211,7 @@ static QDialogButtonBox::ButtonRole roleFor(QDialogButtonBox::StandardButton but
return QDialogButtonBox::InvalidRole;
}
-static const int layouts[2][5][14] =
+static const uint layouts[2][5][14] =
{
// Qt::Horizontal
{
@@ -406,7 +406,7 @@ void QDialogButtonBoxPrivate::layoutButtons()
tmpPolicy = 4; // Mac modeless
}
- const int *currentLayout = layouts[orientation == Qt::Vertical][tmpPolicy];
+ const uint *currentLayout = layouts[orientation == Qt::Vertical][tmpPolicy];
if (center)
buttonLayout->addStretch();