summaryrefslogtreecommitdiffstats
path: root/src/gui/itemviews
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-03-20 22:57:59 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-03-20 23:32:28 (GMT)
commit7c594907d521bb29ecca1b953a4ceea49ec32dd4 (patch)
tree98d614193f484a9f62f3080de3b55b43888f6700 /src/gui/itemviews
parent69e873e2bfae3fc028c21d93112a75008c3bb58b (diff)
downloadQt-7c594907d521bb29ecca1b953a4ceea49ec32dd4.zip
Qt-7c594907d521bb29ecca1b953a4ceea49ec32dd4.tar.gz
Qt-7c594907d521bb29ecca1b953a4ceea49ec32dd4.tar.bz2
Compile Qt in C++0x mode.
This is not valid in C++0x: char str[] = { 128, 0 }; Because 128 cannot be represented in a char. The same applies to conversion from int to qreal: it's a narrowing conversion, with possible data loss. More info: http://www2.research.att.com/~bs/C++0xFAQ.html#narrowing Reviewed-by: Trust Me
Diffstat (limited to 'src/gui/itemviews')
-rw-r--r--src/gui/itemviews/qitemdelegate.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp
index 7d8e103..cba213b 100644
--- a/src/gui/itemviews/qitemdelegate.cpp
+++ b/src/gui/itemviews/qitemdelegate.cpp
@@ -1023,7 +1023,7 @@ QPixmap QItemDelegate::decoration(const QStyleOptionViewItem &option, const QVar
// hacky but faster version of "QString::sprintf("%d-%d", i, enabled)"
static QString qPixmapSerial(quint64 i, bool enabled)
{
- ushort arr[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '-', '0' + enabled };
+ ushort arr[] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '-', ushort('0' + enabled) };
ushort *ptr = &arr[16];
while (i > 0) {