diff --git a/sip/QtCore/qlist.sip b/sip/QtCore/qlist.sip index d387763..bbb2e08 100644 --- a/sip/QtCore/qlist.sip +++ b/sip/QtCore/qlist.sip @@ -343,8 +343,8 @@ template %End }; %If (Qt_4_3_0 -) -// QList > is implemented as a Python list of 2-element tuples. -%MappedType QList > +// QList > is implemented as a Python list of 2-element tuples. +%MappedType QList > { %TypeHeaderCode #include @@ -361,7 +361,7 @@ template // Set the list elements. for (int i = 0; i < sipCpp->size(); ++i) { - const QPair &p = sipCpp->at(i); + const QPair &p = sipCpp->at(i); PyObject *pobj; if ((pobj = Py_BuildValue((char *)"dd", p.first, p.second)) == NULL) @@ -393,16 +393,16 @@ template return 1; } - QList > *ql = new QList >; + QList > *ql = new QList >; for (SIP_SSIZE_T i = 0; i < len; ++i) { PyObject *tup = PySequence_ITEM(sipPy, i); - double first = PyFloat_AsDouble(PySequence_ITEM(tup, 0)); - double second = PyFloat_AsDouble(PySequence_ITEM(tup, 1)); + float first = PyFloat_AsDouble(PySequence_ITEM(tup, 0)); + float second = PyFloat_AsDouble(PySequence_ITEM(tup, 1)); - ql->append(QPair(first, second)); + ql->append(QPair(first, second)); } *sipCppPtr = ql; @@ -412,9 +412,9 @@ template }; %End %If (Qt_4_3_0 -) -// QList > is implemented as a Python list of 2-element tuples. -template -%MappedType QList > +// QList > is implemented as a Python list of 2-element tuples. +template +%MappedType QList > { %TypeHeaderCode #include @@ -431,7 +431,7 @@ template // Set the list elements. for (int i = 0; i < sipCpp->size(); ++i) { - const QPair &p = sipCpp->at(i); + const QPair &p = sipCpp->at(i); TYPE *t = new TYPE(p.second); PyObject *pobj; @@ -472,12 +472,12 @@ template return 1; } - QList > *ql = new QList >; + QList > *ql = new QList >; for (SIP_SSIZE_T i = 0; i < len; ++i) { PyObject *tup = PySequence_ITEM(sipPy, i); - double d; + float d; int state; d = PyFloat_AsDouble(PySequence_ITEM(tup, 0)); @@ -491,7 +491,7 @@ template return 0; } - ql->append(QPair(d, *t)); + ql->append(QPair(d, *t)); sipReleaseInstance(t, sipClass_TYPE, state); } @@ -551,8 +551,8 @@ template return sipGetState(sipTransferObj); %End }; -// QList is implemented as a Python list of floats. -%MappedType QList +// QList is implemented as a Python list of floats. +%MappedType QList { %TypeHeaderCode #include @@ -590,7 +590,7 @@ template if (sipIsErr == NULL) return (len >= 0); - QList *ql = new QList; + QList *ql = new QList; for (SIP_SSIZE_T i = 0; i < len; ++i) ql->append(PyFloat_AsDouble(PySequence_ITEM(sipPy, i))); diff --git a/sip/QtCore/qvector.sip b/sip/QtCore/qvector.sip index d652bfe..dea5601 100644 --- a/sip/QtCore/qvector.sip +++ b/sip/QtCore/qvector.sip @@ -156,8 +156,8 @@ template return sipGetState(sipTransferObj); %End }; -// QVector is implemented as a Python list of floats. -%MappedType QVector +// QVector is implemented as a Python list of floats. +%MappedType QVector { %TypeHeaderCode #include @@ -193,7 +193,7 @@ template if (sipIsErr == NULL) return PyList_Check(sipPy); - QVector *ql = new QVector; + QVector *ql = new QVector; for (SIP_SSIZE_T i = 0; i < PyList_GET_SIZE(sipPy); ++i) ql->append(PyFloat_AsDouble(PyList_GET_ITEM(sipPy, i))); @@ -203,9 +203,9 @@ template return sipGetState(sipTransferObj); %End }; -// QVector > is implemented as a Python list of 2-element tuples. +// QVector > is implemented as a Python list of 2-element tuples. template -%MappedType QVector > +%MappedType QVector > { %TypeHeaderCode #include @@ -222,7 +222,7 @@ template // Set the list elements. for (int i = 0; i < sipCpp->size(); ++i) { - const QPair &p = sipCpp->at(i); + const QPair &p = sipCpp->at(i); TYPE *pt = new TYPE(p.second); PyObject *pobj; @@ -261,14 +261,14 @@ template return 1; } - QVector > *qv = new QVector >; + QVector > *qv = new QVector >; for (SIP_SSIZE_T i = 0; i < PyList_GET_SIZE(sipPy); ++i) { PyObject *tup = PyList_GET_ITEM(sipPy, i); int state; TYPE *s; - QPair p; + QPair p; p.first = PyFloat_AsDouble(PyTuple_GET_ITEM(tup, 0)); diff --git a/sip/QtGui/qbrush.sip b/sip/QtGui/qbrush.sip index 7813bec..3993ef1 100644 --- a/sip/QtGui/qbrush.sip +++ b/sip/QtGui/qbrush.sip @@ -151,7 +151,7 @@ public: QDataStream &operator>>(QDataStream &, QBrush & /Constrained/); QDataStream &operator<<(QDataStream &, const QBrush & /Constrained/); -typedef QVector > QGradientStops; +typedef QVector > QGradientStops; class QGradient { diff --git a/sip/QtGui/qgraphicsitemanimation.sip b/sip/QtGui/qgraphicsitemanimation.sip index f60107f..dbb7900 100644 --- a/sip/QtGui/qgraphicsitemanimation.sip +++ b/sip/QtGui/qgraphicsitemanimation.sip @@ -77,19 +77,19 @@ signals: public: %If (Qt_4_3_0 -) - QList > posList() const; + QList > posList() const; %End %If (Qt_4_3_0 -) - QList > rotationList() const; + QList > rotationList() const; %End %If (Qt_4_3_0 -) - QList > translationList() const; + QList > translationList() const; %End %If (Qt_4_3_0 -) - QList > scaleList() const; + QList > scaleList() const; %End %If (Qt_4_3_0 -) - QList > shearList() const; + QList > shearList() const; %End private: diff --git a/sip/QtGui/qpainterpath.sip b/sip/QtGui/qpainterpath.sip index 924174a..8fcb9e7 100644 --- a/sip/QtGui/qpainterpath.sip +++ b/sip/QtGui/qpainterpath.sip @@ -219,8 +219,8 @@ public: void setCurveThreshold(qreal threshold); qreal curveThreshold() const; void setDashPattern(Qt::PenStyle); - void setDashPattern(const QVector &dashPattern); - QVector dashPattern() const; + void setDashPattern(const QVector &dashPattern); + QVector dashPattern() const; QPainterPath createStroke(const QPainterPath &path) const; %If (Qt_4_3_0 -) void setDashOffset(qreal offset); diff --git a/sip/QtGui/qpen.sip b/sip/QtGui/qpen.sip index 0d78d8f..0cefacd 100644 --- a/sip/QtGui/qpen.sip +++ b/sip/QtGui/qpen.sip @@ -104,8 +104,8 @@ public: void setCapStyle(Qt::PenCapStyle pcs); Qt::PenJoinStyle joinStyle() const; void setJoinStyle(Qt::PenJoinStyle pcs); - QVector dashPattern() const; - void setDashPattern(const QVector &pattern); + QVector dashPattern() const; + void setDashPattern(const QVector &pattern); qreal miterLimit() const; void setMiterLimit(qreal limit); bool operator==(const QPen &p) const; diff --git a/sip/QtGui/qtextoption.sip b/sip/QtGui/qtextoption.sip index 2075e99..f748a63 100644 --- a/sip/QtGui/qtextoption.sip +++ b/sip/QtGui/qtextoption.sip @@ -75,8 +75,8 @@ public: typedef QFlags Flags; QFlags flags() const; qreal tabStop() const; - void setTabArray(QList tabStops); - QList tabArray() const; + void setTabArray(QList tabStops); + QList tabArray() const; void setUseDesignMetrics(bool b); bool useDesignMetrics() const; void setAlignment(Qt::Alignment aalignment);