1 files changed, 17 insertions, 17 deletions

diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp
index 863b0153..f525b297 100644
--- a/kommander/executor/instance.cpp
+++ b/kommander/executor/instance.cpp
@@ -21,7 +21,7 @@
 #include <tdeglobal.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 /* QT INCLUDES */
 #include <tqdialog.h>
@@ -106,7 +106,7 @@ bool Instance::build(const KURL& fname)
   {
     TQFile inputFile;
     inputFile.open(IO_ReadOnly, stdin);
-    m_instance = KommanderFactory::create(TQT_TQIODEVICE(&inputFile));
+    m_instance = KommanderFactory::create(&inputFile);
   }
 
   // check if build was successful
@@ -121,7 +121,7 @@ bool Instance::build(const KURL& fname)
     window->setFileName(fname.path().local8Bit());
 
   // FIXME : Should verify that all of the widgets in the dialog derive from KommanderWidget
-  m_textInstance = kommanderWidget(TQT_TQOBJECT(m_instance));
+  m_textInstance = kommanderWidget(m_instance);
 
   if (!m_textInstance)  // Main dialog/window is not a Kommander widget - look for one
   {
@@ -158,13 +158,13 @@ bool Instance::run()
     return false;
 
   // Handle both dialogs and main windows
-  if (m_instance->inherits(TQDIALOG_OBJECT_NAME_STRING))
+  if (m_instance->inherits("TQDialog"))
     dynamic_cast<TQDialog*>((TQWidget*)m_instance)->exec();
-  else if (m_instance->inherits(TQMAINWINDOW_OBJECT_NAME_STRING))
+  else if (m_instance->inherits("TQMainWindow"))
   {
-    kapp->setMainWidget(m_instance);
+    tdeApp->setMainWidget(m_instance);
     dynamic_cast<TQMainWindow*>((TQWidget*)m_instance)->show();
-    kapp->exec();
+    tdeApp->exec();
   }
   else return false;
   return true;
@@ -234,14 +234,14 @@ bool Instance::isFileValid(const KURL& fname) const
 void Instance::setEnabled(const TQString& widgetName, bool enable)
 {
   TQObject* child = stringToWidget(widgetName);
-  if (child && child->inherits(TQWIDGET_OBJECT_NAME_STRING))
+  if (child && child->inherits("TQWidget"))
     ((TQWidget*)child)->setEnabled(enable);
 }
 
 void Instance::setVisible(const TQString& widgetName, bool visible)
 {
   TQObject* child = stringToWidget(widgetName);
-  if (child && child->inherits(TQWIDGET_OBJECT_NAME_STRING))
+  if (child && child->inherits("TQWidget"))
     ((TQWidget*)child)->setShown(visible);
 }
 
@@ -250,7 +250,7 @@ void Instance::setText(const TQString& widgetName, const TQString& text)
   TQObject* child = stringToWidget(widgetName);
   if (kommanderWidget(child))
     kommanderWidget(child)->handleDCOP(DCOP::setText, text);
-  else if (child && child->inherits(TQLABEL_OBJECT_NAME_STRING))
+  else if (child && child->inherits("TQLabel"))
   {
     TQLabel* label = (TQLabel*)child;
     if (label->pixmap())
@@ -269,7 +269,7 @@ TQString Instance::text(const TQString& widgetName)
   TQObject* child = stringToWidget(widgetName);
   if (kommanderWidget(child))
     return kommanderWidget(child)->handleDCOP(DCOP::text);
-  else if (child && child->inherits(TQLABEL_OBJECT_NAME_STRING))
+  else if (child && child->inherits("TQLabel"))
     return ((TQLabel*)child)->text();
   return TQString();
 }
@@ -279,7 +279,7 @@ void Instance::setSelection(const TQString& widgetName, const TQString& text)
   TQObject* child = stringToWidget(widgetName);
   if (kommanderWidget(child))
     kommanderWidget(child)->handleDCOP(DCOP::setSelection, text);
-  else if (child && child->inherits(TQLABEL_OBJECT_NAME_STRING))
+  else if (child && child->inherits("TQLabel"))
     ((TQLabel*)child)->setText(text);
 }
 
@@ -426,7 +426,7 @@ TQStringList Instance::associatedText(const TQString &widgetName)
 TQString Instance::type(const TQString& widget)
 {
   TQObject* child = stringToWidget(widget);  
-  if (child && child->inherits(TQWIDGET_OBJECT_NAME_STRING))
+  if (child && child->inherits("TQWidget"))
     return child->className();
   return TQString();
 }
@@ -437,10 +437,10 @@ TQStringList Instance::children(const TQString& parent, bool recursive)
   TQObject* child = stringToWidget(parent);
   TQObjectList* widgets;
   if (!child)
-     child = TQT_TQOBJECT(m_instance);
-  if (child->inherits(TQWIDGET_OBJECT_NAME_STRING))
+     child = m_instance;
+  if (child->inherits("TQWidget"))
   {
-    widgets = child->queryList(TQWIDGET_OBJECT_NAME_STRING, 0, false, recursive);
+    widgets = child->queryList("TQWidget", 0, false, recursive);
     for (TQObject* w = widgets->first(); w; w = widgets->next())
       if (w->name() && kommanderWidget(w))
         matching.append(w->name());
@@ -606,7 +606,7 @@ void Instance::setGlobal(const TQString& variableName, const TQString& value)
 
 TQObject* Instance::stringToWidget(const TQString& name)
 {
-  return m_instance->child(name);
+  return m_instance->child(name.utf8());
 }
 
 KommanderWidget* Instance::kommanderWidget(TQObject* object)