diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-10-26 04:18:40 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-10-26 04:18:40 (GMT) |
| commit | 9159ddc77750ce46a36995b8818cd5edcf7e1877 (patch) | |
| tree | 63820afec2e265fc41829d4f05dfdbec43ea7d92 /src/declarative/qml | |
| parent | 969b62e7b0bf6b7d7af24b45e73e10c1425f02a9 (diff) | |
| download | Qt-9159ddc77750ce46a36995b8818cd5edcf7e1877.zip Qt-9159ddc77750ce46a36995b8818cd5edcf7e1877.tar.gz Qt-9159ddc77750ce46a36995b8818cd5edcf7e1877.tar.bz2 | |
unwarn
Diffstat (limited to 'src/declarative/qml')
| -rw-r--r-- | src/declarative/qml/qbitfield_p.h | 4 | ||||
| -rw-r--r-- | src/declarative/qml/qmlcomponent_p.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qbitfield_p.h b/src/declarative/qml/qbitfield_p.h index 70d5041..9804a18 100644 --- a/src/declarative/qml/qbitfield_p.h +++ b/src/declarative/qml/qbitfield_p.h @@ -139,11 +139,11 @@ QBitField QBitField::united(const QBitField &o) rv.data = rv.ownData + 1; if (bits > o.bits) { ::memcpy((quint32 *)rv.data, data, length * sizeof(quint32)); - for (quint32 ii = 0; ii < (o.bits + 31) / 32; ++ii) + for (quint32 ii = 0; ii < quint32(o.bits + 31) / 32; ++ii) ((quint32 *)rv.data)[ii] |= o.data[ii]; } else { ::memcpy((quint32 *)rv.data, o.data, length * sizeof(quint32)); - for (quint32 ii = 0; ii < (bits + 31) / 32; ++ii) + for (quint32 ii = 0; ii < quint32(bits + 31) / 32; ++ii) ((quint32 *)rv.data)[ii] |= data[ii]; } return rv; diff --git a/src/declarative/qml/qmlcomponent_p.h b/src/declarative/qml/qmlcomponent_p.h index 7eedfbd..f90502f 100644 --- a/src/declarative/qml/qmlcomponent_p.h +++ b/src/declarative/qml/qmlcomponent_p.h @@ -76,7 +76,7 @@ class QmlComponentPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QmlComponent) public: - QmlComponentPrivate() : typeData(0), progress(0.), start(-1), count(-1), cc(0), completePending(false), componentAttacheds(0), engine(0) {} + QmlComponentPrivate() : typeData(0), progress(0.), start(-1), count(-1), cc(0), componentAttacheds(0), completePending(false), engine(0) {} QObject *create(QmlContext *context, const QBitField &); |