Replace tqt_mo_* defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/25/head
Michele Calgaro 1 year ago
parent 91afed5675
commit 67da3e67a7
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -154,19 +154,19 @@ bool ConnectionEditor::isSignalIgnored(const char *signal) const
bool ConnectionEditor::isSlotIgnored(const TQMetaData* md) bool ConnectionEditor::isSlotIgnored(const TQMetaData* md)
{ {
if (md->tqt_mo_access != TQMetaData::Public && (md->tqt_mo_access != TQMetaData::Protected || if (md->access != TQMetaData::Public && (md->access != TQMetaData::Protected ||
!m_formWindow->isMainContainer(TQT_TQOBJECT(m_receiver)))) !m_formWindow->isMainContainer(TQT_TQOBJECT(m_receiver))))
return true; return true;
for (int i = 0; ignore_slots[i]; i++) for (int i = 0; ignore_slots[i]; i++)
if (!qstrcmp(md->tqt_mo_ci_name, ignore_slots[i])) if (!qstrcmp(md->name, ignore_slots[i]))
return true; return true;
if (!m_formWindow->isMainContainer(TQT_TQOBJECT(m_receiver)) && !qstrcmp(md->tqt_mo_ci_name, "close()")) if (!m_formWindow->isMainContainer(TQT_TQOBJECT(m_receiver)) && !qstrcmp(md->name, "close()"))
return true; return true;
if (!qstrcmp(md->tqt_mo_ci_name, "setFocus()") && m_receiver->isWidgetType() && if (!qstrcmp(md->name, "setFocus()") && m_receiver->isWidgetType() &&
((TQWidget*)m_receiver)->focusPolicy() == TQ_NoFocus) ((TQWidget*)m_receiver)->focusPolicy() == TQ_NoFocus)
return true; return true;
for (int i = 0; i<comboSender->count(); i++) for (int i = 0; i<comboSender->count(); i++)
if (checkConnectArgs(MetaDataBase::normalizeSlot(signalBox->text(i)).latin1(), m_receiver, md->tqt_mo_ci_name)) if (checkConnectArgs(MetaDataBase::normalizeSlot(signalBox->text(i)).latin1(), m_receiver, md->name))
return false; return false;
return true; return true;
} }
@ -298,8 +298,8 @@ void ConnectionEditor::receiverChanged(const TQString& s)
for (int i = 0; i < n; ++i) for (int i = 0; i < n; ++i)
{ {
const TQMetaData* md = m_receiver->metaObject()->slot(i, true); const TQMetaData* md = m_receiver->metaObject()->slot(i, true);
if (!isSlotIgnored(md) && !slotBox->findItem(md->tqt_mo_ci_name, TQt::ExactMatch)) if (!isSlotIgnored(md) && !slotBox->findItem(md->name, TQt::ExactMatch))
slotBox->insertItem(md->tqt_mo_ci_name); slotBox->insertItem(md->name);
} }
slotBox->sort(); slotBox->sort();
slotBox->setCurrentItem(slotBox->firstItem()); slotBox->setCurrentItem(slotBox->firstItem());

Loading…
Cancel
Save