summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Filho <renato.filho@openbossa.org>2011-08-16 13:47:42 -0300
committerRenato Filho <renato.filho@openbossa.org>2011-08-16 14:18:28 -0300
commit6cdd438491ad7b127cc42151d2323b1bdf7db51d (patch)
tree840cc3db23d3b6e4cf84335dba17f7d91d893e1c
parent530ec26bea66e823d85ba61facb63282f0d83f4b (diff)
downloadpyside-6cdd438491ad7b127cc42151d2323b1bdf7db51d.tar.gz
pyside-6cdd438491ad7b127cc42151d2323b1bdf7db51d.tar.xz
pyside-6cdd438491ad7b127cc42151d2323b1bdf7db51d.zip
Fixed QColor.__reduce__ function.
Fixes bug #960. Reviewer: Marcelo Lira <marcelo.lira@openbossa.org> Luciano Wolf <luciano.wolf@openbossa.org>
-rw-r--r--PySide/QtGui/typesystem_gui_common.xml10
1 files changed, 5 insertions, 5 deletions
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml
index 48e0a30..2aad00c 100644
--- a/PySide/QtGui/typesystem_gui_common.xml
+++ b/PySide/QtGui/typesystem_gui_common.xml
@@ -1131,7 +1131,7 @@
case QColor::Hsl:
{
qreal h, s, l, a;
- %CPPSELF.getHsvF(&amp;h, &amp;s, &amp;l, &amp;a);
+ %CPPSELF.getHslF(&amp;h, &amp;s, &amp;l, &amp;a);
QString repr = QString().sprintf("PySide.QtGui.QColor.fromHslF(%.6f, %.6f, %.6f, %.6f)", h, s, l, a);
%PYARG_0 = PyString_FromString(qPrintable(repr));
break;
@@ -1156,7 +1156,7 @@
<insert-template name="qcolor_repr" />
</inject-code>
</add-function>
- <add-function signature="__reduce__" return-type="PyObject*">
+ <add-function signature="__reduce__" return-type="PyObject">
<inject-code class="target" position="beginning">
PyObject *createFunction = 0;
@@ -1190,7 +1190,7 @@
{
qreal h, s, l, a;
createFunction = PyObject_GetAttrString(%PYSELF, "fromHslF");
- %CPPSELF.getHsvF(&amp;h, &amp;s, &amp;l, &amp;a);
+ %CPPSELF.getHslF(&amp;h, &amp;s, &amp;l, &amp;a);
%PYARG_0 = Py_BuildValue("(N(ffff))", createFunction, h, s, l, a);
break;
}
@@ -1201,7 +1201,7 @@
</inject-code>
</add-function>
- <add-function signature="toTuple" return-type="PyObject*">
+ <add-function signature="toTuple" return-type="PyObject">
<inject-code class="target" position="beginning">
switch(%CPPSELF.spec()) {
case QColor::Rgb:
@@ -1228,7 +1228,7 @@
case QColor::Hsl:
{
int h, s, l, a;
- %CPPSELF.getHsv(&amp;h, &amp;s, &amp;l, &amp;a);
+ %CPPSELF.getHsl(&amp;h, &amp;s, &amp;l, &amp;a);
%PYARG_0 = Py_BuildValue("iiii", h, s, l, a);
break;
}