1 files changed, 7 insertions, 7 deletions

diff --git a/kommander/editor/newformimpl.cpp b/kommander/editor/newformimpl.cpp
index 7b8e330b..778307a5 100644
--- a/kommander/editor/newformimpl.cpp
+++ b/kommander/editor/newformimpl.cpp
@@ -41,7 +41,7 @@
 
 #include <tdelocale.h>
 #include <tdeglobal.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "dialog.h"
 
@@ -56,8 +56,8 @@ void FormItem::insert()
   TQString n = "Form" + TQString::number(++_forms);
   FormWindow *fw = 0;
   FormFile *ff = new FormFile(FormFile::createUnnamedFileName(), true);
-  fw = new FormWindow(ff, MainWindow::self, MainWindow::self->qWorkspace(), n);
-  MetaDataBase::addEntry(TQT_TQOBJECT(fw));
+  fw = new FormWindow(ff, MainWindow::self, MainWindow::self->qWorkspace(), n.utf8());
+  MetaDataBase::addEntry(fw);
   TQWidget *w = 0L;
   if (fType == Dialog) 
   {
@@ -72,7 +72,7 @@ void FormItem::insert()
   if (w)
   {
     w->setProperty("useInternalParser", true);
-    MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "useInternalParser", true);
+    MetaDataBase::setPropertyChanged(w, "useInternalParser", true);
   }
   fw->setCaption(n);
   fw->resize(600, 480);
@@ -81,7 +81,7 @@ void FormItem::insert()
   // the wizard might have changed a lot, lets update everything
   MainWindow::self->actioneditor()->setFormWindow(fw);
   MainWindow::self->objectHierarchy()->setFormWindow(fw, fw);
-  fw->killAccels(TQT_TQOBJECT(fw));
+  fw->killAccels(fw);
   fw->setFocus();
 }
 
@@ -107,7 +107,7 @@ static void unifyFormName(FormWindow *fw, TQWorkspace *qworkspace)
   int i = 1;
   while (lst.findIndex(n) != -1)
     n = origName + TQString::number(i++);
-  fw->setName(n);
+  fw->setName(n.utf8());
   fw->setCaption(n);
 }
 
@@ -138,7 +138,7 @@ void CustomFormItem::insert()
 NewForm::NewForm(TQWidget *parent, const TQString &templatePath)
     : NewFormBase(parent, 0, true)
 {
-  connect(helpButton, TQT_SIGNAL(clicked()), MainWindow::self, TQT_SLOT(showDialogHelp()));
+  connect(helpButton, TQ_SIGNAL(clicked()), MainWindow::self, TQ_SLOT(showDialogHelp()));
 
   TQIconViewItem *cur = 0;
   FormItem *fi = new FormItem(templateView, i18n("Dialog"));