From 12e19be48ef55a516d8bca4507c7605d320bd6fe Mon Sep 17 00:00:00 2001 From: Filippo Cucchetto Date: Mon, 28 Mar 2016 22:50:40 +0200 Subject: [PATCH] Fixed return type for connect/disconnect --- lib/include/DOtherSide/DOtherSide.h | 10 ++++------ lib/src/DOtherSide.cpp | 14 ++++++-------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/lib/include/DOtherSide/DOtherSide.h b/lib/include/DOtherSide/DOtherSide.h index e641f01..e4ac042 100644 --- a/lib/include/DOtherSide/DOtherSide.h +++ b/lib/include/DOtherSide/DOtherSide.h @@ -117,17 +117,15 @@ DOS_API void dos_qobject_signal_emit(DosQObject *vptr, const char *name, int parametersCount, void **parameters); -DOS_API void dos_qobject_signal_connect(DosQObject *senderVPtr, +DOS_API bool dos_qobject_signal_connect(DosQObject *senderVPtr, const char *signal, DosQObject *receiverVPtr, const char *method, - int type, - bool *result); -DOS_API void dos_qobject_signal_disconnect(DosQObject *senderVPtr, + int type); +DOS_API bool dos_qobject_signal_disconnect(DosQObject *senderVPtr, const char *signal, DosQObject *receiverVPtr, - const char *method, - bool *result); + const char *method); DOS_API char *dos_qobject_objectName(DosQObject *vptr); DOS_API void dos_qobject_setObjectName(DosQObject *vptr, const char *name); DOS_API void dos_qobject_delete(DosQObject *vptr); diff --git a/lib/src/DOtherSide.cpp b/lib/src/DOtherSide.cpp index 417376b..5e0f2b5 100644 --- a/lib/src/DOtherSide.cpp +++ b/lib/src/DOtherSide.cpp @@ -362,27 +362,25 @@ void dos_qobject_signal_emit(::DosQObject *vptr, const char *name, int parameter dynamicQObject->emitSignal(qobject, QString::fromStdString(name), variants); } -void dos_qobject_signal_connect(::DosQObject *senderVPtr, +bool dos_qobject_signal_connect(::DosQObject *senderVPtr, const char *signal, ::DosQObject *receiverVPtr, const char *method, - int type, - bool *result) + int type) { auto sender = static_cast(senderVPtr); auto receiver = static_cast(receiverVPtr); - *result = QObject::connect(sender, signal, receiver, method, (Qt::ConnectionType) type); + return QObject::connect(sender, signal, receiver, method, (Qt::ConnectionType) type); } -void dos_qobject_signal_disconnect(::DosQObject *senderVPtr, +bool dos_qobject_signal_disconnect(::DosQObject *senderVPtr, const char *signal, ::DosQObject *receiverVPtr, - const char *method, - bool *result) + const char *method) { auto sender = static_cast(senderVPtr); auto receiver = static_cast(receiverVPtr); - *result = QObject::disconnect(sender, signal, receiver, method); + return QObject::disconnect(sender, signal, receiver, method); } char *dos_qobject_objectName(::DosQObject *vptr)