GIT_REPOSITORIES/LPP/PythonQt Commit - r61:d314d06796c4

added static connect/disconnect and dummy emit implementation, added dummy SIGNAL/SLOT functions to namespace...

florianlink -

r61:d314d06796c4

parent child

Context file:

r61:d314d06796c4

Collapse all files

src/PythonQt.cpp +34 0

@@ -1130,6 +1130,35 void PythonQtPrivate::registerCPPClass(const char* typeName, const char* parentT
1130	}	1130	}
1131	}	1131	}
1132		1132
		1133	static PyObject PythonQt_SIGNAL(PyObject /type/, PyObject *args)
		1134	{
		1135	const char* value;
		1136	if (!PyArg_ParseTuple(args, "s", &value)) {
		1137	return NULL;
		1138	}
		1139	// we do not prepend 0,1 or 2, why should we?
		1140	return PyString_FromString(value);
		1141	}
		1142
		1143	static PyObject PythonQt_SLOT(PyObject /type/, PyObject *args)
		1144	{
		1145	const char* value;
		1146	if (!PyArg_ParseTuple(args, "s", &value)) {
		1147	return NULL;
		1148	}
		1149	// we do not prepend 0,1 or 2, why should we?
		1150	return PyString_FromString(value);
		1151	}
		1152
		1153	static PyMethodDef PythonQt_Qt_methods[] = {
		1154	{"SIGNAL", (PyCFunction)PythonQt_SIGNAL, METH_VARARGS,
		1155	"Returns a signal string"
		1156	},
		1157	{"SLOT", (PyCFunction)PythonQt_SLOT, METH_VARARGS,
		1158	"Returns a slot string"
		1159	}
		1160	};
		1161
1133	PyObject* PythonQtPrivate::packageByName(const char* name)	1162	PyObject* PythonQtPrivate::packageByName(const char* name)
1134	{	1163	{
1135	if (name==NULL \|\| name[0]==0) {	1164	if (name==NULL \|\| name[0]==0) {
@@ -1138,6 +1167,11 PyObject* PythonQtPrivate::packageByName(const char* name)
1138	PyObject* v = _packages.value(name);	1167	PyObject* v = _packages.value(name);
1139	if (!v) {	1168	if (!v) {
1140	v = PyImport_AddModule((QByteArray("PythonQt.") + name).constData());	1169	v = PyImport_AddModule((QByteArray("PythonQt.") + name).constData());
		1170	if (strcmp(name,"Qt")==0 \|\| strcmp(name,"QtCore")==0) {
		1171	// add SIGNAL and SLOT functions
		1172	PyModule_AddObject(v, "SIGNAL", PyCFunction_New(PythonQt_Qt_methods, v));
		1173	PyModule_AddObject(v, "SLOT", PyCFunction_New(PythonQt_Qt_methods+1, v));
		1174	}
1141	_packages.insert(name, v);	1175	_packages.insert(name, v);
1142	// AddObject steals the reference, so increment it!	1176	// AddObject steals the reference, so increment it!
1143	Py_INCREF(v);	1177	Py_INCREF(v);

src/PythonQtDoc.h +5 -3

              \section Comparision Comparision with PyQt
-             - PythonQt is not as Pythonic as PyQt in many details (e.g. operator mapping, pickling, translation support, ...) and it is maily thought for embedding and intercommunication between Qt/Cpp and Python
+             - PythonQt is not as Pythonic as PyQt in many details (e.g. operator mapping, pickling, translation support, ...) and it is mainly thought for embedding and intercommunication between Qt/Cpp and Python
              - PythonQt allows to communicate in both directions, e.g. calling a Python object from C++ AND calling a C++ method from Python, while PyQt only handles the Python->C++ direction
              - PythonQt offers properties as Python attributes, while PyQt offers them as setter/getter methods (e.g. QWidget.width is a property in PythonQt and a method in PyQt)
-             - PythonQt does not (yet?) offer QtCore.SIGNAL() and QtCore.SLOT() methods, connect and disconnect just take strings for signals and slots
+             - PythonQt offer QtCore.SIGNAL() and QtCore.SLOT() methods for compability, but no 0/1/3 is prepended
-             - QObject.emit to emit Qt signals from Python is not yet possible
+             - PythonQt does not support instanceof checks for Qt classes, except for the exact match and derived Python classes
+             - QObject.emit to emit Qt signals from Python is not yet implemented
+             - PythonQt does not offer to add new signals to Python/C++ objects
              - Ownership of objects is a bit different in PythonQt, currently Python classes derived from a C++ class need to be manually references in PythonQt to not get deleted too early (this will be fixed)
              - Probably there are lots of details that differ, I do not know PyQt that well to list them all.

src/PythonQtStdDecorators.cpp +9 0

@@ -96,6 +96,15 bool PythonQtStdDecorators::disconnect(QObject* sender, const QByteArray& signal
96	return r;	96	return r;
97	}	97	}
98		98
		99	#undef emit
		100	void PythonQtStdDecorators::emit(QObject* sender, const QByteArray& signal, PyObject* arg1 ,PyObject* arg2 ,
		101	PyObject* arg3 ,PyObject* arg4 ,PyObject* arg5 ,PyObject* arg6 ,PyObject* arg7 )
		102	{
		103	// TODO xxx
		104	// use normal PythonQtSlot calling code, add "allowSignal" to member lookup?!
		105	}
		106	#define emit
		107
99	QObject* PythonQtStdDecorators::parent(QObject* o) {	108	QObject* PythonQtStdDecorators::parent(QObject* o) {
100	return o->parent();	109	return o->parent();
101	}	110	}

src/PythonQtStdDecorators.h +5 0

               bool disconnect(QObject* sender, const QByteArray& signal, PyObject* callable);
               bool disconnect(QObject* sender, const QByteArray& signal, QObject* receiver, const QByteArray& slot);
+            #undef emit
+              void emit(QObject* sender, const QByteArray& signal, PyObject* arg1 = NULL,PyObject* arg2 = NULL,
+                        PyObject* arg3 = NULL,PyObject* arg4 = NULL,PyObject* arg5 = NULL,PyObject* arg6 = NULL,PyObject* arg7 = NULL);
+            #define emit
               bool static_QObject_connect(QObject* sender, const QByteArray& signal, PyObject* callable) { return connect(sender, signal, callable); }
               bool static_QObject_connect(QObject* sender, const QByteArray& signal, QObject* receiver, const QByteArray& slot) { return connect(sender, signal, receiver, slot); }
               bool static_QObject_disconnect(QObject* sender, const QByteArray& signal, PyObject* callable) { return disconnect(sender, signal, callable); }

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages