diff options
Diffstat (limited to 'kommander/executor/instance.cpp')
| -rw-r--r-- | kommander/executor/instance.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp index e23a206a..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 { @@ -162,9 +162,9 @@ bool Instance::run() dynamic_cast<TQDialog*>((TQWidget*)m_instance)->exec(); 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; @@ -437,7 +437,7 @@ TQStringList Instance::children(const TQString& parent, bool recursive) TQObject* child = stringToWidget(parent); TQObjectList* widgets; if (!child) - child = TQT_TQOBJECT(m_instance); + child = m_instance; if (child->inherits("TQWidget")) { widgets = child->queryList("TQWidget", 0, false, recursive); @@ -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) |