summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/serialization/qjsonvalue.h2
-rw-r--r--src/gui/image/qpixmap.h2
-rw-r--r--src/gui/text/qrawfont.h2
-rw-r--r--src/testlib/qsignalspy.h2
-rw-r--r--src/widgets/itemviews/qtreewidget.h6
5 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/serialization/qjsonvalue.h b/src/corelib/serialization/qjsonvalue.h
index 4bb4930690..3aecaa6126 100644
--- a/src/corelib/serialization/qjsonvalue.h
+++ b/src/corelib/serialization/qjsonvalue.h
@@ -134,7 +134,7 @@ public:
bool toBool(bool defaultValue = false) const
{ return concreteBool(*this, defaultValue); }
int toInt(int defaultValue = 0) const
- { return concreteInt(*this, defaultValue, true); }
+ { return int(concreteInt(*this, defaultValue, true)); }
qint64 toInteger(qint64 defaultValue = 0) const
{ return concreteInt(*this, defaultValue, false); }
double toDouble(double defaultValue = 0) const
diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h
index 61c0605efb..b6fa5da8af 100644
--- a/src/gui/image/qpixmap.h
+++ b/src/gui/image/qpixmap.h
@@ -163,7 +163,7 @@ inline void QPixmap::scroll(int dx, int dy, int ax, int ay, int awidth, int ahei
inline bool QPixmap::loadFromData(const QByteArray &buf, const char *format,
Qt::ImageConversionFlags flags)
{
- return loadFromData(reinterpret_cast<const uchar *>(buf.constData()), buf.size(), format, flags);
+ return loadFromData(reinterpret_cast<const uchar *>(buf.constData()), uint(buf.size()), format, flags);
}
diff --git a/src/gui/text/qrawfont.h b/src/gui/text/qrawfont.h
index 8da39c24f8..ca202d897f 100644
--- a/src/gui/text/qrawfont.h
+++ b/src/gui/text/qrawfont.h
@@ -127,7 +127,7 @@ inline QList<QPointF> QRawFont::advancesForGlyphIndexes(const QList<quint32> &gl
QRawFont::LayoutFlags layoutFlags) const
{
QList<QPointF> advances(glyphIndexes.size());
- if (advancesForGlyphIndexes(glyphIndexes.constData(), advances.data(), glyphIndexes.size(), layoutFlags))
+ if (advancesForGlyphIndexes(glyphIndexes.constData(), advances.data(), int(glyphIndexes.size()), layoutFlags))
return advances;
return QList<QPointF>();
}
diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h
index efe07f0360..d31370cbd0 100644
--- a/src/testlib/qsignalspy.h
+++ b/src/testlib/qsignalspy.h
@@ -97,7 +97,7 @@ public:
bool wait(int timeout = 5000)
{
Q_ASSERT(!m_waiting);
- const int origCount = count();
+ const qsizetype origCount = count();
m_waiting = true;
m_loop.enterLoopMSecs(timeout);
m_waiting = false;
diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h
index 99f31ee421..66a81f7b6a 100644
--- a/src/widgets/itemviews/qtreewidget.h
+++ b/src/widgets/itemviews/qtreewidget.h
@@ -148,8 +148,8 @@ public:
executePendingSort();
return children.at(index);
}
- inline int childCount() const { return children.count(); }
- inline int columnCount() const { return values.count(); }
+ inline int childCount() const { return int(children.count()); }
+ inline int columnCount() const { return int(values.count()); }
inline int indexOfChild(QTreeWidgetItem *child) const;
void addChild(QTreeWidgetItem *child);
@@ -213,7 +213,7 @@ inline void QTreeWidgetItem::setFont(int column, const QFont &afont)
{ setData(column, Qt::FontRole, afont); }
inline int QTreeWidgetItem::indexOfChild(QTreeWidgetItem *achild) const
-{ executePendingSort(); return children.indexOf(achild); }
+{ executePendingSort(); return int(children.indexOf(achild)); }
#ifndef QT_NO_DATASTREAM
Q_WIDGETS_EXPORT QDataStream &operator<<(QDataStream &out, const QTreeWidgetItem &item);