1 files changed, 14 insertions, 14 deletions

diff --git a/kommander/editor/assoctexteditorimpl.cpp b/kommander/editor/assoctexteditorimpl.cpp
index 1c1b7bbe..93e33b17 100644
--- a/kommander/editor/assoctexteditorimpl.cpp
+++ b/kommander/editor/assoctexteditorimpl.cpp
@@ -89,7 +89,7 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form,
       break;
     }
 
-  doc = KTextEditor::createDocument ("libkatepart", TQT_TQOBJECT(a_parent), "KTextEditor::Document");
+  doc = KTextEditor::createDocument ("libkatepart", a_parent, "KTextEditor::Document");
   TQGridLayout *layout = new TQGridLayout(editorFrame, 1, 1);
   view = doc->createView(editorFrame);
   layout->addWidget(view, 1,1);
@@ -138,7 +138,7 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form,
   readOnlyAction = view->actionCollection()->action("tools_toggle_write_lock");
   popup->insertSeparator();
   highlightPopup = new TDEPopupMenu(popup);
-  connect(highlightPopup, TQT_SIGNAL(activated(int)), TQT_SLOT(slotHighlightingChanged(int)));
+  connect(highlightPopup, TQ_SIGNAL(activated(int)), TQ_SLOT(slotHighlightingChanged(int)));
 
   popup->insertItem(i18n("&Highlighting"), highlightPopup);
 
@@ -151,13 +151,13 @@ AssocTextEditor::AssocTextEditor(TQWidget *a_widget, FormWindow* a_form,
      readOnlyAction->activate();
   setWidget(a_widget);
 
-  connect(doc, TQT_SIGNAL(textChanged()), TQT_SLOT(textEditChanged()));
-  connect(widgetsComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(widgetChanged(int)));
-  connect(stateComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(stateChanged(int)));
-  connect(filePushButton, TQT_SIGNAL(clicked()), TQT_SLOT(insertFile()));
-  connect(functionButton, TQT_SIGNAL(clicked()), TQT_SLOT(insertFunction()));
-  connect(widgetComboBox, TQT_SIGNAL(activated(int)), TQT_SLOT(insertWidgetName(int)));
-  connect(treeWidgetButton, TQT_SIGNAL(clicked()), TQT_SLOT(selectWidget()));
+  connect(doc, TQ_SIGNAL(textChanged()), TQ_SLOT(textEditChanged()));
+  connect(widgetsComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(widgetChanged(int)));
+  connect(stateComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(stateChanged(int)));
+  connect(filePushButton, TQ_SIGNAL(clicked()), TQ_SLOT(insertFile()));
+  connect(functionButton, TQ_SIGNAL(clicked()), TQ_SLOT(insertFunction()));
+  connect(widgetComboBox, TQ_SIGNAL(activated(int)), TQ_SLOT(insertWidgetName(int)));
+  connect(treeWidgetButton, TQ_SIGNAL(clicked()), TQ_SLOT(selectWidget()));
 
   view->setFocus();
 }
@@ -270,21 +270,21 @@ void AssocTextEditor::save() const
   {
     TQString text = i18n("Set the \'text association\' of \'%1\'").arg(m_widget->name());
     SetPropertyCommand *cmd  = new SetPropertyCommand(text, m_formWindow,
-        TQT_TQOBJECT(m_widget), m_propertyEditor, "associations", atw->associatedText(),
+        m_widget, m_propertyEditor, "associations", atw->associatedText(),
         associatedText(), TQString(), TQString(), false);
     cmd->execute();
     m_formWindow->commandHistory()->addCommand(cmd);
-    MetaDataBase::setPropertyChanged(TQT_TQOBJECT(m_widget), "associations", true);
+    MetaDataBase::setPropertyChanged(m_widget, "associations", true);
   }
   if (atw->populationText() != populationText())
   {
     TQString text = i18n("Set the \'population text\' of \'%1\'").arg(m_widget->name());
-    SetPropertyCommand *cmd  = new SetPropertyCommand(text, m_formWindow, TQT_TQOBJECT(m_widget),
+    SetPropertyCommand *cmd  = new SetPropertyCommand(text, m_formWindow, m_widget,
         m_propertyEditor, "populationText", atw->populationText(),
         populationText(), TQString(), TQString(), false);
     cmd->execute();
     m_formWindow->commandHistory()->addCommand(cmd);
-    MetaDataBase::setPropertyChanged(TQT_TQOBJECT(m_widget), "populationText", true);
+    MetaDataBase::setPropertyChanged(m_widget, "populationText", true);
   }
 }
 
@@ -305,7 +305,7 @@ TQString AssocTextEditor::populationText() const
 TQStringList AssocTextEditor::buildWidgetList()
 {
   TQStringList widgetList;
-  TQObject* thisObject = TQT_TQOBJECT(m_formWindow->mainContainer());
+  TQObject* thisObject = m_formWindow->mainContainer();
   TQObjectList *objectList = thisObject->queryList();
   objectList->prepend(thisObject);