Skip to content

Commit 30d788f

Browse files
jcfrjcfr
authored
Merge pull request #63 from pieper/wrap-QSocketNotifier
Expose QSocketNotifier for Qt5
2 parents fa7c647 + 0be8c1a commit 30d788f

File tree

2 files changed

+180
-5
lines changed

2 files changed

+180
-5
lines changed

‎generated_cpp_56/com_trolltech_qt_core/com_trolltech_qt_core2.cpp‎

Lines changed: 160 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4540,18 +4540,178 @@ QByteArray PythonQtWrapper_QSignalTransition::signal(QSignalTransition* theWrap
45404540
return ( theWrappedObject->signal());
45414541
}
45424542

4543+
// code from 48
4544+
//
4545+
PythonQtShell_QSocketNotifier::~PythonQtShell_QSocketNotifier() {
4546+
PythonQtPrivate* priv = PythonQt::priv();
4547+
if (priv) { priv->shellClassDeleted(this); }
4548+
}
4549+
void PythonQtShell_QSocketNotifier::childEvent(QChildEvent* arg__1)
4550+
{
4551+
if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
4552+
static PyObject* name = PyString_FromString("childEvent");
4553+
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
4554+
if (obj) {
4555+
static const char* argumentList[] ={"" , "QChildEvent*"};
4556+
static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList);
4557+
void* args[2] = {NULL, (void*)&arg__1};
4558+
PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true);
4559+
if (result) { Py_DECREF(result); }
4560+
Py_DECREF(obj);
4561+
return;
4562+
} else {
4563+
PyErr_Clear();
4564+
}
4565+
}
4566+
QSocketNotifier::childEvent(arg__1);
4567+
}
4568+
void PythonQtShell_QSocketNotifier::customEvent(QEvent* arg__1)
4569+
{
4570+
if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
4571+
static PyObject* name = PyString_FromString("customEvent");
4572+
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
4573+
if (obj) {
4574+
static const char* argumentList[] ={"" , "QEvent*"};
4575+
static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList);
4576+
void* args[2] = {NULL, (void*)&arg__1};
4577+
PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true);
4578+
if (result) { Py_DECREF(result); }
4579+
Py_DECREF(obj);
4580+
return;
4581+
} else {
4582+
PyErr_Clear();
4583+
}
4584+
}
4585+
QSocketNotifier::customEvent(arg__1);
4586+
}
4587+
bool PythonQtShell_QSocketNotifier::event(QEvent* arg__1)
4588+
{
4589+
if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
4590+
static PyObject* name = PyString_FromString("event");
4591+
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
4592+
if (obj) {
4593+
static const char* argumentList[] ={"bool" , "QEvent*"};
4594+
static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList);
4595+
bool returnValue;
4596+
void* args[2] = {NULL, (void*)&arg__1};
4597+
PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true);
4598+
if (result) {
4599+
args[0] = PythonQtConv::ConvertPythonToQt(methodInfo->parameters().at(0), result, false, NULL, &returnValue);
4600+
if (args[0]!=&returnValue) {
4601+
if (args[0]==NULL) {
4602+
PythonQt::priv()->handleVirtualOverloadReturnError("event", methodInfo, result);
4603+
} else {
4604+
returnValue = *((bool*)args[0]);
4605+
}
4606+
}
4607+
}
4608+
if (result) { Py_DECREF(result); }
4609+
Py_DECREF(obj);
4610+
return returnValue;
4611+
} else {
4612+
PyErr_Clear();
4613+
}
4614+
}
4615+
return QSocketNotifier::event(arg__1);
4616+
}
4617+
bool PythonQtShell_QSocketNotifier::eventFilter(QObject* arg__1, QEvent* arg__2)
4618+
{
4619+
if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
4620+
static PyObject* name = PyString_FromString("eventFilter");
4621+
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
4622+
if (obj) {
4623+
static const char* argumentList[] ={"bool" , "QObject*" , "QEvent*"};
4624+
static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(3, argumentList);
4625+
bool returnValue;
4626+
void* args[3] = {NULL, (void*)&arg__1, (void*)&arg__2};
4627+
PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true);
4628+
if (result) {
4629+
args[0] = PythonQtConv::ConvertPythonToQt(methodInfo->parameters().at(0), result, false, NULL, &returnValue);
4630+
if (args[0]!=&returnValue) {
4631+
if (args[0]==NULL) {
4632+
PythonQt::priv()->handleVirtualOverloadReturnError("eventFilter", methodInfo, result);
4633+
} else {
4634+
returnValue = *((bool*)args[0]);
4635+
}
4636+
}
4637+
}
4638+
if (result) { Py_DECREF(result); }
4639+
Py_DECREF(obj);
4640+
return returnValue;
4641+
} else {
4642+
PyErr_Clear();
4643+
}
4644+
}
4645+
return QSocketNotifier::eventFilter(arg__1, arg__2);
4646+
}
4647+
void PythonQtShell_QSocketNotifier::timerEvent(QTimerEvent* arg__1)
4648+
{
4649+
if (_wrapper && (((PyObject*)_wrapper)->ob_refcnt > 0)) {
4650+
static PyObject* name = PyString_FromString("timerEvent");
4651+
PyObject* obj = PyBaseObject_Type.tp_getattro((PyObject*)_wrapper, name);
4652+
if (obj) {
4653+
static const char* argumentList[] ={"" , "QTimerEvent*"};
4654+
static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList);
4655+
void* args[2] = {NULL, (void*)&arg__1};
4656+
PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true);
4657+
if (result) { Py_DECREF(result); }
4658+
Py_DECREF(obj);
4659+
return;
4660+
} else {
4661+
PyErr_Clear();
4662+
}
4663+
}
4664+
QSocketNotifier::timerEvent(arg__1);
4665+
}
4666+
QSocketNotifier* PythonQtWrapper_QSocketNotifier::new_QSocketNotifier(int socket, QSocketNotifier::Type arg__2, QObject* parent)
4667+
{
4668+
return new PythonQtShell_QSocketNotifier(socket, arg__2, parent); }
45434669

4670+
bool PythonQtWrapper_QSocketNotifier::event(QSocketNotifier* theWrappedObject, QEvent* arg__1)
4671+
{
4672+
return ( ((PythonQtPublicPromoter_QSocketNotifier*)theWrappedObject)->promoted_event(arg__1));
4673+
}
45444674

45454675
bool PythonQtWrapper_QSocketNotifier::isEnabled(QSocketNotifier* theWrappedObject) const
45464676
{
45474677
return ( theWrappedObject->isEnabled());
45484678
}
45494679

4680+
int PythonQtWrapper_QSocketNotifier::socket(QSocketNotifier* theWrappedObject) const
4681+
{
4682+
return ( theWrappedObject->socket());
4683+
}
4684+
45504685
QSocketNotifier::Type PythonQtWrapper_QSocketNotifier::type(QSocketNotifier* theWrappedObject) const
45514686
{
45524687
return ( theWrappedObject->type());
45534688
}
4689+
// end of code from 48
4690+
4691+
/// Hand edited QSocketNotifier code
4692+
/*
4693+
QSocketNotifier* PythonQtWrapper_QSocketNotifier::new_QSocketNotifier(qintptr socket, QSocketNotifier::Type type)
4694+
{
4695+
return new PythonQtShell_QSocketNotifier(socket, type); }
4696+
4697+
int PythonQtShell_QSocketNotifier::qt_metacall(QMetaObject::Call call, int id, void** args) {
4698+
int result = QSocketNotifier::qt_metacall(call, id, args);
4699+
return result >= 0 ? PythonQt::priv()->handleMetaCall(this, _wrapper, call, id, args) : result;
4700+
}
4701+
4702+
bool PythonQtWrapper_QSocketNotifier::isEnabled(QSocketNotifier* theWrappedObject) const
4703+
{
4704+
return ( theWrappedObject->isEnabled());
4705+
}
4706+
4707+
QSocketNotifier::Type PythonQtWrapper_QSocketNotifier::type(QSocketNotifier* theWrappedObject) const
4708+
{
4709+
return ( theWrappedObject->type());
4710+
}
4711+
45544712
4713+
*/
4714+
/// end of hand generated code
45554715

45564716

45574717
QString PythonQtWrapper_QStandardPaths::static_QStandardPaths_displayName(QStandardPaths::StandardLocation type)

‎generated_cpp_56/com_trolltech_qt_core/com_trolltech_qt_core2.h‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1041,13 +1041,27 @@ void delete_QSignalTransition(QSignalTransition* obj) { delete obj; }
10411041
};
10421042

10431043

1044+
// code from 48 (QSocketNotifier is not wrapped correctly for Qt5)
10441045

1046+
class PythonQtShell_QSocketNotifier : public QSocketNotifier
1047+
{
1048+
public:
1049+
PythonQtShell_QSocketNotifier(int socket, QSocketNotifier::Type arg__2, QObject* parent = 0):QSocketNotifier(socket, arg__2, parent),_wrapper(NULL) {};
10451050

1051+
~PythonQtShell_QSocketNotifier();
1052+
1053+
virtual void childEvent(QChildEvent* arg__1);
1054+
virtual void customEvent(QEvent* arg__1);
1055+
virtual bool event(QEvent* arg__1);
1056+
virtual bool eventFilter(QObject* arg__1, QEvent* arg__2);
1057+
virtual void timerEvent(QTimerEvent* arg__1);
1058+
1059+
PythonQtInstanceWrapper* _wrapper;
1060+
};
10461061

10471062
class PythonQtPublicPromoter_QSocketNotifier : public QSocketNotifier
10481063
{ public:
1049-
inline bool promoted_event(QEvent* arg__1) { return this->event(arg__1); }
1050-
inline bool py_q_event(QEvent* arg__1) { return QSocketNotifier::event(arg__1); }
1064+
inline bool promoted_event(QEvent* arg__1) { return QSocketNotifier::event(arg__1); }
10511065
};
10521066

10531067
class PythonQtWrapper_QSocketNotifier : public QObject
@@ -1057,14 +1071,15 @@ Q_ENUMS(Type )
10571071
enum Type{
10581072
Read = QSocketNotifier::Read, Write = QSocketNotifier::Write, Exception = QSocketNotifier::Exception};
10591073
public slots:
1074+
QSocketNotifier* new_QSocketNotifier(int socket, QSocketNotifier::Type arg__2, QObject* parent = 0);
10601075
void delete_QSocketNotifier(QSocketNotifier* obj) { delete obj; }
1061-
bool py_q_event(QSocketNotifier* theWrappedObject, QEvent* arg__1){ return (((PythonQtPublicPromoter_QSocketNotifier*)theWrappedObject)->py_q_event(arg__1));}
1076+
bool event(QSocketNotifier* theWrappedObject, QEvent* arg__1);
10621077
bool isEnabled(QSocketNotifier* theWrappedObject) const;
1078+
int socket(QSocketNotifier* theWrappedObject) const;
10631079
QSocketNotifier::Type type(QSocketNotifier* theWrappedObject) const;
10641080
};
10651081

1066-
1067-
1082+
/// end of code from 48
10681083

10691084

10701085
class PythonQtWrapper_QStandardPaths : public QObject

0 commit comments

Comments
 (0)