summaryrefslogtreecommitdiffstats
path: root/kommander/editor/connectioneditorimpl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kommander/editor/connectioneditorimpl.cpp')
-rw-r--r--kommander/editor/connectioneditorimpl.cpp66
1 files changed, 33 insertions, 33 deletions
diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp
index 2b57437f..e9ae6738 100644
--- a/kommander/editor/connectioneditorimpl.cpp
+++ b/kommander/editor/connectioneditorimpl.cpp
@@ -92,10 +92,10 @@ static const char *const ignore_signals[] = {
ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* rcvr, FormWindow* fw)
: ConnectionEditorBase(parent, 0, true), m_formWindow(fw)
{
- if (!rcvr || TQT_BASE_OBJECT(rcvr) == TQT_BASE_OBJECT(m_formWindow))
- rcvr = TQT_TQOBJECT(m_formWindow->mainContainer());
- if (!sndr || TQT_BASE_OBJECT(sndr) == TQT_BASE_OBJECT(m_formWindow))
- sndr = TQT_TQOBJECT(m_formWindow->mainContainer());
+ if (!rcvr || rcvr == m_formWindow)
+ rcvr = m_formWindow->mainContainer();
+ if (!sndr || sndr == m_formWindow)
+ sndr = m_formWindow->mainContainer();
m_sender = sndr;
m_receiver = rcvr;
@@ -108,7 +108,7 @@ ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* r
!it.current()->inherits("TQLayoutWidget") &&
!it.current()->inherits("Spacer") &&
qstrcmp(it.current()->name(), "central widget") &&
- !m_formWindow->isMainContainer(TQT_TQOBJECT(it.current())) &&
+ !m_formWindow->isMainContainer(it.current()) &&
!lst.contains(it.current()->name()))
lst << it.current()->name();
}
@@ -128,16 +128,16 @@ ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* r
updateDisconnectButton();
// Connections
- connect(comboSender, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(senderChanged(const TQString&)));
- connect(comboReceiver, TQT_SIGNAL(activated(const TQString&)), TQT_SLOT(receiverChanged(const TQString&)));
- connect(signalBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateConnectButton()));
- connect(slotBox, TQT_SIGNAL(selectionChanged()), TQT_SLOT(updateConnectButton()));
- connect(connectButton, TQT_SIGNAL(clicked()), TQT_SLOT(connectClicked()));
- connect(disconnectButton, TQT_SIGNAL(clicked()), TQT_SLOT(disconnectClicked()));
- connect(okButton, TQT_SIGNAL(clicked()), TQT_SLOT(okClicked()));
- connect(cancelButton, TQT_SIGNAL(clicked()), TQT_SLOT(cancelClicked()));
- connect(signalBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(connectClicked()));
- connect(slotBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(connectClicked()));
+ connect(comboSender, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(senderChanged(const TQString&)));
+ connect(comboReceiver, TQ_SIGNAL(activated(const TQString&)), TQ_SLOT(receiverChanged(const TQString&)));
+ connect(signalBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateConnectButton()));
+ connect(slotBox, TQ_SIGNAL(selectionChanged()), TQ_SLOT(updateConnectButton()));
+ connect(connectButton, TQ_SIGNAL(clicked()), TQ_SLOT(connectClicked()));
+ connect(disconnectButton, TQ_SIGNAL(clicked()), TQ_SLOT(disconnectClicked()));
+ connect(okButton, TQ_SIGNAL(clicked()), TQ_SLOT(okClicked()));
+ connect(cancelButton, TQ_SIGNAL(clicked()), TQ_SLOT(cancelClicked()));
+ connect(signalBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), TQ_SLOT(connectClicked()));
+ connect(slotBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), TQ_SLOT(connectClicked()));
}
ConnectionEditor::~ConnectionEditor()
@@ -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 ||
- !m_formWindow->isMainContainer(TQT_TQOBJECT(m_receiver))))
+ if (md->access != TQMetaData::Public && (md->access != TQMetaData::Protected ||
+ !m_formWindow->isMainContainer(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(m_receiver) && !qstrcmp(md->name, "close()"))
return true;
- if (!qstrcmp(md->tqt_mo_ci_name, "setFocus()") && m_receiver->isWidgetType() &&
- ((TQWidget*)m_receiver)->focusPolicy() == TQ_NoFocus)
+ if (!qstrcmp(md->name, "setFocus()") && m_receiver->isWidgetType() &&
+ ((TQWidget*)m_receiver)->focusPolicy() == TQWidget::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;
}
@@ -175,11 +175,11 @@ TQObject* ConnectionEditor::objectByName(const TQString& s) const
{
for (TQPtrDictIterator <TQWidget> it(*m_formWindow->widgets()); it.current(); ++it)
if (TQString(it.current()->name()) == s)
- return TQT_TQOBJECT(it.current());
+ return it.current();
for (TQPtrListIterator<TQAction> it(m_formWindow->actionList()); it.current(); ++it)
if (TQString(it.current()->name()) == s)
- return TQT_TQOBJECT(it.current());
+ return it.current();
return 0;
}
@@ -194,8 +194,8 @@ void ConnectionEditor::connectClicked()
return;
MetaDataBase::Connection conn;
conn.sender = m_sender;
- conn.signal = signalBox->currentText();
- conn.slot = slotBox->currentText();
+ conn.signal = signalBox->currentText().utf8();
+ conn.slot = slotBox->currentText().utf8();
conn.receiver = m_receiver;
TDEListViewItem *i = new TDEListViewItem(connectionView, m_sender->name(), conn.signal, m_receiver->name(),
conn.slot);
@@ -279,8 +279,8 @@ void ConnectionEditor::senderChanged(const TQString& s)
for (TQStrListIterator it(p_sigs); it.current(); ++it)
if (!isSignalIgnored(it.current()) && !signalBox->findItem(it.current(), TQt::ExactMatch))
signalBox->insertItem(it.current());
- if (TQT_BASE_OBJECT(m_sender) == TQT_BASE_OBJECT(m_formWindow->mainContainer()))
- signalBox->insertStringList(MetaDataBase::signalList(TQT_TQOBJECT(m_formWindow)));
+ if (m_sender == m_formWindow->mainContainer())
+ signalBox->insertStringList(MetaDataBase::signalList(m_formWindow));
signalBox->sort();
signalBox->setCurrentItem(signalBox->firstItem());
// Update slots - some may (not) have their signal equivalents now.
@@ -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());
@@ -336,14 +336,14 @@ void ConnectionEditor::fillConnectionsList()
{
connectionView->clear();
m_connections.clear();
- m_oldConnections = MetaDataBase::connections(TQT_TQOBJECT(m_formWindow));
+ m_oldConnections = MetaDataBase::connections(m_formWindow);
if (!m_oldConnections.isEmpty())
{
TQValueList <MetaDataBase::Connection>::Iterator it = m_oldConnections.begin();
for (; it != m_oldConnections.end(); ++it)
{
- if (m_formWindow->isMainContainer(TQT_TQOBJECT((*it).receiver)) &&
- !MetaDataBase::hasSlot(TQT_TQOBJECT(m_formWindow), MetaDataBase::normalizeSlot((*it).slot).latin1()))
+ if (m_formWindow->isMainContainer((*it).receiver) &&
+ !MetaDataBase::hasSlot(m_formWindow, MetaDataBase::normalizeSlot((*it).slot).latin1()))
continue;
MetaDataBase::Connection conn = *it;
TDEListViewItem *i = new TDEListViewItem(connectionView, conn.sender->name(), conn.signal,
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-16 00:55:17 +0000