jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replaced TypeResolver by SbkConverter and SpecificConverter.

Browse source 
Also updated QtGui's WId conversion to Python 3.
This commit is contained in:
Marcelo Lira 2011-11-01 18:42:47 -03:00 • committed by Hugo Parente Lima
commit 2a87b74bfe
14 changed files with 175 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/QtCore/qobject_property_test.py
View file

@ -3,7 +3,7 @@
import unittest
from PySide.QtCore import *
from PySide.QtCore import QObject, Property, Signal
class MyObjectWithNotifyProperty(QObject):
def __init__(self, parent=None):
@ -31,7 +31,12 @@ class PropertyWithNotify(unittest.TestCase):
obj.myProperty = 10
self.assert_(self.called_)
def testHasProperty(self):
o = MyObjectWithNotifyProperty()
o.setProperty("myProperty", 10)
self.assertEqual(o.myProperty, 10)
self.assertEqual(o.property("myProperty"), 10)
if __name__ == '__main__':
unittest.main()

2
tests/pysidetest/testview.cpp
View file

@ -1,5 +1,6 @@
#include "testview.h"
#include <QDebug>
#include <QWidget>
#include <QAbstractListModel>
#include <QAbstractItemDelegate>
@ -21,4 +22,3 @@ TestView::getEditorWidgetFromItemDelegate() const
QStyleOptionViewItem options;
return m_delegate->createEditor(0, options, index);
}

38
tests/pysidetest/typesystem_pysidetest.xml
View file

@ -3,27 +3,46 @@
<load-typesystem name="typesystem_core.xml" generate="no" />
<load-typesystem name="typesystem_gui.xml" generate="no"/>
<value-type name="IntValue"/>
<primitive-type name="TypedefValue"/>
<primitive-type name="TypedefValue">
<!--
A conversion rule is used here because ApiExtractor can't associate
a primitive typedef to a non-primitive type. That would be a good
improvement to ApiExtractor.
-->
<conversion-rule>
<native-to-target>
return %CONVERTTOPYTHON[IntValue](%in);
</native-to-target>
<target-to-native>
<add-conversion type="IntValue">
IntValue value = %CONVERTTOCPP[IntValue](%in);
%out = %OUTTYPE(value);
</add-conversion>
</target-to-native>
</conversion-rule>
</primitive-type>
<object-type name="TestObject" />
<primitive-type name="PySideInt"/>
<primitive-type name="PySideCPP2::PySideLong"/>
<!--<primitive-type name="PySideLong"/>-->
<function signature="getHiddenObject()" />
<inject-code position="end">
Shiboken::TypeResolver::createObjectTypeResolver&lt; ::PySideCPP2::TestObjectWithoutNamespace>("TestObjectWithoutNamespace*");
Shiboken::TypeResolver::createValueTypeResolver&lt; ::PySideCPP2::PySideLong>("PySideLong");
Shiboken::TypeResolver::createObjectTypeResolver&lt; ::PySideCPP::TestObjectWithNamespace>("TestObjectWithNamespace*");
Shiboken::TypeResolver::createValueTypeResolver&lt; ::PySideInt>("PySideInt");
qRegisterMetaType&lt;PySideInt>("PySideInt");
qRegisterMetaType&lt;PySideCPP2::PySideLong>("PySideLong");
Shiboken::Conversions::registerConverterName(Shiboken::Conversions::PrimitiveTypeConverter&lt;long&gt;(), "PySideLong");
Shiboken::Conversions::registerConverterName(Shiboken::Conversions::PrimitiveTypeConverter&lt;long&gt;(), "PySideCPP2::PySideLong");
qRegisterMetaType&lt;PySideInt>("PySideInt");
qRegisterMetaType&lt;PySideCPP2::PySideLong>("PySideLong");
</inject-code>
<namespace-type name="PySideCPP">
<object-type name="TestObjectWithNamespace" />
<object-type name="TestObjectWithNamespace"/>
</namespace-type>
<namespace-type name="PySideCPP2" generate="no">
<enum-type name="Enum1" />
<object-type name="TestObjectWithoutNamespace" >
<object-type name="TestObjectWithoutNamespace">
<enum-type name="Enum2" />
</object-type>
</namespace-type>
@ -36,4 +55,3 @@
</modify-function>
</object-type>
</typesystem>