if (signal.mobj->d.data[signal.handle + 4] & MethodCloned)
signalIndex = QMetaObjectPrivate::originalClone(signal.mobj, signalIndex);
- int signalOffset;
- int methodOffset;
- computeOffsets(signal.mobj, &signalOffset, &methodOffset);
- signalIndex += signalOffset;
+ signalIndex += QMetaObjectPrivate::signalOffset(signal.mobj);
if (signalIndex < sizeof(d->connectedSignals) * 8)
return d->isSignalConnected(signalIndex);
return QMetaObject::Connection(0);
}
signal_index = QMetaObjectPrivate::originalClone(smeta, signal_index);
- int signalOffset, methodOffset;
- computeOffsets(smeta, &signalOffset, &methodOffset);
- signal_index += signalOffset;
+ signal_index += QMetaObjectPrivate::signalOffset(smeta);
QByteArray tmp_method_name;
int membcode = extract_code(method);
if (signal_index < 0)
break;
signal_index = QMetaObjectPrivate::originalClone(smeta, signal_index);
- int signalOffset, methodOffset;
- computeOffsets(smeta, &signalOffset, &methodOffset);
- signal_index += signalOffset;
+ signal_index += QMetaObjectPrivate::signalOffset(smeta);
signal_found = true;
}
if (relative_index < 0)
return relative_index;
relative_index = QMetaObjectPrivate::originalClone(base, relative_index);
- int signalOffset, methodOffset;
- computeOffsets(base, &signalOffset, &methodOffset);
if (meta)
*meta = base;
- return relative_index + signalOffset;
+ return relative_index + QMetaObjectPrivate::signalOffset(base);
}
/*****************************************************************************
delete slotObj;
return QMetaObject::Connection(0);
}
- int signalOffset, methodOffset;
- computeOffsets(senderMetaObject, &signalOffset, &methodOffset);
- signal_index += signalOffset;
+ signal_index += QMetaObjectPrivate::signalOffset(senderMetaObject);
QObject *s = const_cast<QObject *>(sender);
QObject *r = const_cast<QObject *>(receiver);
qWarning("QObject::disconnect: signal not found in %s", senderMetaObject->className());
return false;
}
- int signalOffset, methodOffset;
- computeOffsets(senderMetaObject, &signalOffset, &methodOffset);
- signal_index += signalOffset;
+ signal_index += QMetaObjectPrivate::signalOffset(senderMetaObject);
}
return QMetaObjectPrivate::disconnect(sender, signal_index, senderMetaObject, receiver, -1, slot);