Mercurial > projects > qtd
changeset 336:b0a7819153bb
fixed signal branch merge problems
author | maxter@maxter |
---|---|
date | Thu, 11 Feb 2010 12:59:25 +0200 |
parents | 1e9092e20a67 |
children | 5896535a03cd |
files | generator/typesystem_core-java.java qt/core/QMetaObject.d |
diffstat | 2 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/generator/typesystem_core-java.java Sun Feb 07 16:04:36 2010 +0000 +++ b/generator/typesystem_core-java.java Thu Feb 11 12:59:25 2010 +0200 @@ -155,9 +155,9 @@ return result; } - static void connect(QObject sender, string signal, QObject receiver, string method, int type = 0) + static void connect(QObject sender, string signal, QObject receiver, string method) { - QMetaObject.connectImpl(sender, signal, receiver, method, type); + QMetaObject.connectImpl(sender, signal, receiver, method); } }// class
--- a/qt/core/QMetaObject.d Sun Feb 07 16:04:36 2010 +0000 +++ b/qt/core/QMetaObject.d Thu Feb 11 12:59:25 2010 +0200 @@ -312,7 +312,7 @@ return qtd_QMetaObject_methodCount(_nativeId); } - static void connectImpl(QObject sender, string signalString, QObject receiver, string methodString, int type) + static void connectImpl(QObject sender, string signalString, QObject receiver, string methodString) { QMetaSignal[] signals; QMetaMethod[] methods; @@ -370,7 +370,7 @@ { int signalIndex = signal.indexOfMethod; int methodIndex = method.indexOfMethod; - success = QMetaObject.connect(sender, signalIndex, receiver, methodIndex, type); + success = QMetaObject.connect(sender, signalIndex, receiver, methodIndex); } if(!success) @@ -387,4 +387,4 @@ extern(C) int qtd_QMetaObject_indexOfMethod(void *nativeId, const(char) *method); extern(C) int qtd_QMetaObject_methodCount(void *nativeId); -extern(C) void* qtd_QMetaObject_superClass(void* nativeId); +extern(C) void* qtd_QMetaObject_superClass(void* nativeId); \ No newline at end of file