From dc6b8e72fed2586239e3514819238c520636c9d9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:54:04 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1157656 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kommander/executor/dcopkommanderif.h | 100 +++++----- kommander/executor/instance.cpp | 362 +++++++++++++++++------------------ kommander/executor/instance.h | 126 ++++++------ kommander/executor/main.cpp | 14 +- kommander/executor/register.cpp | 36 ++-- 5 files changed, 319 insertions(+), 319 deletions(-) (limited to 'kommander/executor') diff --git a/kommander/executor/dcopkommanderif.h b/kommander/executor/dcopkommanderif.h index 3ee8a552..1ba67cbb 100644 --- a/kommander/executor/dcopkommanderif.h +++ b/kommander/executor/dcopkommanderif.h @@ -17,7 +17,7 @@ #define DCOPKOMMANDERIF_H #include -#include +#include /* See widgets/specials.cpp for description. Deprecated methods are replaced by methods above. */ @@ -26,55 +26,55 @@ class DCOPKommanderIf : virtual public DCOPObject K_DCOP k_dcop: -virtual void setEnabled(const QString& widgetName, bool enable) = 0; -virtual void enableWidget(const QString& widgetName, bool enable) = 0; /* DEPRECATED */ -virtual void setVisible(const QString& widgetName, bool enable) = 0; -virtual void setText(const QString& widgetName, const QString& text) = 0; -virtual void changeWidgetText(const QString& widgetName, const QString& text) = 0; /* DEPRECATED */ -virtual QString text(const QString& widgetName) = 0; -virtual void setSelection(const QString& widgetName, const QString& text) = 0; -virtual void setCurrentListItem(const QString& widgetName, const QString& text) = 0; /* DEPRECATED */ -virtual QString selection(const QString& widgetName) = 0; -virtual int currentItem(const QString &widgetName) = 0; -virtual QString item(const QString &widgetName, int index) = 0; -virtual int itemDepth(const QString &widgetName, int index) = 0; -virtual QString itemPath(const QString &widgetName, int index) = 0; -virtual void removeItem(const QString &widgetName, int index) = 0; -virtual void removeListItem(const QString &widgetName, int index) = 0; /* DEPRECATED */ -virtual void insertItem(const QString &widgetName, const QString &item, int index) = 0; -virtual void addListItem(const QString &widgetName, const QString &item, int index) = 0; /* DEPRECATED */ -virtual void setPixmap(const QString &widgetName, const QString &iconName, int index) = 0; -virtual void insertItems(const QString &widgetName, const QStringList &items, int index) = 0; -virtual void addListItems(const QString &widgetName, const QStringList &items, int index) = 0;/*DEPRECATED*/ -virtual void addUniqueItem(const QString &widgetName, const QString &item) = 0; -virtual int findItem(const QString &widgetName, const QString &item) = 0; -virtual void clear(const QString &widgetName) = 0; -virtual void clearList(const QString &widgetName) = 0; /* DEPRECATED */ -virtual void setCurrentItem(const QString &widgetName, int index) = 0; -virtual void setCurrentTab(const QString &widgetName, int index) = 0; /* DEPRECATED */ -virtual void insertTab(const QString &widgetName, const QString &label, int index) = 0; -virtual bool checked(const QString &widgetName) = 0; -virtual void setChecked(const QString &widgetName, bool checked) = 0; -virtual void setAssociatedText(const QString &widgetName, const QString &text) = 0; -virtual QStringList associatedText(const QString &widgetName) = 0; -virtual QString type(const QString& widget) = 0; -virtual QStringList children(const QString& parent, bool recursive) = 0; -virtual QString global(const QString& variableName) = 0; -virtual void setGlobal(const QString& variableName, const QString& value) = 0; -virtual void setMaximum(const QString &widgetName, int value) = 0; -virtual QString execute(const QString &widgetName) = 0; -virtual void cancel(const QString &widgetName) = 0; -virtual int count(const QString &widgetName) = 0; -virtual int currentColumn(const QString &widgetName) = 0; -virtual int currentRow(const QString &widgetName) = 0; -virtual void insertRow(const QString &widgetName, int row, int count) = 0; -virtual void insertColumn(const QString &widgetName, int column, int count) = 0; -virtual void setCellText(const QString &widgetName, int row, int column, const QString& text) = 0; -virtual QString cellText(const QString &widgetName, int row, int column) = 0; -virtual void removeRow(const QString &widgetName, int row, int count) = 0; -virtual void removeColumn(const QString &widgetName, int column, int count) = 0; -virtual void setRowCaption(const QString &widgetName, int row, const QString& text) = 0; -virtual void setColumnCaption(const QString &widgetName, int column, const QString& text) = 0; +virtual void setEnabled(const TQString& widgetName, bool enable) = 0; +virtual void enableWidget(const TQString& widgetName, bool enable) = 0; /* DEPRECATED */ +virtual void setVisible(const TQString& widgetName, bool enable) = 0; +virtual void setText(const TQString& widgetName, const TQString& text) = 0; +virtual void changeWidgetText(const TQString& widgetName, const TQString& text) = 0; /* DEPRECATED */ +virtual TQString text(const TQString& widgetName) = 0; +virtual void setSelection(const TQString& widgetName, const TQString& text) = 0; +virtual void setCurrentListItem(const TQString& widgetName, const TQString& text) = 0; /* DEPRECATED */ +virtual TQString selection(const TQString& widgetName) = 0; +virtual int currentItem(const TQString &widgetName) = 0; +virtual TQString item(const TQString &widgetName, int index) = 0; +virtual int itemDepth(const TQString &widgetName, int index) = 0; +virtual TQString itemPath(const TQString &widgetName, int index) = 0; +virtual void removeItem(const TQString &widgetName, int index) = 0; +virtual void removeListItem(const TQString &widgetName, int index) = 0; /* DEPRECATED */ +virtual void insertItem(const TQString &widgetName, const TQString &item, int index) = 0; +virtual void addListItem(const TQString &widgetName, const TQString &item, int index) = 0; /* DEPRECATED */ +virtual void setPixmap(const TQString &widgetName, const TQString &iconName, int index) = 0; +virtual void insertItems(const TQString &widgetName, const TQStringList &items, int index) = 0; +virtual void addListItems(const TQString &widgetName, const TQStringList &items, int index) = 0;/*DEPRECATED*/ +virtual void addUniqueItem(const TQString &widgetName, const TQString &item) = 0; +virtual int findItem(const TQString &widgetName, const TQString &item) = 0; +virtual void clear(const TQString &widgetName) = 0; +virtual void clearList(const TQString &widgetName) = 0; /* DEPRECATED */ +virtual void setCurrentItem(const TQString &widgetName, int index) = 0; +virtual void setCurrentTab(const TQString &widgetName, int index) = 0; /* DEPRECATED */ +virtual void insertTab(const TQString &widgetName, const TQString &label, int index) = 0; +virtual bool checked(const TQString &widgetName) = 0; +virtual void setChecked(const TQString &widgetName, bool checked) = 0; +virtual void setAssociatedText(const TQString &widgetName, const TQString &text) = 0; +virtual TQStringList associatedText(const TQString &widgetName) = 0; +virtual TQString type(const TQString& widget) = 0; +virtual TQStringList children(const TQString& parent, bool recursive) = 0; +virtual TQString global(const TQString& variableName) = 0; +virtual void setGlobal(const TQString& variableName, const TQString& value) = 0; +virtual void setMaximum(const TQString &widgetName, int value) = 0; +virtual TQString execute(const TQString &widgetName) = 0; +virtual void cancel(const TQString &widgetName) = 0; +virtual int count(const TQString &widgetName) = 0; +virtual int currentColumn(const TQString &widgetName) = 0; +virtual int currentRow(const TQString &widgetName) = 0; +virtual void insertRow(const TQString &widgetName, int row, int count) = 0; +virtual void insertColumn(const TQString &widgetName, int column, int count) = 0; +virtual void setCellText(const TQString &widgetName, int row, int column, const TQString& text) = 0; +virtual TQString cellText(const TQString &widgetName, int row, int column) = 0; +virtual void removeRow(const TQString &widgetName, int row, int count) = 0; +virtual void removeColumn(const TQString &widgetName, int column, int count) = 0; +virtual void setRowCaption(const TQString &widgetName, int row, const TQString& text) = 0; +virtual void setColumnCaption(const TQString &widgetName, int column, const TQString& text) = 0; virtual int getWinID() = 0; virtual void setBusyCursor(bool busy) = 0; }; diff --git a/kommander/executor/instance.cpp b/kommander/executor/instance.cpp index 2ff4edfd..7676f12d 100644 --- a/kommander/executor/instance.cpp +++ b/kommander/executor/instance.cpp @@ -24,17 +24,17 @@ #include /* QT INCLUDES */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* OTHER INCLUDES */ #include "instance.h" @@ -52,20 +52,20 @@ Instance::Instance() SpecialInformation::registerSpecials(); } -Instance::Instance(QWidget *a_parent) +Instance::Instance(TQWidget *a_parent) : DCOPObject("KommanderIf"), m_instance(0), m_textInstance(0), m_parent(a_parent) { SpecialInformation::registerSpecials(); } -void Instance::addCmdlineArguments(const QStringList& args) +void Instance::addCmdlineArguments(const TQStringList& args) { if (!m_textInstance) return; // Filter out variable arguments ('var=value') - QStringList stdArgs; - for (QStringList::ConstIterator it = args.begin(); it != args.end(); ++it) + TQStringList stdArgs; + for (TQStringList::ConstIterator it = args.begin(); it != args.end(); ++it) { int pos = (*it).find('='); if (pos != -1) @@ -74,10 +74,10 @@ void Instance::addCmdlineArguments(const QStringList& args) stdArgs.append(*it); } int i = 0; - for (QStringList::ConstIterator it = stdArgs.begin(); it != stdArgs.end(); ++it) - m_textInstance->setGlobal(QString("_ARG%1").arg(++i), *it); + for (TQStringList::ConstIterator it = stdArgs.begin(); it != stdArgs.end(); ++it) + m_textInstance->setGlobal(TQString("_ARG%1").arg(++i), *it); m_textInstance->setGlobal("_ARGS", stdArgs.join(" ")); - m_textInstance->setGlobal("_ARGCOUNT", QString::number(stdArgs.count())); + m_textInstance->setGlobal("_ARGCOUNT", TQString::number(stdArgs.count())); } @@ -101,10 +101,10 @@ bool Instance::build(const KURL& fname) KommanderFactory::loadPlugins(); if (fname.isValid()) - m_instance = KommanderFactory::create(fname.path(), 0L, dynamic_cast(parent())); + m_instance = KommanderFactory::create(fname.path(), 0L, dynamic_cast(parent())); else { - QFile inputFile; + TQFile inputFile; inputFile.open(IO_ReadOnly, stdin); m_instance = KommanderFactory::create(&inputFile); } @@ -116,7 +116,7 @@ bool Instance::build(const KURL& fname) return false; } - KommanderWindow* window = dynamic_cast((QWidget*)m_instance); + KommanderWindow* window = dynamic_cast((TQWidget*)m_instance); if (window) window->setFileName(fname.path().local8Bit()); @@ -127,8 +127,8 @@ bool Instance::build(const KURL& fname) { if (m_instance) { - QObjectList* widgets = m_instance->queryList(); - for (QObject* w = widgets->first(); w; w = widgets->next()) + TQObjectList* widgets = m_instance->queryList(); + for (TQObject* w = widgets->first(); w; w = widgets->next()) if (kommanderWidget(w)) { m_textInstance = kommanderWidget(w); @@ -146,7 +146,7 @@ bool Instance::build(const KURL& fname) { m_textInstance->setGlobal("KDDIR", fname.directory()); m_textInstance->setGlobal("NAME", fname.fileName()); - m_textInstance->setGlobal("_PID", QString().setNum(getpid())); + m_textInstance->setGlobal("_PID", TQString().setNum(getpid())); m_textInstance->setGlobal("VERSION", KOMMANDER_VERSION); } return true; @@ -158,12 +158,12 @@ bool Instance::run() return false; // Handle both dialogs and main windows - if (m_instance->inherits("QDialog")) - dynamic_cast((QWidget*)m_instance)->exec(); - else if (m_instance->inherits("QMainWindow")) + if (m_instance->inherits("TQDialog")) + dynamic_cast((TQWidget*)m_instance)->exec(); + else if (m_instance->inherits("TQMainWindow")) { kapp->setMainWidget(m_instance); - dynamic_cast((QWidget*)m_instance)->show(); + dynamic_cast((TQWidget*)m_instance)->show(); kapp->exec(); } else return false; @@ -175,14 +175,14 @@ bool Instance::isBuilt() const return m_instance; } -void Instance::setParent(QWidget *a_parent) +void Instance::setParent(TQWidget *a_parent) { m_parent = a_parent; } bool Instance::isFileValid(const KURL& fname) const { - if (!QFileInfo(fname.path()).exists()) + if (!TQFileInfo(fname.path()).exists()) { KMessageBox::sorry(0, i18n("Kommander file
%1
does not " "exist.
").arg(fname.path())); @@ -199,13 +199,13 @@ bool Instance::isFileValid(const KURL& fname) const } // Check whether file is not in some temporary directory. - QStringList tmpDirs = KGlobal::dirs()->resourceDirs("tmp"); + TQStringList tmpDirs = KGlobal::dirs()->resourceDirs("tmp"); tmpDirs += KGlobal::dirs()->resourceDirs("cache"); tmpDirs.append("/tmp/"); tmpDirs.append("/var/tmp/"); bool inTemp = false; - for (QStringList::ConstIterator I = tmpDirs.begin(); I != tmpDirs.end(); ++I) + for (TQStringList::ConstIterator I = tmpDirs.begin(); I != tmpDirs.end(); ++I) if (fname.directory(false).startsWith(*I)) inTemp = true; @@ -215,12 +215,12 @@ bool Instance::isFileValid(const KURL& fname) const " This may mean that it was run from a KMail attachment or from a webpage. " "

Any script contained in this dialog will have write access to all of your home directory; " "running such dialogs may be dangerous: " - "

are you sure you want to continue?"), QString(), i18n("Run Nevertheless")) == KMessageBox::Cancel) + "

are you sure you want to continue?"), TQString(), i18n("Run Nevertheless")) == KMessageBox::Cancel) return false; } - if (!QFileInfo(fname.path()).isExecutable()) + if (!TQFileInfo(fname.path()).isExecutable()) { - if (KMessageBox::warningContinueCancel(0, i18n("The Kommander file %1 does not have the executable attribute set and could possibly contain dangerous exploits.

If you trust the scripting (viewable in kmdr-editor) in this program, make it executable to get rid of this warning.

Are you sure you want to continue?").arg(fname.pathOrURL()), QString(), i18n("Run Nevertheless")) == KMessageBox::Cancel) + if (KMessageBox::warningContinueCancel(0, i18n("The Kommander file %1 does not have the executable attribute set and could possibly contain dangerous exploits.

If you trust the scripting (viewable in kmdr-editor) in this program, make it executable to get rid of this warning.

Are you sure you want to continue?").arg(fname.pathOrURL()), TQString(), i18n("Run Nevertheless")) == KMessageBox::Cancel) return false; } return true; @@ -231,31 +231,31 @@ bool Instance::isFileValid(const KURL& fname) const // Widget functions -void Instance::setEnabled(const QString& widgetName, bool enable) +void Instance::setEnabled(const TQString& widgetName, bool enable) { - QObject* child = stringToWidget(widgetName); - if (child && child->inherits("QWidget")) - ((QWidget*)child)->setEnabled(enable); + TQObject* child = stringToWidget(widgetName); + if (child && child->inherits("TQWidget")) + ((TQWidget*)child)->setEnabled(enable); } -void Instance::setVisible(const QString& widgetName, bool visible) +void Instance::setVisible(const TQString& widgetName, bool visible) { - QObject* child = stringToWidget(widgetName); - if (child && child->inherits("QWidget")) - ((QWidget*)child)->setShown(visible); + TQObject* child = stringToWidget(widgetName); + if (child && child->inherits("TQWidget")) + ((TQWidget*)child)->setShown(visible); } -void Instance::setText(const QString& widgetName, const QString& text) +void Instance::setText(const TQString& widgetName, const TQString& text) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) kommanderWidget(child)->handleDCOP(DCOP::setText, text); - else if (child && child->inherits("QLabel")) + else if (child && child->inherits("TQLabel")) { - QLabel* label = (QLabel*)child; + TQLabel* label = (TQLabel*)child; if (label->pixmap()) { - QPixmap pixmap; + TQPixmap pixmap; if (pixmap.load(text)) label->setPixmap(pixmap); } @@ -264,321 +264,321 @@ void Instance::setText(const QString& widgetName, const QString& text) } } -QString Instance::text(const QString& widgetName) +TQString Instance::text(const TQString& widgetName) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) return kommanderWidget(child)->handleDCOP(DCOP::text); - else if (child && child->inherits("QLabel")) - return ((QLabel*)child)->text(); - return QString(); + else if (child && child->inherits("TQLabel")) + return ((TQLabel*)child)->text(); + return TQString(); } -void Instance::setSelection(const QString& widgetName, const QString& text) +void Instance::setSelection(const TQString& widgetName, const TQString& text) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) kommanderWidget(child)->handleDCOP(DCOP::setSelection, text); - else if (child && child->inherits("QLabel")) - ((QLabel*)child)->setText(text); + else if (child && child->inherits("TQLabel")) + ((TQLabel*)child)->setText(text); } -QString Instance::selection(const QString& widgetName) +TQString Instance::selection(const TQString& widgetName) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) return kommanderWidget(child)->handleDCOP(DCOP::selection); - return QString(); + return TQString(); } -int Instance::currentItem(const QString &widgetName) +int Instance::currentItem(const TQString &widgetName) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) return kommanderWidget(child)->handleDCOP(DCOP::currentItem).toInt(); return -1; } -QString Instance::item(const QString &widgetName, int i) +TQString Instance::item(const TQString &widgetName, int i) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) - return kommanderWidget(child)->handleDCOP(DCOP::item, QString::number(i)); - return QString(); + return kommanderWidget(child)->handleDCOP(DCOP::item, TQString::number(i)); + return TQString(); } -void Instance::removeItem(const QString &widgetName, int index) +void Instance::removeItem(const TQString &widgetName, int index) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) - kommanderWidget(child)->handleDCOP(DCOP::removeItem, QString::number(index)); + kommanderWidget(child)->handleDCOP(DCOP::removeItem, TQString::number(index)); } -void Instance::insertItem(const QString &widgetName, const QString &item, int index) +void Instance::insertItem(const TQString &widgetName, const TQString &item, int index) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) { - QStringList args(item); - args += QString::number(index); + TQStringList args(item); + args += TQString::number(index); kommanderWidget(child)->handleDCOP(DCOP::insertItem, args); } } -void Instance::insertItems(const QString &widgetName, const QStringList &items, int index) +void Instance::insertItems(const TQString &widgetName, const TQStringList &items, int index) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) { - QStringList args(items.join("\n")); - args += QString::number(index); + TQStringList args(items.join("\n")); + args += TQString::number(index); kommanderWidget(child)->handleDCOP(DCOP::insertItems, args); } } -int Instance::findItem(const QString &widgetName, const QString& item) +int Instance::findItem(const TQString &widgetName, const TQString& item) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) return kommanderWidget(child)->handleDCOP(DCOP::findItem, item).toInt(); return -1; } -void Instance::addUniqueItem(const QString &widgetName, const QString &item) +void Instance::addUniqueItem(const TQString &widgetName, const TQString &item) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) kommanderWidget(child)->handleDCOP(DCOP::addUniqueItem, item); } -int Instance::itemDepth(const QString &widgetName, int index) +int Instance::itemDepth(const TQString &widgetName, int index) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) - return kommanderWidget(child)->handleDCOP(DCOP::itemDepth, QString::number(index)).toInt(); + return kommanderWidget(child)->handleDCOP(DCOP::itemDepth, TQString::number(index)).toInt(); return -1; } -QString Instance::itemPath(const QString &widgetName, int index) +TQString Instance::itemPath(const TQString &widgetName, int index) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) - return kommanderWidget(child)->handleDCOP(DCOP::itemPath, QString::number(index)); - return QString(); + return kommanderWidget(child)->handleDCOP(DCOP::itemPath, TQString::number(index)); + return TQString(); } -void Instance::setPixmap(const QString &widgetName, const QString& iconName, int index) +void Instance::setPixmap(const TQString &widgetName, const TQString& iconName, int index) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) { - QStringList args(iconName); - args += QString::number(index); + TQStringList args(iconName); + args += TQString::number(index); kommanderWidget(child)->handleDCOP(DCOP::setPixmap, args); } } -void Instance::clear(const QString &widgetName) +void Instance::clear(const TQString &widgetName) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) kommanderWidget(child)->handleDCOP(DCOP::clear); } -void Instance::setCurrentItem(const QString &widgetName, int index) +void Instance::setCurrentItem(const TQString &widgetName, int index) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) - kommanderWidget(child)->handleDCOP(DCOP::setCurrentItem, QString::number(index)); + kommanderWidget(child)->handleDCOP(DCOP::setCurrentItem, TQString::number(index)); } -void Instance::setChecked(const QString &widgetName, bool checked) +void Instance::setChecked(const TQString &widgetName, bool checked) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) kommanderWidget(child)->handleDCOP(DCOP::setChecked, checked ? "true" : "false"); } -bool Instance::checked(const QString &widgetName) +bool Instance::checked(const TQString &widgetName) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) return kommanderWidget(child)->handleDCOP(DCOP::checked, widgetName) == "1"; return false; } -void Instance::setAssociatedText(const QString &widgetName, const QString& text) +void Instance::setAssociatedText(const TQString &widgetName, const TQString& text) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) - kommanderWidget(child)->setAssociatedText(QStringList::split('\n', text, true)); + kommanderWidget(child)->setAssociatedText(TQStringList::split('\n', text, true)); } -QStringList Instance::associatedText(const QString &widgetName) +TQStringList Instance::associatedText(const TQString &widgetName) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) kommanderWidget(child)->associatedText(); - return QString(); + return TQString(); } -QString Instance::type(const QString& widget) +TQString Instance::type(const TQString& widget) { - QObject* child = stringToWidget(widget); - if (child && child->inherits("QWidget")) + TQObject* child = stringToWidget(widget); + if (child && child->inherits("TQWidget")) return child->className(); - return QString(); + return TQString(); } -QStringList Instance::children(const QString& parent, bool recursive) +TQStringList Instance::children(const TQString& parent, bool recursive) { - QStringList matching; - QObject* child = stringToWidget(parent); - QObjectList* widgets; + TQStringList matching; + TQObject* child = stringToWidget(parent); + TQObjectList* widgets; if (!child) child = m_instance; - if (child->inherits("QWidget")) + if (child->inherits("TQWidget")) { - widgets = child->queryList("QWidget", 0, false, recursive); - for (QObject* w = widgets->first(); w; w = widgets->next()) + 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()); } return matching; } -void Instance::setMaximum(const QString &widgetName, int value) +void Instance::setMaximum(const TQString &widgetName, int value) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) - kommanderWidget(child)->handleDCOP(DCOP::setMaximum, QString::number(value)); + kommanderWidget(child)->handleDCOP(DCOP::setMaximum, TQString::number(value)); } -QString Instance::execute(const QString &widgetName) +TQString Instance::execute(const TQString &widgetName) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) return kommanderWidget(child)->handleDCOP(DCOP::execute); return ""; } -void Instance::cancel(const QString &widgetName) +void Instance::cancel(const TQString &widgetName) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) kommanderWidget(child)->handleDCOP(DCOP::cancel); } -int Instance::count(const QString &widgetName) +int Instance::count(const TQString &widgetName) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) return kommanderWidget(child)->handleDCOP(DCOP::count).toInt(); return -1; } -int Instance::currentColumn(const QString &widgetName) +int Instance::currentColumn(const TQString &widgetName) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) return kommanderWidget(child)->handleDCOP(DCOP::currentColumn).toInt(); return -1; } -int Instance::currentRow(const QString &widgetName) +int Instance::currentRow(const TQString &widgetName) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) return kommanderWidget(child)->handleDCOP(DCOP::currentRow).toInt(); return -1; } -void Instance::insertRow(const QString &widgetName, int row, int count) +void Instance::insertRow(const TQString &widgetName, int row, int count) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) { - QStringList args(QString::number(row)); - args += QString::number(count); + TQStringList args(TQString::number(row)); + args += TQString::number(count); kommanderWidget(child)->handleDCOP(DCOP::insertRow, args); } } -void Instance::insertColumn(const QString &widgetName, int column, int count) +void Instance::insertColumn(const TQString &widgetName, int column, int count) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) { - QStringList args(QString::number(column)); - args += QString::number(count); + TQStringList args(TQString::number(column)); + args += TQString::number(count); kommanderWidget(child)->handleDCOP(DCOP::insertColumn, args); } } -void Instance::setCellText(const QString &widgetName, int row, int column, const QString& text) +void Instance::setCellText(const TQString &widgetName, int row, int column, const TQString& text) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) { - QStringList args(QString::number(row)); - args += QString::number(column); + TQStringList args(TQString::number(row)); + args += TQString::number(column); args += text; kommanderWidget(child)->handleDCOP(DCOP::setCellText, args); } } -QString Instance::cellText(const QString &widgetName, int row, int column) +TQString Instance::cellText(const TQString &widgetName, int row, int column) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) { - QStringList args(QString::number(row)); - args += QString::number(column); + TQStringList args(TQString::number(row)); + args += TQString::number(column); return kommanderWidget(child)->handleDCOP(DCOP::cellText, args); } - else return QString(); + else return TQString(); } -void Instance::removeRow(const QString &widgetName, int row, int count) +void Instance::removeRow(const TQString &widgetName, int row, int count) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) { - QStringList args(QString::number(row)); - args += QString::number(count); + TQStringList args(TQString::number(row)); + args += TQString::number(count); kommanderWidget(child)->handleDCOP(DCOP::removeRow, args); } } -void Instance::removeColumn(const QString &widgetName, int column, int count) +void Instance::removeColumn(const TQString &widgetName, int column, int count) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) { - QStringList args(QString::number(column)); - args += QString::number(count); + TQStringList args(TQString::number(column)); + args += TQString::number(count); kommanderWidget(child)->handleDCOP(DCOP::removeColumn, args); } } -void Instance::setRowCaption(const QString &widgetName, int row, const QString& text) +void Instance::setRowCaption(const TQString &widgetName, int row, const TQString& text) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) { - QStringList args(QString::number(row)); + TQStringList args(TQString::number(row)); args += text; kommanderWidget(child)->handleDCOP(DCOP::setRowCaption, args); } } -void Instance::setColumnCaption(const QString &widgetName, int column, const QString& text) +void Instance::setColumnCaption(const TQString &widgetName, int column, const TQString& text) { - QObject* child = stringToWidget(widgetName); + TQObject* child = stringToWidget(widgetName); if (kommanderWidget(child)) { - QStringList args(QString::number(column)); + TQStringList args(TQString::number(column)); args += text; kommanderWidget(child)->handleDCOP(DCOP::setColumnCaption, args); } @@ -593,75 +593,75 @@ void Instance::setColumnCaption(const QString &widgetName, int column, const QSt -QString Instance::global(const QString& variableName) +TQString Instance::global(const TQString& variableName) { - return m_textInstance ? m_textInstance->global(variableName) : QString(); + return m_textInstance ? m_textInstance->global(variableName) : TQString(); } -void Instance::setGlobal(const QString& variableName, const QString& value) +void Instance::setGlobal(const TQString& variableName, const TQString& value) { if (m_textInstance) m_textInstance->setGlobal(variableName, value); } -QObject* Instance::stringToWidget(const QString& name) +TQObject* Instance::stringToWidget(const TQString& name) { return m_instance->child(name); } -KommanderWidget* Instance::kommanderWidget(QObject* object) +KommanderWidget* Instance::kommanderWidget(TQObject* object) { return dynamic_cast(object); } /*** Deprecated methods: just call appropriate method ***/ -void Instance::changeWidgetText(const QString& widgetName, const QString& text) +void Instance::changeWidgetText(const TQString& widgetName, const TQString& text) { setText(widgetName, text); } -void Instance::clearList(const QString &widgetName) +void Instance::clearList(const TQString &widgetName) { clear(widgetName); } -void Instance::setCurrentListItem(const QString& widgetName, const QString& item) +void Instance::setCurrentListItem(const TQString& widgetName, const TQString& item) { setSelection(widgetName, item); } -void Instance::setCurrentTab(const QString &widgetName, int index) +void Instance::setCurrentTab(const TQString &widgetName, int index) { setCurrentItem(widgetName, index); } -void Instance::insertTab(const QString &widgetName, const QString &label, int index) +void Instance::insertTab(const TQString &widgetName, const TQString &label, int index) { - QObject* child = stringToWidget(widgetName); - QStringList l; + TQObject* child = stringToWidget(widgetName); + TQStringList l; l << label; - l << QString::number(index); + l << TQString::number(index); if (kommanderWidget(child)) kommanderWidget(child)->handleDCOP(DCOP::insertTab, l); } -void Instance::addListItems(const QString &widgetName, const QStringList &items, int index) +void Instance::addListItems(const TQString &widgetName, const TQStringList &items, int index) { insertItems(widgetName, items, index); } -void Instance::enableWidget(const QString& widgetName, bool enable) +void Instance::enableWidget(const TQString& widgetName, bool enable) { setEnabled(widgetName, enable); } -void Instance::removeListItem(const QString &widgetName, int index) +void Instance::removeListItem(const TQString &widgetName, int index) { removeItem(widgetName, index); } -void Instance::addListItem(const QString & widgetName, const QString & item, int index) +void Instance::addListItem(const TQString & widgetName, const TQString & item, int index) { insertItem(widgetName, item, index); } @@ -674,9 +674,9 @@ int Instance::getWinID() void Instance::setBusyCursor(bool busy) { if (busy) - m_instance->setCursor(QCursor(Qt::WaitCursor)); + m_instance->setCursor(TQCursor(Qt::WaitCursor)); else - m_instance->setCursor(QCursor(Qt::ArrowCursor)); + m_instance->setCursor(TQCursor(Qt::ArrowCursor)); } diff --git a/kommander/executor/instance.h b/kommander/executor/instance.h index 66b97455..443e8db5 100644 --- a/kommander/executor/instance.h +++ b/kommander/executor/instance.h @@ -20,11 +20,11 @@ #define INSTANCE_H /* QT INCLUDES */ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* KDE INCLUDES */ #include @@ -40,13 +40,13 @@ class KommanderWidget; -class Instance : public QObject, virtual public DCOPKommanderIf +class Instance : public TQObject, virtual public DCOPKommanderIf { Q_OBJECT public: Instance(); - Instance(QWidget*); + Instance(TQWidget*); ~Instance(); /* passing global variables: two forms are accepted. kdmr-executor file.kmdr COUNT=45 PATH=/tmp - this adds global variables 45 and PATH @@ -54,65 +54,65 @@ public: ARGS holds space-separated list of all second-type variables (like Bash $@) ARGCOUNT holds number of second-type arguments */ - virtual void addCmdlineArguments(const QStringList& args); + virtual void addCmdlineArguments(const TQStringList& args); //DCOP methods. The documentation is in the widgets/specials.cpp file. - virtual void setEnabled(const QString& widgetName, bool enable); - virtual void enableWidget(const QString& widgetName, bool enable); /* DEPRECATED */ - virtual void setVisible(const QString& widgetName, bool enable); - virtual void setText(const QString& widgetName, const QString& text); - virtual void changeWidgetText(const QString& widgetName, const QString& text); /* DEPRECATED */ - virtual QString text(const QString& widgetName); - virtual void setSelection(const QString& widgetName, const QString& text); - virtual void setCurrentListItem(const QString& widgetName, const QString& text); /* DEPRECATED */ - virtual QString selection(const QString& widgetName); - virtual int currentItem(const QString &widgetName); - virtual QString item(const QString &widgetName, int index); - virtual int itemDepth(const QString &widgetName, int index); - virtual QString itemPath(const QString &widgetName, int index); - virtual void removeItem(const QString &widgetName, int index); - virtual void removeListItem(const QString &widgetName, int index); /* DEPRECATED */ - virtual void insertItem(const QString &widgetName, const QString &item, int index); - virtual void addListItem(const QString &widgetName, const QString &item, int index); /* DEPRECATED */ - virtual void setPixmap(const QString &widgetName, const QString &iconName, int index); - virtual void insertItems(const QString &widgetName, const QStringList &items, int index); - virtual void addListItems(const QString &widgetName, const QStringList &items, int index);/*DEPRECATED*/ - virtual void addUniqueItem(const QString &widgetName, const QString &item); - virtual int findItem(const QString &widgetName, const QString &item); - virtual void clear(const QString &widgetName); - virtual void clearList(const QString &widgetName); /* DEPRECATED */ - virtual void setCurrentItem(const QString &widgetName, int index); - virtual void setCurrentTab(const QString &widgetName, int index); /* DEPRECATED */ - virtual void insertTab(const QString &widgetName, const QString &label, int index); - virtual void setChecked(const QString &widgetName, bool checked); - virtual bool checked(const QString &widgetName); - virtual void setAssociatedText(const QString &widgetName, const QString &text); - virtual QStringList associatedText(const QString &widgetName); - virtual QString type(const QString& widget); - virtual QStringList children(const QString& parent, bool recursive); - virtual QString global(const QString& variableName); - virtual void setGlobal(const QString& variableName, const QString& value); - virtual void setMaximum(const QString &widgetName, int value); - virtual QString execute(const QString &widgetName); - virtual void cancel(const QString &widgetName); - virtual int count(const QString &widgetName); - virtual int currentColumn(const QString &widgetName); - virtual int currentRow(const QString &widgetName); - virtual void insertRow(const QString &widgetName, int row, int count); - virtual void insertColumn(const QString &widgetName, int column, int count); - virtual void setCellText(const QString &widgetName, int row, int column, const QString& text); - virtual QString cellText(const QString &widgetName, int row, int column); - virtual void removeRow(const QString &widgetName, int row, int count); - virtual void removeColumn(const QString &widgetName, int column, int count); - virtual void setRowCaption(const QString &widgetName, int row, const QString& text); - virtual void setColumnCaption(const QString &widgetName, int column, const QString& text); + virtual void setEnabled(const TQString& widgetName, bool enable); + virtual void enableWidget(const TQString& widgetName, bool enable); /* DEPRECATED */ + virtual void setVisible(const TQString& widgetName, bool enable); + virtual void setText(const TQString& widgetName, const TQString& text); + virtual void changeWidgetText(const TQString& widgetName, const TQString& text); /* DEPRECATED */ + virtual TQString text(const TQString& widgetName); + virtual void setSelection(const TQString& widgetName, const TQString& text); + virtual void setCurrentListItem(const TQString& widgetName, const TQString& text); /* DEPRECATED */ + virtual TQString selection(const TQString& widgetName); + virtual int currentItem(const TQString &widgetName); + virtual TQString item(const TQString &widgetName, int index); + virtual int itemDepth(const TQString &widgetName, int index); + virtual TQString itemPath(const TQString &widgetName, int index); + virtual void removeItem(const TQString &widgetName, int index); + virtual void removeListItem(const TQString &widgetName, int index); /* DEPRECATED */ + virtual void insertItem(const TQString &widgetName, const TQString &item, int index); + virtual void addListItem(const TQString &widgetName, const TQString &item, int index); /* DEPRECATED */ + virtual void setPixmap(const TQString &widgetName, const TQString &iconName, int index); + virtual void insertItems(const TQString &widgetName, const TQStringList &items, int index); + virtual void addListItems(const TQString &widgetName, const TQStringList &items, int index);/*DEPRECATED*/ + virtual void addUniqueItem(const TQString &widgetName, const TQString &item); + virtual int findItem(const TQString &widgetName, const TQString &item); + virtual void clear(const TQString &widgetName); + virtual void clearList(const TQString &widgetName); /* DEPRECATED */ + virtual void setCurrentItem(const TQString &widgetName, int index); + virtual void setCurrentTab(const TQString &widgetName, int index); /* DEPRECATED */ + virtual void insertTab(const TQString &widgetName, const TQString &label, int index); + virtual void setChecked(const TQString &widgetName, bool checked); + virtual bool checked(const TQString &widgetName); + virtual void setAssociatedText(const TQString &widgetName, const TQString &text); + virtual TQStringList associatedText(const TQString &widgetName); + virtual TQString type(const TQString& widget); + virtual TQStringList children(const TQString& parent, bool recursive); + virtual TQString global(const TQString& variableName); + virtual void setGlobal(const TQString& variableName, const TQString& value); + virtual void setMaximum(const TQString &widgetName, int value); + virtual TQString execute(const TQString &widgetName); + virtual void cancel(const TQString &widgetName); + virtual int count(const TQString &widgetName); + virtual int currentColumn(const TQString &widgetName); + virtual int currentRow(const TQString &widgetName); + virtual void insertRow(const TQString &widgetName, int row, int count); + virtual void insertColumn(const TQString &widgetName, int column, int count); + virtual void setCellText(const TQString &widgetName, int row, int column, const TQString& text); + virtual TQString cellText(const TQString &widgetName, int row, int column); + virtual void removeRow(const TQString &widgetName, int row, int count); + virtual void removeColumn(const TQString &widgetName, int column, int count); + virtual void setRowCaption(const TQString &widgetName, int row, const TQString& text); + virtual void setColumnCaption(const TQString &widgetName, int column, const TQString& text); virtual int getWinID(); virtual void setBusyCursor(bool busy); - QWidget *widget() { return m_instance;} + TQWidget *widget() { return m_instance;} public slots: /** Sets the instance's parent */ - void setParent(QWidget*); + void setParent(TQWidget*); /** Returns whether the instance is built */ bool isBuilt() const; /** Builds the instance. Uses stdin if no filename is given */ @@ -123,15 +123,15 @@ private: /** Check if the file exists, has correct extension and is not in a temporary (insecure) directory */ bool isFileValid(const KURL& fname) const; /* Dialog Instance */ - QGuardedPtr m_instance; + TQGuardedPtr m_instance; /* Associated Text Instance */ KommanderWidget *m_textInstance; /** The parent widget */ - QWidget *m_parent; + TQWidget *m_parent; /* Get object by name */ - QObject* stringToWidget(const QString& name); + TQObject* stringToWidget(const TQString& name); /* Cast to Kommander widget if possible */ - KommanderWidget* kommanderWidget(QObject* object); + KommanderWidget* kommanderWidget(TQObject* object); }; #endif diff --git a/kommander/executor/main.cpp b/kommander/executor/main.cpp index 589ec1cd..00d7e509 100644 --- a/kommander/executor/main.cpp +++ b/kommander/executor/main.cpp @@ -25,9 +25,9 @@ #include /* QT INCLUDES */ -#include -#include -#include +#include +#include +#include /* OTHER INCLUDES */ #include @@ -70,7 +70,7 @@ int main(int argc, char *argv[]) else if (args->count()) { char buf[200]; - QString baseFile = args->url(0).fileName(); + TQString baseFile = args->url(0).fileName(); int ext = baseFile.findRev('.'); if (ext != -1) baseFile = baseFile.left(ext); @@ -81,18 +81,18 @@ int main(int argc, char *argv[]) KLocale::setMainCatalogue("kommander"); KApplication app; - QObject::connect(&app, SIGNAL(lastWindowClosed()), &app, SLOT(quit())); + TQObject::connect(&app, TQT_SIGNAL(lastWindowClosed()), &app, TQT_SLOT(quit())); if (!args->count()) { KMessageBox::sorry(0, i18n("Error: no dialog given. Use --stdin option to read dialog from standard input.\n")); return -1; } Instance instance; - if (!instance.build(args->isSet("stdin") ? QString() : args->url(0))) + if (!instance.build(args->isSet("stdin") ? TQString() : args->url(0))) return -1; // Read command-line variables - QStringList cmdargs; + TQStringList cmdargs; for (int i = !args->isSet("stdin"); icount(); i++) cmdargs.append(args->arg(i)); instance.addCmdlineArguments(cmdargs); diff --git a/kommander/executor/register.cpp b/kommander/executor/register.cpp index e6c41b7f..db794e25 100644 --- a/kommander/executor/register.cpp +++ b/kommander/executor/register.cpp @@ -21,24 +21,24 @@ void Instance::registerDCOP() { - DCOPInformation::insert("enableWidget(QString,bool)"); - DCOPInformation::insert("changeWidgetText(QString,QString)"); - DCOPInformation::insert("currentItem(QString)"); - DCOPInformation::insert("item(QString,int)"); - DCOPInformation::insert("removeListItem(QString,int)"); - DCOPInformation::insert("addListItem(QString,QString,int)"); - DCOPInformation::insert("addListItems(QString,QStringList,int)"); - DCOPInformation::insert("addUniqueItem(QString,QString)"); - DCOPInformation::insert("findItem(QString,QString)"); - DCOPInformation::insert("clearList(QString)"); - DCOPInformation::insert("setCurrentListItem(QString,QString)"); - DCOPInformation::insert("setCurrentTab(QString,int)"); - DCOPInformation::insert("insertTab(QString,QString,int)"); - DCOPInformation::insert("setChecked(QString, bool)"); - DCOPInformation::insert("setAssociatedText(QString,QString)"); - DCOPInformation::insert("associatedText(QString)"); - DCOPInformation::insert("global(QString)"); - DCOPInformation::insert("setGlobal(QString,QString)"); + DCOPInformation::insert("enableWidget(TQString,bool)"); + DCOPInformation::insert("changeWidgetText(TQString,TQString)"); + DCOPInformation::insert("currentItem(TQString)"); + DCOPInformation::insert("item(TQString,int)"); + DCOPInformation::insert("removeListItem(TQString,int)"); + DCOPInformation::insert("addListItem(TQString,TQString,int)"); + DCOPInformation::insert("addListItems(TQString,TQStringList,int)"); + DCOPInformation::insert("addUniqueItem(TQString,TQString)"); + DCOPInformation::insert("findItem(TQString,TQString)"); + DCOPInformation::insert("clearList(TQString)"); + DCOPInformation::insert("setCurrentListItem(TQString,TQString)"); + DCOPInformation::insert("setCurrentTab(TQString,int)"); + DCOPInformation::insert("insertTab(TQString,TQString,int)"); + DCOPInformation::insert("setChecked(TQString, bool)"); + DCOPInformation::insert("setAssociatedText(TQString,TQString)"); + DCOPInformation::insert("associatedText(TQString)"); + DCOPInformation::insert("global(TQString)"); + DCOPInformation::insert("setGlobal(TQString,TQString)"); } void Instance::registerSpecials() -- cgit v1.2.1