summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrenatofilho <renato.filho@openbossa.org>2010-10-29 18:55:51 -0300
committerrenatofilho <renato.filho@openbossa.org>2010-11-03 10:30:44 -0300
commitd77d0948463d31be329c67a4320ab1354219283a (patch)
tree4ab550203f5f5a70d4c2dc1b851b02b4d6d5ba90
parent4e0e1c65ce2eb33ce83b5d6f94ad2ae59e53ca64 (diff)
downloadshiboken-d77d0948463d31be329c67a4320ab1354219283a.tar.gz
shiboken-d77d0948463d31be329c67a4320ab1354219283a.tar.xz
shiboken-d77d0948463d31be329c67a4320ab1354219283a.zip
Updated code generation to new libpyside files.
Reviewer: Marcelo Lira <marcelo.lira@openbossa.org> Lauro Neto <lauro.neto@openbossa.org>
-rw-r--r--generator/cppgenerator.cpp12
-rw-r--r--generator/headergenerator.cpp2
2 files changed, 7 insertions, 7 deletions
diff --git a/generator/cppgenerator.cpp b/generator/cppgenerator.cpp
index 428b1848..a44b79c3 100644
--- a/generator/cppgenerator.cpp
+++ b/generator/cppgenerator.cpp
@@ -163,8 +163,8 @@ void CppGenerator::generateClass(QTextStream &s, const AbstractMetaClass *metaCl
s << "// default includes" << endl;
s << "#include <shiboken.h>" << endl;
if (usePySideExtensions()) {
- s << "#include <qsignal.h>" << endl;
- s << "#include <qproperty.h>" << endl;
+ s << "#include <pysidesignal.h>" << endl;
+ s << "#include <pysideproperty.h>" << endl;
s << "#include <pyside.h>" << endl;
}
@@ -3454,10 +3454,10 @@ void CppGenerator::writeSetattroFunction(QTextStream& s, const AbstractMetaClass
s << "static int " << cpythonSetattroFunctionName(metaClass) << "(PyObject* self, PyObject* name, PyObject* value)" << endl;
s << '{' << endl;
if (usePySideExtensions()) {
- s << INDENT << "Shiboken::AutoDecRef pp(reinterpret_cast<PyObject*>(PySide::qpropertyGetObject(self, name)));" << endl;
+ s << INDENT << "Shiboken::AutoDecRef pp(reinterpret_cast<PyObject*>(PySide::Property::getObject(self, name)));" << endl;
s << INDENT << "if (!pp.isNull())" << endl;
Indentation indent(INDENT);
- s << INDENT << "return PySide::qpropertySet(reinterpret_cast<PySideQProperty*>(pp.object()), self, value);" << endl;
+ s << INDENT << "return PySide::Property::setValue(reinterpret_cast<PySideProperty*>(pp.object()), self, value);" << endl;
}
s << INDENT << "return PyObject_GenericSetAttr(self, name, value);" << endl;
s << '}' << endl;
@@ -3495,10 +3495,10 @@ void CppGenerator::writeGetattroFunction(QTextStream& s, const AbstractMetaClass
}
s << INDENT << "PyObject* attr = PyObject_GenericGetAttr(self, name);" << endl;
if (usePySideExtensions() && (metaClass->qualifiedCppName() == "QObject")) {
- s << INDENT << "if (attr && PySide::isQPropertyType(attr)) {" << endl;
+ s << INDENT << "if (attr && PySide::Property::isPropertyType(attr)) {" << endl;
{
Indentation indent(INDENT);
- s << INDENT << "PyObject *value = PySide::qpropertyGet(reinterpret_cast<PySideQProperty*>(attr), self);" << endl;
+ s << INDENT << "PyObject *value = PySide::Property::getValue(reinterpret_cast<PySideProperty*>(attr), self);" << endl;
s << INDENT << "if (!value)" << endl;
{
Indentation indentation(INDENT);
diff --git a/generator/headergenerator.cpp b/generator/headergenerator.cpp
index 97cec4b7..ae9c4941 100644
--- a/generator/headergenerator.cpp
+++ b/generator/headergenerator.cpp
@@ -386,7 +386,7 @@ void HeaderGenerator::finishGeneration()
s << "#include <bindingmanager.h>" << endl;
s << "#include <memory>" << endl << endl;
if (usePySideExtensions())
- s << "#include <qsignal.h>" << endl;
+ s << "#include <pysidesignal.h>" << endl;
QStringList requiredTargetImports = TypeDatabase::instance()->requiredTargetImports();
if (!requiredTargetImports.isEmpty()) {