1 files changed, 107 insertions, 163 deletions

diff --git a/kommander/editor/mainwindow.cpp b/kommander/editor/mainwindow.cpp
index 0abb7de2..1d0c3cfb 100644
--- a/kommander/editor/mainwindow.cpp
+++ b/kommander/editor/mainwindow.cpp
@@ -18,6 +18,14 @@
 
 **********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifndef TQTDOCDIR
+#define TQTDOCDIR "/usr/share/tqt3/doc/html"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/stat.h>
@@ -81,7 +89,7 @@
 #include <tdemessagebox.h>
 #include <kommanderversion.h>
 #include <kommanderwidget.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
 #include <kstatusbar.h>
 #include <tdetoolbar.h>
 #include <kurl.h>
@@ -118,17 +126,17 @@ static TQString textNoAccel(const TQString& text)
 MainWindow::MainWindow(bool asClient)
   : KParts::DockMainWindow(0, "mainwindow", WType_TopLevel | WDestructiveClose | WGroupLeader),
       grd(10, 10), sGrid(true), snGrid(true), restoreConfig(true), splashScreen(true),
-      docPath("$TQTDIR/doc/html"), client(asClient),  databaseAutoEdit(false), previewing(false)
+      docPath(TQTDOCDIR), client(asClient),  databaseAutoEdit(false), previewing(false)
 {
   m_partManager = new KParts::PartManager(this);
-  //connect(m_partManager, TQT_SIGNAL(activePartChanged(KParts::Part * )),          this, TQT_SLOT(slotActivePartChanged(KParts::Part * )));
+  //connect(m_partManager, TQ_SIGNAL(activePartChanged(KParts::Part * )),          this, TQ_SLOT(slotActivePartChanged(KParts::Part * )));
 
   init_colors();
   inDebugMode = true;           //debugging kommander
 
   setupPlugins();
 
-  kapp->setMainWidget(this);
+  tdeApp->setMainWidget(this);
   self = this;
 
   prefDia = 0;
@@ -163,13 +171,13 @@ MainWindow::MainWindow(bool asClient)
   emit hasActiveWindow(false);
 
   lastPressWidget = 0;
-  kapp->installEventFilter(this);
+  tdeApp->installEventFilter(this);
 
-  TQSize as(kapp->desktop()->size());
+  TQSize as(tdeApp->desktop()->size());
   as -= TQSize(30, 30);
   resize(TQSize(1200, 1000).boundedTo(as));
 
-  connect(kapp->clipboard(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(clipboardChanged()));
+  connect(tdeApp->clipboard(), TQ_SIGNAL(dataChanged()), this, TQ_SLOT(clipboardChanged()));
   clipboardChanged();
   layoutChilds = false;
   layoutSelected = false;
@@ -179,24 +187,24 @@ MainWindow::MainWindow(bool asClient)
   readConfig();
 
   // hack to make WidgetFactory happy (so it knows TQWidget and TQDialog for resetting properties)
-  TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQWIDGET_OBJECT_NAME_STRING), this, 0, false);
+  TQWidget *w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQWidget"), this, 0, false);
   delete w;
   w = WidgetFactory::create(WidgetDatabase::idFromClassName("Dialog"), this, 0, false);
 
   delete w;
-  w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQLABEL_OBJECT_NAME_STRING), this, 0, false);
+  w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQLabel"), this, 0, false);
   delete w;
-  w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQTABWIDGET_OBJECT_NAME_STRING), this, 0, false);
+  w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQTabWidget"), this, 0, false);
   delete w;
-  w = WidgetFactory::create(WidgetDatabase::idFromClassName(TQFRAME_OBJECT_NAME_STRING), this, 0, false);
+  w = WidgetFactory::create(WidgetDatabase::idFromClassName("TQFrame"), this, 0, false);
   delete w;
 
-  assistant = new AssistProc(TQT_TQOBJECT(this), "Internal Assistant", assistantPath());
+  assistant = new AssistProc(this, "Internal Assistant", assistantPath());
   statusBar()->setSizeGripEnabled(true);
   SpecialInformation::registerSpecials();
 
   backupTimer = new TQTimer(this);
-  connect(backupTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotCreateBackups()));
+  connect(backupTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotCreateBackups()));
   backupTimer->start(1000*60*5); //fire it every five minutes
   //createGUI(0);
 
@@ -227,8 +235,8 @@ void MainWindow::setupMDI()
                                   PixmapChooser::NoSize));
   qworkspace->setPaletteBackgroundColor(TQColor(238, 238, 238));
   qworkspace->setScrollBarsEnabled(true);
-  connect(qworkspace, TQT_SIGNAL(windowActivated(TQWidget *)),
-          this, TQT_SLOT(activeWindowChanged(TQWidget *)));
+  connect(qworkspace, TQ_SIGNAL(windowActivated(TQWidget *)),
+          this, TQ_SLOT(activeWindowChanged(TQWidget *)));
   lastActiveFormWindow = 0;
   qworkspace->setAcceptDrops(true);
 }
@@ -286,7 +294,7 @@ void MainWindow::setupWorkspace()
   QCompletionEdit *edit = new QCompletionEdit(vbox);
   TQToolTip::add(edit, i18n("Start typing the buffer you want to switch to here (ALT+B)"));
   TQAccel *a = new TQAccel(this);
-  a->connectItem(a->insertItem(ALT + Key_B), edit, TQT_SLOT(setFocus()));
+  a->connectItem(a->insertItem(ALT + Key_B), edit, TQ_SLOT(setFocus()));
   wspace = new Workspace(vbox, this);
   wspace->setBufferEdit(edit);
   dw->setWidget(vbox);
@@ -417,7 +425,7 @@ void MainWindow::runForm()
   while ((editor = it.current()) != 0L) 
   {
     ++it;
-    static_cast<AssocTextEditor*>(TQT_TQWIDGET(editor))->save();
+    static_cast<AssocTextEditor*>(editor)->save();
   }
   delete editors;  
 
@@ -452,75 +460,11 @@ void MainWindow::runForm()
     TDEProcess* process = new TDEProcess;
     process->setUseShell(true);
     (*process) << "kmdr-executor" << TQString("\"%1\"").arg(form->formFile()->fileName());
-    connect(process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), messageLog,
-            TQT_SLOT(receivedStdout(TDEProcess*, char*, int)));
-    connect(process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), messageLog,
-            TQT_SLOT(receivedStderr(TDEProcess*, char*, int)));
-    connect(process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(closeRunningForm(TDEProcess*)));  
-    messageLog->clear(MessageLog::All);
-    previewing = process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
-  }
-}
-
-
-void MainWindow::runForm4()
-{
-  if (previewing)
-  {
-    KMessageBox::information(this, i18n("There is a dialog already running."), i18n("Run"));
-    return;
-  }
-  FormWindow* form = activeForm();
-  if (!form || !form->formFile())
-    return;
-
-  TQObjectList *editors = queryList("AssocTextEditor");
-  TQObjectListIt it(*editors);
-  TQObject *editor;
-
-  while ((editor = it.current()) != 0L) 
-  {
-    ++it;
-    static_cast<AssocTextEditor*>(TQT_TQWIDGET(editor))->save();
-  }
-  delete editors;  
-
-  if (form->formFile()->hasTempFileName())
-  {
-    if (!form->formFile()->saveAs())
-      return;
-  }
-
-  m_fileName = form->formFile()->fileName();
-  m_backupName = m_fileName + ".running";
-  m_modified = form->formFile()->isModified();
-    
-  bool readOnlyFile = !TQFileInfo(m_fileName).isWritable();
-  struct stat statbuf;
-  ::stat(m_fileName.local8Bit(), &statbuf);
-  if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_backupName), statbuf.st_mode, true))
-  {
-    KMessageBox::error(this, i18n("<qt>Cannot create temporary file <i>%1</i>.</qt>").arg(m_backupName));
-    return;
-  }
-  form->formFile()->setFileName(m_fileName);  
-  if (!readOnlyFile || m_modified)
-    form->formFile()->setModified(true);
-  if (form->formFile()->save(false))
-  {
-    if (!readOnlyFile && !TDEIO::NetAccess::file_copy(KURL::fromPathOrURL(m_fileName), KURL::fromPathOrURL(m_fileName + ".backup"), statbuf.st_mode, true))
-    {
-      KMessageBox::error(this, i18n("<qt>Cannot create backup file <i>%1</i>.</qt>").arg(m_fileName + ".backup"));
-    }
-    ::chmod(m_fileName.local8Bit(), S_IRWXU);
-    TDEProcess* process = new TDEProcess;
-    process->setUseShell(true);
-    (*process) << "kommander" << TQString("\"%1\"").arg(form->formFile()->fileName());
-    connect(process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), messageLog,
-            TQT_SLOT(receivedStdout(TDEProcess*, char*, int)));
-    connect(process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), messageLog,
-            TQT_SLOT(receivedStderr(TDEProcess*, char*, int)));
-    connect(process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(closeRunningForm(TDEProcess*)));  
+    connect(process, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), messageLog,
+            TQ_SLOT(receivedStdout(TDEProcess*, char*, int)));
+    connect(process, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), messageLog,
+            TQ_SLOT(receivedStderr(TDEProcess*, char*, int)));
+    connect(process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(closeRunningForm(TDEProcess*)));  
     messageLog->clear(MessageLog::All);
     previewing = process->start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
   }
@@ -554,9 +498,9 @@ void MainWindow::showProperties(TQObject *o)
   }
   TQWidget *w = (TQWidget*)o;
   setupHierarchyView();
-  FormWindow *fw = (FormWindow*)isAFormWindowChild(TQT_TQOBJECT(w));
+  FormWindow *fw = (FormWindow*)isAFormWindowChild(w);
   if (fw) {
-    propertyEditor->setWidget(TQT_TQOBJECT(w), fw);
+    propertyEditor->setWidget(w, fw);
     hierarchyView->setFormWindow(fw, w);
   } else {
     propertyEditor->setWidget(0, 0);
@@ -617,7 +561,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
                 }
                 break;
     case TQEvent::MouseButtonPress:
-      if (((TQMouseEvent*)e)->button() == Qt::MidButton && dynamic_cast<KommanderWidget *>(o))
+      if (((TQMouseEvent*)e)->button() == TQt::MidButton && dynamic_cast<KommanderWidget *>(o))
       {
         AssocTextEditor *editor = new AssocTextEditor((TQWidget*)o, formWindow(), propertyEditor, m_partManager,
              this, "AssocTextEditor", false); //deletes itself!
@@ -630,28 +574,28 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
         break;
       if (o && currentTool() == POINTER_TOOL && (o->inherits("QDesignerMenuBar") ||
            o->inherits("QDesignerToolBar") ||
-           (o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || o->inherits("QDesignerToolBarSeparator")) &&
+           (o->inherits("TQComboBox") || o->inherits("TQToolButton") || o->inherits("QDesignerToolBarSeparator")) &&
            o->parent() && o->parent()->inherits("QDesignerToolBar"))) {
         TQWidget *w = (TQWidget*)o;
-        if (w->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) || w->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) || w->inherits("QDesignerToolBarSeparator"))
+        if (w->inherits("TQToolButton") || w->inherits("TQComboBox") || w->inherits("QDesignerToolBarSeparator"))
           w = w->parentWidget();
         TQWidget *pw = w->parentWidget();
         while (pw) {
           if (pw->inherits("FormWindow")) {
-            ((FormWindow*)pw)->emitShowProperties(TQT_TQOBJECT(w));
+            ((FormWindow*)pw)->emitShowProperties(w);
             if (!o->inherits("QDesignerToolBar"))
-              return !o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && !o->inherits(TQMENUBAR_OBJECT_NAME_STRING) &&
-                  !o->inherits(TQCOMBOBOX_OBJECT_NAME_STRING) && !o->inherits("QDesignerToolBarSeparator");
+              return !o->inherits("TQToolButton") && !o->inherits("TQMenuBar") &&
+                  !o->inherits("TQComboBox") && !o->inherits("QDesignerToolBarSeparator");
           }
           pw = pw->parentWidget();
         }
            }
-           if (o && (o->inherits("QDesignerToolBar") || o->inherits(TQDOCKWINDOWHANDLE_OBJECT_NAME_STRING))
+           if (o && (o->inherits("QDesignerToolBar") || o->inherits("TQDockWindowHandle"))
                 && e->type() == TQEvent::ContextMenu)
              break;
            if (isAToolBarChild(o) && currentTool() != CONNECT_TOOL)
              break;
-           if (o && o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING))
+           if (o && o->inherits("TQSizeGrip"))
              break;
            if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator"))
              break;
@@ -669,7 +613,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
            }
            lastPressWidget = (TQWidget*)o;
            if (passiveInteractor)
-             TQTimer::singleShot(0, formWindow(), TQT_SLOT(visibilityChanged()));
+             TQTimer::singleShot(0, formWindow(), TQ_SLOT(visibilityChanged()));
            if (currentTool() == CONNECT_TOOL)
              return true;
            return !passiveInteractor;
@@ -677,7 +621,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
       lastPressWidget = 0;
       if (isAToolBarChild(o)  && currentTool() != CONNECT_TOOL)
         break;
-      if (o && o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING))
+      if (o && o->inherits("TQSizeGrip"))
         break;
       if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator"))
         break;
@@ -685,7 +629,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
         ((FormWindow*)w)->handleMouseRelease((TQMouseEvent*)e, ((FormWindow*)w)->designerWidget(o));
       if (passiveInteractor) {
         selectionChanged();
-        TQTimer::singleShot(0, formWindow(), TQT_SLOT(visibilityChanged()));
+        TQTimer::singleShot(0, formWindow(), TQ_SLOT(visibilityChanged()));
       }
       return !passiveInteractor;
     case TQEvent::MouseMove:
@@ -694,10 +638,10 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
       w = isAFormWindowChild(o);
       if (lastPressWidget != (TQWidget*)o && w &&
            !o->inherits("SizeHandle") && !o->inherits("OrderIndicator") &&
-           !o->inherits(TQPOPUPMENU_OBJECT_NAME_STRING) && !o->inherits(TQMENUBAR_OBJECT_NAME_STRING) &&
-           !o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING))
+           !o->inherits("TQPopupMenu") && !o->inherits("TQMenuBar") &&
+           !o->inherits("TQSizeGrip"))
         return true;
-      if (o && o->inherits(TQSIZEGRIP_OBJECT_NAME_STRING))
+      if (o && o->inherits("TQSizeGrip"))
         break;
       if (lastPressWidget != (TQWidget*)o ||
            (!w || o->inherits("SizeHandle") || o->inherits("OrderIndicator")))
@@ -718,8 +662,8 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
       break;
     case TQEvent::MouseButtonDblClick:
       if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator")) {
-        if (o && o->inherits(TQTOOLBUTTON_OBJECT_NAME_STRING) && ((TQToolButton*)o)->isOn() &&
-             o->parent() && o->parent()->inherits(TQTOOLBAR_OBJECT_NAME_STRING) && formWindow())
+        if (o && o->inherits("TQToolButton") && ((TQToolButton*)o)->isOn() &&
+             o->parent() && o->parent()->inherits("TQToolBar") && formWindow())
           formWindow()->setToolFixed();
         break;
       }
@@ -740,8 +684,8 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
     case TQEvent::Hide:
       if (!(w = isAFormWindowChild(o)) || o->inherits("SizeHandle") || o->inherits("OrderIndicator"))
         break;
-      if (((FormWindow*)w)->isWidgetSelected(TQT_TQOBJECT(o)))
-        ((FormWindow*)w)->selectWidget(TQT_TQOBJECT(o), false);
+      if (((FormWindow*)w)->isWidgetSelected(o))
+        ((FormWindow*)w)->selectWidget(o, false);
       break;
     case TQEvent::Enter:
     case TQEvent::Leave:
@@ -761,25 +705,25 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
     case TQEvent::Close:
       break;
     case TQEvent::DragEnter:
-      if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(qWorkspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()->viewport())) {
+      if (o == qWorkspace() || o == workspace() || o == workspace()->viewport()) {
         workspace()->contentsDragEnterEvent((TQDragEnterEvent*)e);
         return true;
       }
       break;
     case TQEvent::DragMove:
-      if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(qWorkspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()->viewport())) {
+      if (o == qWorkspace() || o == workspace() || o == workspace()->viewport()) {
         workspace()->contentsDragMoveEvent((TQDragMoveEvent*)e);
         return true;
       }
       break;
     case TQEvent::Drop:
-      if (TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(qWorkspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()) || TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(workspace()->viewport())) {
+      if (o == qWorkspace() || o == workspace() || o == workspace()->viewport()) {
         workspace()->contentsDropEvent((TQDropEvent*)e);
         return true;
       }
       break;
     case TQEvent::Show:
-      if (TQT_BASE_OBJECT(o) != TQT_BASE_OBJECT(this))
+      if (o != this)
         break;
       if (((TQShowEvent*)e)->spontaneous())
         break;
@@ -808,7 +752,7 @@ bool MainWindow::eventFilter(TQObject *o, TQEvent *e)
 
 TQWidget *MainWindow::isAFormWindowChild(TQObject *o) const
 {
-  if (o->parent() && o->parent()->inherits(TQWIZARD_OBJECT_NAME_STRING) && !o->inherits(TQPUSHBUTTON_OBJECT_NAME_STRING))
+  if (o->parent() && o->parent()->inherits("TQWizard") && !o->inherits("TQPushButton"))
     return 0;
   while (o) {
     if (o->inherits("FormWindow"))
@@ -859,16 +803,16 @@ void MainWindow::insertFormWindow(FormWindow *fw)
             "<p>You can have several forms open, and all open forms are listed "
             "in the <b>Form List</b>."));
 
-  connect(fw, TQT_SIGNAL(showProperties(TQObject *)),
-           this, TQT_SLOT(showProperties(TQObject *)));
-  connect(fw, TQT_SIGNAL(updateProperties(TQObject *)),
-           this, TQT_SLOT(updateProperties(TQObject *)));
-  connect(this, TQT_SIGNAL(currentToolChanged()),
-           fw, TQT_SLOT(currentToolChanged()));
-  connect(fw, TQT_SIGNAL(selectionChanged()),
-           this, TQT_SLOT(selectionChanged()));
-  connect(fw, TQT_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &)),
-           this, TQT_SLOT(updateUndoRedo(bool, bool, const TQString &, const TQString &)));
+  connect(fw, TQ_SIGNAL(showProperties(TQObject *)),
+           this, TQ_SLOT(showProperties(TQObject *)));
+  connect(fw, TQ_SIGNAL(updateProperties(TQObject *)),
+           this, TQ_SLOT(updateProperties(TQObject *)));
+  connect(this, TQ_SIGNAL(currentToolChanged()),
+           fw, TQ_SLOT(currentToolChanged()));
+  connect(fw, TQ_SIGNAL(selectionChanged()),
+           this, TQ_SLOT(selectionChanged()));
+  connect(fw, TQ_SIGNAL(undoRedoChanged(bool, bool, const TQString &, const TQString &)),
+           this, TQ_SLOT(updateUndoRedo(bool, bool, const TQString &, const TQString &)));
 
   fw->show();
   fw->currentToolChanged();
@@ -877,7 +821,7 @@ void MainWindow::insertFormWindow(FormWindow *fw)
   fw->mainContainer()->setCaption(fw->caption());
   WidgetFactory::saveDefaultProperties(fw->mainContainer(),
                                           WidgetDatabase::
-                                              idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(fw->mainContainer()))));
+                                              idFromClassName(WidgetFactory::classNameOf(fw->mainContainer())));
   activeWindowChanged(fw);
   emit formWindowsChanged();
 }
@@ -982,7 +926,7 @@ void MainWindow::popupFormWindowMenu(const TQPoint & gp, FormWindow *fw)
     setupRMBSpecialCommands(ids, commands, fw);
     setupRMBProperties(ids, commands, fw);
 
-    kapp->processEvents();
+    tdeApp->processEvents();
     int r = rmbFormWindow->exec(gp);
 
     handleRMBProperties(r, commands, fw);
@@ -1000,7 +944,7 @@ void MainWindow::popupWidgetMenu(const TQPoint &gp, FormWindow * /*fw*/, TQWidge
     setupRMBSpecialCommands(ids, commands, w);
     setupRMBProperties(ids, commands, w);
 
-    kapp->processEvents();
+    tdeApp->processEvents();
     int r = rmbWidgets->exec(gp);
 
     handleRMBProperties(r, commands, w);
@@ -1013,18 +957,18 @@ void MainWindow::popupWidgetMenu(const TQPoint &gp, FormWindow * /*fw*/, TQWidge
 void MainWindow::setupRMBProperties(TQValueList<int> &ids, TQMap<TQString, int> &props, TQWidget *w)
 {
     const TQMetaProperty* text = w->metaObject()->property(w->metaObject()->findProperty("text", true), true);
-    if (text && qstrcmp(text->type(), TQSTRING_OBJECT_NAME_STRING) != 0)
+    if (text && qstrcmp(text->type(), "TQString") != 0)
         text = 0;
     const TQMetaProperty* title = w->metaObject()->property(w->metaObject()->findProperty("title", true), true);
-    if (title && qstrcmp(title->type(), TQSTRING_OBJECT_NAME_STRING) != 0)
+    if (title && qstrcmp(title->type(), "TQString") != 0)
         title = 0;
     const TQMetaProperty* pagetitle =
         w->metaObject()->property(w->metaObject()->findProperty("pageTitle", true), true);
-    if (pagetitle && qstrcmp(pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0)
+    if (pagetitle && qstrcmp(pagetitle->type(), "TQString") != 0)
         pagetitle = 0;
     const TQMetaProperty* pixmap =
         w->metaObject()->property(w->metaObject()->findProperty("pixmap", true), true);
-    if (pixmap && qstrcmp(pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0)
+    if (pixmap && qstrcmp(pixmap->type(), "TQPixmap") != 0)
         pixmap = 0;
 
     if (text && text->designable(w) ||
@@ -1038,7 +982,7 @@ void MainWindow::setupRMBProperties(TQValueList<int> &ids, TQMap<TQString, int>
             ids << (id = rmbWidgets->insertItem(i18n("Choose Pixmap..."), -1, 0));
             props.insert("pixmap", id);
         }
-        if (text && text->designable(w) && !w->inherits(TQTEXTEDIT_OBJECT_NAME_STRING)) {
+        if (text && text->designable(w) && !w->inherits("TQTextEdit")) {
             ids << (id = rmbWidgets->insertItem(i18n("Edit Text..."), -1, 0));
             props.insert("text", id);
         }
@@ -1068,7 +1012,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString,
             commands.insert("assoc", id);
     }
 
-    if (w->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) {
+    if (w->inherits("TQTabWidget")) {
         if (ids.isEmpty())
             ids << rmbWidgets->insertSeparator(0);
         if (((QDesignerTabWidget*)w)->count() > 1) {
@@ -1078,7 +1022,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString,
         ids << (id = rmbWidgets->insertItem(i18n("Add Page"), -1, 0));
         commands.insert("add", id);
     }
-     if (w->inherits(TQTOOLBOX_OBJECT_NAME_STRING)) {
+     if (w->inherits("TQToolBox")) {
         if (ids.isEmpty())
             ids << rmbWidgets->insertSeparator(0);
         if (((TQToolBox*)w)->count() > 1) {
@@ -1088,7 +1032,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString,
         ids << (id = rmbWidgets->insertItem(i18n("Add Page"), -1, 0));
         commands.insert("add", id);
     }
-   if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w)))))
+   if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w))))
     {
         if (ids.isEmpty())
             ids << rmbWidgets->insertSeparator(0);
@@ -1113,7 +1057,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString,
             commands.insert("assoc", id);
     }
 
-    if (fw->mainContainer()->inherits(TQWIZARD_OBJECT_NAME_STRING)) {
+    if (fw->mainContainer()->inherits("TQWizard")) {
         if (ids.isEmpty())
             ids << rmbFormWindow->insertSeparator(0);
 
@@ -1131,7 +1075,7 @@ void MainWindow::setupRMBSpecialCommands(TQValueList<int> &ids, TQMap<TQString,
         ids << (id = rmbFormWindow->insertItem(i18n("Edit Pages..."), -1, 0));
         commands.insert("edit", id);
 
-    } else if (fw->mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) {
+    } else if (fw->mainContainer()->inherits("TQMainWindow")) {
         if (ids.isEmpty())
             ids << rmbFormWindow->insertSeparator(0);
         ids << (id = rmbFormWindow->insertItem(i18n("Add Menu Item"), -1, 0));
@@ -1146,7 +1090,7 @@ void MainWindow::handleRMBProperties(int id, TQMap<TQString, int> &props, TQWidg
     if (id == props[ "text" ]) {
         bool ok = false;
         TQString text;
-        if (w->inherits(TQTEXTVIEW_OBJECT_NAME_STRING) || w->inherits(TQLABEL_OBJECT_NAME_STRING)) {
+        if (w->inherits("TQTextView") || w->inherits("TQLabel")) {
             text = TextEditor::getText(this, w->property("text").toString());
             ok = !text.isEmpty();
         } else {
@@ -1154,48 +1098,48 @@ void MainWindow::handleRMBProperties(int id, TQMap<TQString, int> &props, TQWidg
         }
         if (ok) {
             TQString pn(i18n("Set the 'text' of '%1'").arg(w->name()));
-            SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
+            SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor,
                                                               "text", w->property("text"),
                                                               text, TQString(), TQString());
             cmd->execute();
             formWindow()->commandHistory()->addCommand(cmd);
-            MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "text", true);
+            MetaDataBase::setPropertyChanged(w, "text", true);
         }
     } else if (id == props[ "title" ]) {
         bool ok = false;
         TQString title = KInputDialog::getText(i18n("Title"), i18n("New title:"), w->property("title").toString(), &ok, this);
         if (ok) {
             TQString pn(i18n("Set the 'title' of '%1'").arg(w->name()));
-            SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
+            SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor,
                                                               "title", w->property("title"),
                                                               title, TQString(), TQString());
             cmd->execute();
             formWindow()->commandHistory()->addCommand(cmd);
-            MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "title", true);
+            MetaDataBase::setPropertyChanged(w, "title", true);
         }
     } else if (id == props[ "pagetitle" ]) {
         bool ok = false;
         TQString text = KInputDialog::getText(i18n("Page Title"), i18n("New page title:"), w->property("pageTitle").toString(), &ok, this);
         if (ok) {
             TQString pn(i18n("Set the 'pageTitle' of '%1'").arg(w->name()));
-            SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
+            SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor,
                                                               "pageTitle", w->property("pageTitle"),
                                                               text, TQString(), TQString());
             cmd->execute();
             formWindow()->commandHistory()->addCommand(cmd);
-            MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "pageTitle", true);
+            MetaDataBase::setPropertyChanged(w, "pageTitle", true);
         }
     } else if (id == props[ "pixmap" ]) {
         TQPixmap oldPix = TQVariant(w->property("pixmap")).toPixmap();
         TQPixmap pix = qChoosePixmap(this, formWindow(), oldPix);
         if (!pix.isNull()) {
             TQString pn(i18n("Set the 'pixmap' of '%1'").arg(w->name()));
-            SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
+            SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor,
                                                               "pixmap", w->property("pixmap"),
                                                               pix, TQString(), TQString());
             cmd->execute();
             formWindow()->commandHistory()->addCommand(cmd);
-            MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "pixmap", true);
+            MetaDataBase::setPropertyChanged(w, "pixmap", true);
         }
     }
 }
@@ -1211,7 +1155,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
          editor->show();
     }
 
-    if (w->inherits(TQTABWIDGET_OBJECT_NAME_STRING)) {
+    if (w->inherits("TQTabWidget")) {
         TQTabWidget *tw = (TQTabWidget*)w;
         if (id == commands[ "add" ]) {
             AddTabPageCommand *cmd = new AddTabPageCommand(i18n("Add Page to %1").arg(tw->name()), formWindow(),
@@ -1229,7 +1173,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
             }
         }
     }
-    if (w->inherits(TQTOOLBOX_OBJECT_NAME_STRING)) {
+    if (w->inherits("TQToolBox")) {
         TQToolBox *tw = (TQToolBox*)w;
         if (id == commands[ "add" ]) {
             AddToolBoxPageCommand *cmd = new AddToolBoxPageCommand(i18n("Add Page to %1").arg(tw->name()), formWindow(),
@@ -1247,9 +1191,9 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
             }
         }
     }
-    if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) {
+    if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)))) {
         if (id == commands[ "edit" ])
-            WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))), this, w, formWindow());
+            WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)), this, w, formWindow());
     }
 }
 
@@ -1264,7 +1208,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
     }
 
 
-    if (fw->mainContainer()->inherits(TQWIZARD_OBJECT_NAME_STRING)) {
+    if (fw->mainContainer()->inherits("TQWizard")) {
         TQWizard *wiz = (TQWizard*)fw->mainContainer();
         if (id == commands[ "add" ]) {
             AddWizardPageCommand *cmd = new AddWizardPageCommand(i18n("Add Page to %1").arg(wiz->name()), formWindow(),
@@ -1297,7 +1241,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
                 cmd->execute();
             }
         }
-    } else if (fw->mainContainer()->inherits(TQMAINWINDOW_OBJECT_NAME_STRING)) {
+    } else if (fw->mainContainer()->inherits("TQMainWindow")) {
         TQMainWindow *mw = (TQMainWindow*)fw->mainContainer();
         if (id == commands[ "add_toolbar" ]) {
             AddToolBarCommand *cmd = new AddToolBarCommand(i18n("Add Toolbar to '%1'").arg(formWindow()->name()), formWindow(), mw);
@@ -1313,7 +1257,7 @@ void MainWindow::handleRMBSpecialCommands(int id, TQMap<TQString, int> &commands
 
 void MainWindow::clipboardChanged()
 {
-    TQString text(kapp->clipboard()->text());
+    TQString text(tdeApp->clipboard()->text());
     TQString start("<!DOCTYPE UI-SELECTION>");
     actionEditPaste->setEnabled(text.left(start.length()) == start);
 }
@@ -1374,7 +1318,7 @@ void MainWindow::selectionChanged()
         breakLayout = laidout > 0;
     } else if (selectedWidgets == 1) {
         TQWidget *w = widgets.first();
-        bool isContainer = WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w)))) ||
+        bool isContainer = WidgetDatabase::isContainer(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w))) ||
                            w == formWindow()->mainContainer();
         actionEditAdjustSize->setEnabled(!w->parentWidget() ||
                                           WidgetFactory::layoutType(w->parentWidget()) == WidgetFactory::NoLayout);
@@ -1384,7 +1328,7 @@ void MainWindow::selectionChanged()
             actionEditVLayout->setEnabled(false);
             actionEditGridLayout->setEnabled(false);
             if (w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) {
-                actionEditBreakLayout->setEnabled(!isAToolBarChild(TQT_TQOBJECT(w)));
+                actionEditBreakLayout->setEnabled(!isAToolBarChild(w));
                 breakLayout = true;
             } else {
                 actionEditBreakLayout->setEnabled(false);
@@ -1404,14 +1348,14 @@ void MainWindow::selectionChanged()
                     layoutChilds = true;
                 }
                 if (w->parentWidget() && WidgetFactory::layoutType(w->parentWidget()) != WidgetFactory::NoLayout) {
-                    actionEditBreakLayout->setEnabled(!isAToolBarChild(TQT_TQOBJECT(w)));
+                    actionEditBreakLayout->setEnabled(!isAToolBarChild(w));
                     breakLayout = true;
                 }
             } else {
                 actionEditHLayout->setEnabled(false);
                 actionEditVLayout->setEnabled(false);
                 actionEditGridLayout->setEnabled(false);
-                actionEditBreakLayout->setEnabled(!isAToolBarChild(TQT_TQOBJECT(w)));
+                actionEditBreakLayout->setEnabled(!isAToolBarChild(w));
                 breakLayout = true;
             }
         }
@@ -1448,7 +1392,7 @@ void MainWindow::selectionChanged()
 
 void MainWindow::writeConfig()
 {
-  TDEConfig* config = kapp->config();
+  TDEConfig* config = tdeApp->config();
 
   config->setGroup("General");
   config->writeEntry("RestoreWorkspace", restoreConfig);
@@ -1485,7 +1429,7 @@ void MainWindow::writeConfig()
 
 void MainWindow::readConfig()
 {
-  TDEConfig *config = kapp->config();
+  TDEConfig *config = tdeApp->config();
 
   config->setGroup("General");
   restoreConfig = config->readBoolEntry("RestoreWorkspace", true);
@@ -1620,9 +1564,9 @@ ActionEditor *MainWindow::actioneditor() const
 
 bool MainWindow::openEditor(TQWidget* w, FormWindow*)
 {
-    if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))))) {
+    if (WidgetFactory::hasSpecialEditor(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)))) {
         statusBar()->message(i18n("Edit %1...").arg(w->className()));
-        WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(TQT_TQOBJECT(w))), this, w, formWindow());
+        WidgetFactory::editWidget(WidgetDatabase::idFromClassName(WidgetFactory::classNameOf(w)), this, w, formWindow());
         statusBar()->clear();
         return true;
     }
@@ -1632,7 +1576,7 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*)
     if (text && text->designable(w)) {
         bool ok = false;
         TQString text;
-        if (w->inherits(TQTEXTVIEW_OBJECT_NAME_STRING) || w->inherits(TQLABEL_OBJECT_NAME_STRING)) {
+        if (w->inherits("TQTextView") || w->inherits("TQLabel")) {
             text = TextEditor::getText(this, w->property("text").toString());
             ok = !text.isEmpty();
         } else {
@@ -1640,12 +1584,12 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*)
         }
         if (ok) {
             TQString pn(i18n("Set the 'text' of '%2'").arg(w->name()));
-            SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
+            SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor,
                                                               "text", w->property("text"),
                                                               text, TQString(), TQString());
             cmd->execute();
             formWindow()->commandHistory()->addCommand(cmd);
-            MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "text", true);
+            MetaDataBase::setPropertyChanged(w, "text", true);
         }
         return true;
     }
@@ -1655,12 +1599,12 @@ bool MainWindow::openEditor(TQWidget* w, FormWindow*)
         text = KInputDialog::getText(i18n("Title"), i18n("New title:"), w->property("title").toString(), &ok, this);
         if (ok) {
             TQString pn(i18n("Set the 'title' of '%2'").arg(w->name()));
-            SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), TQT_TQOBJECT(w), propertyEditor,
+            SetPropertyCommand *cmd = new SetPropertyCommand(pn, formWindow(), w, propertyEditor,
                                                               "title", w->property("title"),
                                                               text, TQString(), TQString());
             cmd->execute();
             formWindow()->commandHistory()->addCommand(cmd);
-            MetaDataBase::setPropertyChanged(TQT_TQOBJECT(w), "title", true);
+            MetaDataBase::setPropertyChanged(w, "title", true);
         }
         return true;
     }