From db828905eff67213d0161392f9e5d0ccf3811a0c 2010-03-05 21:59:50 From: florianlink Date: 2010-03-05 21:59:50 Subject: [PATCH] updated to changed PythonQt API git-svn-id: svn://svn.code.sf.net/p/pythonqt/code/trunk@144 ea8d5007-eb21-0410-b261-ccb3ea6e24a9 --- diff --git a/extensions/PythonQt_QtAll/PythonQt_QtAll.cpp b/extensions/PythonQt_QtAll/PythonQt_QtAll.cpp index ef26b6e..cb35933 100644 --- a/extensions/PythonQt_QtAll/PythonQt_QtAll.cpp +++ b/extensions/PythonQt_QtAll/PythonQt_QtAll.cpp @@ -32,32 +32,35 @@ #include "PythonQt_QtAll.h" -void PythonQt_init_QtGui(); -void PythonQt_init_QtSvg(); -void PythonQt_init_QtSql(); -void PythonQt_init_QtNetwork(); -void PythonQt_init_QtCore(); -void PythonQt_init_QtWebKit(); -void PythonQt_init_QtOpenGL(); -void PythonQt_init_QtXml(); -void PythonQt_init_QtXmlPatterns(); -void PythonQt_init_QtUiTools(); -//void PythonQt_init_QtPhonon(); +#include "PythonQt.h" + +void PythonQt_init_QtGui(PyObject*); +void PythonQt_init_QtSvg(PyObject*); +void PythonQt_init_QtSql(PyObject*); +void PythonQt_init_QtNetwork(PyObject*); +void PythonQt_init_QtCore(PyObject*); +void PythonQt_init_QtWebKit(PyObject*); +void PythonQt_init_QtOpenGL(PyObject*); +void PythonQt_init_QtXml(PyObject*); +void PythonQt_init_QtXmlPatterns(PyObject*); +void PythonQt_init_QtUiTools(PyObject*); +void PythonQt_init_QtPhonon(PyObject*); namespace PythonQt_QtAll { PYTHONQT_QTALL_EXPORT void init() { - PythonQt_init_QtCore(); - PythonQt_init_QtNetwork(); - PythonQt_init_QtGui(); - PythonQt_init_QtXml(); - PythonQt_init_QtXmlPatterns(); - PythonQt_init_QtSvg(); - PythonQt_init_QtSql(); - PythonQt_init_QtWebKit(); - PythonQt_init_QtOpenGL(); - PythonQt_init_QtUiTools(); -// PythonQt_init_QtPhonon(); + PythonQt_init_QtCore(0); + PythonQt_init_QtNetwork(0); + PythonQt_init_QtGui(0); + PythonQt_init_QtXml(0); + PythonQt_init_QtSvg(0); + PythonQt_init_QtSql(0); + PythonQt_init_QtWebKit(0); + PythonQt_init_QtOpenGL(0); + PythonQt_init_QtUiTools(0); + // Does not compile yet: +// PythonQt_init_QtXmlPatterns(0); +// PythonQt_init_QtPhonon(0); }; }; diff --git a/extensions/PythonQt_QtAll/PythonQt_QtAll.pro b/extensions/PythonQt_QtAll/PythonQt_QtAll.pro index afc28b6..61f9d30 100644 --- a/extensions/PythonQt_QtAll/PythonQt_QtAll.pro +++ b/extensions/PythonQt_QtAll/PythonQt_QtAll.pro @@ -29,7 +29,7 @@ include (../../generated_cpp/com_trolltech_qt_network/com_trolltech_qt_network.p include (../../generated_cpp/com_trolltech_qt_opengl/com_trolltech_qt_opengl.pri) include (../../generated_cpp/com_trolltech_qt_webkit/com_trolltech_qt_webkit.pri) include (../../generated_cpp/com_trolltech_qt_xml/com_trolltech_qt_xml.pri) -include (../../generated_cpp/com_trolltech_qt_xmlpatterns/com_trolltech_qt_xmlpatterns.pri) include (../../generated_cpp/com_trolltech_qt_uitools/com_trolltech_qt_uitools.pri) +#include (../../generated_cpp/com_trolltech_qt_xmlpatterns/com_trolltech_qt_xmlpatterns.pri) #include (../../generated_cpp/com_trolltech_qt_phonon/com_trolltech_qt_phonon.pri)