Mercurial > projects > qtd
comparison qt/core/QMetaObject.d @ 336:b0a7819153bb
fixed signal branch merge problems
author | maxter@maxter |
---|---|
date | Thu, 11 Feb 2010 12:59:25 +0200 |
parents | 24ebea513d66 |
children | 5896535a03cd |
comparison
equal
deleted
inserted
replaced
335:1e9092e20a67 | 336:b0a7819153bb |
---|---|
310 int methodCount() | 310 int methodCount() |
311 { | 311 { |
312 return qtd_QMetaObject_methodCount(_nativeId); | 312 return qtd_QMetaObject_methodCount(_nativeId); |
313 } | 313 } |
314 | 314 |
315 static void connectImpl(QObject sender, string signalString, QObject receiver, string methodString, int type) | 315 static void connectImpl(QObject sender, string signalString, QObject receiver, string methodString) |
316 { | 316 { |
317 QMetaSignal[] signals; | 317 QMetaSignal[] signals; |
318 QMetaMethod[] methods; | 318 QMetaMethod[] methods; |
319 QMetaSignal signal; | 319 QMetaSignal signal; |
320 QMetaMethod method; | 320 QMetaMethod method; |
368 } | 368 } |
369 else | 369 else |
370 { | 370 { |
371 int signalIndex = signal.indexOfMethod; | 371 int signalIndex = signal.indexOfMethod; |
372 int methodIndex = method.indexOfMethod; | 372 int methodIndex = method.indexOfMethod; |
373 success = QMetaObject.connect(sender, signalIndex, receiver, methodIndex, type); | 373 success = QMetaObject.connect(sender, signalIndex, receiver, methodIndex); |
374 } | 374 } |
375 | 375 |
376 if(!success) | 376 if(!success) |
377 throw new QMetaException("QMetaObject: Signal " ~ signalString ~ " and slot " ~ methodString ~ " cannot be found"); | 377 throw new QMetaException("QMetaObject: Signal " ~ signalString ~ " and slot " ~ methodString ~ " cannot be found"); |
378 } | 378 } |