diff options
| -rw-r--r-- | kommander/editor/connectioneditorimpl.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp index 98286498..23088e69 100644 --- a/kommander/editor/connectioneditorimpl.cpp +++ b/kommander/editor/connectioneditorimpl.cpp @@ -154,19 +154,19 @@ bool ConnectionEditor::isSignalIgnored(const char *signal) const 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)))) return true; 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; - 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; - 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) return true; 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 true; } @@ -298,8 +298,8 @@ void ConnectionEditor::receiverChanged(const TQString& s) for (int i = 0; i < n; ++i) { const TQMetaData* md = m_receiver->metaObject()->slot(i, true); - if (!isSlotIgnored(md) && !slotBox->findItem(md->tqt_mo_ci_name, TQt::ExactMatch)) - slotBox->insertItem(md->tqt_mo_ci_name); + if (!isSlotIgnored(md) && !slotBox->findItem(md->name, TQt::ExactMatch)) + slotBox->insertItem(md->name); } slotBox->sort(); slotBox->setCurrentItem(slotBox->firstItem()); |