Replace various '#define' strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 9e553028bac0f0d934926318a7b13aa4d8474b27)

1 files changed, 11 insertions, 11 deletions

diff --git a/kommander/editor/connectioneditorimpl.cpp b/kommander/editor/connectioneditorimpl.cpp
index 05a3c2ad..05c1dc4c 100644
--- a/kommander/editor/connectioneditorimpl.cpp
+++ b/kommander/editor/connectioneditorimpl.cpp
@@ -93,9 +93,9 @@ ConnectionEditor::ConnectionEditor(TQWidget* parent, TQObject* sndr, TQObject* r
   : ConnectionEditorBase(parent, 0, true), m_formWindow(fw)
 {
   if (!rcvr || rcvr == m_formWindow)
-    rcvr = TQT_TQOBJECT(m_formWindow->mainContainer());
+    rcvr = m_formWindow->mainContainer();
   if (!sndr || sndr == m_formWindow)
-    sndr = TQT_TQOBJECT(m_formWindow->mainContainer());
+    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();
   }
@@ -155,12 +155,12 @@ bool ConnectionEditor::isSignalIgnored(const char *signal) const
 bool ConnectionEditor::isSlotIgnored(const TQMetaData* md) 
 {
   if (md->access != TQMetaData::Public && (md->access != TQMetaData::Protected ||
-      !m_formWindow->isMainContainer(TQT_TQOBJECT(m_receiver))))
+      !m_formWindow->isMainContainer(m_receiver)))
     return true;
   for (int i = 0; ignore_slots[i]; i++)
     if (!qstrcmp(md->name, ignore_slots[i]))
       return true;
-  if (!m_formWindow->isMainContainer(TQT_TQOBJECT(m_receiver)) && !qstrcmp(md->name, "close()"))
+  if (!m_formWindow->isMainContainer(m_receiver) && !qstrcmp(md->name, "close()"))
     return true;
   if (!qstrcmp(md->name, "setFocus()") && m_receiver->isWidgetType() &&
      ((TQWidget*)m_receiver)->focusPolicy() == TQWidget::NoFocus)
@@ -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;
 }
@@ -280,7 +280,7 @@ void ConnectionEditor::senderChanged(const TQString& s)
     if (!isSignalIgnored(it.current()) && !signalBox->findItem(it.current(), TQt::ExactMatch))
       signalBox->insertItem(it.current());
   if (m_sender == m_formWindow->mainContainer())
-    signalBox->insertStringList(MetaDataBase::signalList(TQT_TQOBJECT(m_formWindow)));
+    signalBox->insertStringList(MetaDataBase::signalList(m_formWindow));
   signalBox->sort();
   signalBox->setCurrentItem(signalBox->firstItem());
   // Update slots - some may (not) have their signal equivalents now.
@@ -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,