Fixed return type for connect/disconnect

This commit is contained in:
Filippo Cucchetto 2016-03-28 22:50:40 +02:00
parent ada750679e
commit 12e19be48e
2 changed files with 10 additions and 14 deletions

View File

@ -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);

View File

@ -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<QObject *>(senderVPtr);
auto receiver = static_cast<QObject *>(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<QObject *>(senderVPtr);
auto receiver = static_cast<QObject *>(receiverVPtr);
*result = QObject::disconnect(sender, signal, receiver, method);
return QObject::disconnect(sender, signal, receiver, method);
}
char *dos_qobject_objectName(::DosQObject *vptr)