diff options
author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:54:04 +0000 |
---|---|---|
committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:54:04 +0000 |
commit | dc6b8e72fed2586239e3514819238c520636c9d9 (patch) | |
tree | 88b200df0a0b7fab9d6f147596173556f1ed9a13 /kommander/widgets | |
parent | 6927d4436e54551917f600b706a8d6109e49de1c (diff) | |
download | tdewebdev-dc6b8e72fed2586239e3514819238c520636c9d9.tar.gz tdewebdev-dc6b8e72fed2586239e3514819238c520636c9d9.zip |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdewebdev@1157656 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kommander/widgets')
67 files changed, 1691 insertions, 1691 deletions
diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp index 7f8c3428..9377b377 100644 --- a/kommander/widgets/aboutdialog.cpp +++ b/kommander/widgets/aboutdialog.cpp @@ -9,7 +9,7 @@ // Copyright: See COPYING file that comes with this distribution // // -#include <qfile.h> +#include <tqfile.h> #include "aboutdialog.h" #include "kommanderplugin.h" @@ -21,7 +21,7 @@ #include <klocale.h> #include <kstandarddirs.h> -#include <qtextstream.h> +#include <tqtextstream.h> enum Functions { FirstFunction = 159, @@ -36,17 +36,17 @@ enum Functions { LastFunction }; -AboutDialog::AboutDialog(QWidget *parent, const char *name) - : QLabel(parent, name), KommanderWidget(this) +AboutDialog::AboutDialog(TQWidget *parent, const char *name) + : TQLabel(parent, name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); if (KommanderWidget::inEditor) { setPixmap(KGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium)); - setFrameStyle(QFrame::Box | QFrame::Plain); + setFrameStyle(TQFrame::Box | TQFrame::Plain); setLineWidth(1); setFixedSize(pixmap()->size()); } @@ -55,21 +55,21 @@ AboutDialog::AboutDialog(QWidget *parent, const char *name) m_aboutData = 0L; KommanderPlugin::setDefaultGroup(Group::DCOP); - KommanderPlugin::registerFunction(Initialize, "initialize(QString widget, QString appName, QString icon, QString version, QString copyright)", + KommanderPlugin::registerFunction(Initialize, "initialize(TQString widget, TQString appName, TQString icon, TQString version, TQString copyright)", i18n("Sets information about the application. This is the first method that must me called, any addition to the dialog done before initialization will be ignored."), 5); - KommanderPlugin::registerFunction(AddAuthor, "addAuthor(QString widget, QString author, QString task, QString email, QString webAddress)", + KommanderPlugin::registerFunction(AddAuthor, "addAuthor(TQString widget, TQString author, TQString task, TQString email, TQString webAddress)", i18n("Add an author. Only the author name is required."), 2, 5); - KommanderPlugin::registerFunction(AddTranslator, "addTranslator(QString widget, QString author, QString email)", + KommanderPlugin::registerFunction(AddTranslator, "addTranslator(TQString widget, TQString author, TQString email)", i18n("Add a translator. Only the name is required."), 2, 3); - KommanderPlugin::registerFunction(SetDescription, "setDescription(QString widget, QString description)", + KommanderPlugin::registerFunction(SetDescription, "setDescription(TQString widget, TQString description)", i18n("Set a short description text."), 2); - KommanderPlugin::registerFunction(SetHomepage, "setHomepage(QString widget, QString homepage)", + KommanderPlugin::registerFunction(SetHomepage, "setHomepage(TQString widget, TQString homepage)", i18n("Set a homepage address."), 2); - KommanderPlugin::registerFunction(SetBugAddress, "setBugAddress(QString widget, QString address)", + KommanderPlugin::registerFunction(SetBugAddress, "setBugAddress(TQString widget, TQString address)", i18n("Set an email address, where bugs can be reported."), 2); - KommanderPlugin::registerFunction(SetLicense, "setLicense(QString widget, QString license)", + KommanderPlugin::registerFunction(SetLicense, "setLicense(TQString widget, TQString license)", i18n("Sets license information of the application. The parameter can be one of the license keys - GPL_V2, LGPL_V2, BSD, ARTISTIC -, or a freely specified text."), 2); - KommanderPlugin::registerFunction(Version, "version(QString widget)", + KommanderPlugin::registerFunction(Version, "version(TQString widget)", i18n("Returns the set version string."), 1); } @@ -80,21 +80,21 @@ AboutDialog::~AboutDialog() m_aboutData = 0L; } -QString AboutDialog::currentState() const +TQString AboutDialog::currentState() const { - return QString("default"); + return TQString("default"); } bool AboutDialog::isKommanderWidget() const { return true; } -QStringList AboutDialog::associatedText() const +TQStringList AboutDialog::associatedText() const { return KommanderWidget::associatedText(); } -void AboutDialog::setAssociatedText(const QStringList& a_at) +void AboutDialog::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } @@ -105,7 +105,7 @@ bool AboutDialog::isFunctionSupported(int f) return (f > FirstFunction && f < LastFunction) || f == DCOP::execute; } -void AboutDialog::initialize(const QString& appName, const QString &icon, const QString& version, const QString& copyright) +void AboutDialog::initialize(const TQString& appName, const TQString &icon, const TQString& version, const TQString& copyright) { delete m_aboutData; m_authors.clear(); @@ -125,7 +125,7 @@ void AboutDialog::initialize(const QString& appName, const QString &icon, const m_aboutData->setProgramLogo(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeMedium).convertToImage()); } -void AboutDialog::addAuthor(const QString& author, const QString &task, const QString& email, const QString &webAddress) +void AboutDialog::addAuthor(const TQString& author, const TQString &task, const TQString& email, const TQString &webAddress) { if (!m_aboutData) return; @@ -136,7 +136,7 @@ void AboutDialog::addAuthor(const QString& author, const QString &task, const QS m_aboutData->addAuthor(author, task, email, webAddress); } -void AboutDialog::addTranslator(const QString& author, const QString& email) +void AboutDialog::addTranslator(const TQString& author, const TQString& email) { if (!m_aboutData) return; @@ -145,7 +145,7 @@ void AboutDialog::addTranslator(const QString& author, const QString& email) m_aboutData->setTranslator(author, email); } -void AboutDialog::setDescription(const QString& description) +void AboutDialog::setDescription(const TQString& description) { if (!m_aboutData) return; @@ -153,7 +153,7 @@ void AboutDialog::setDescription(const QString& description) m_aboutData->setShortDescription(m_description); } -void AboutDialog::setHomepage(const QString &homepage) +void AboutDialog::setHomepage(const TQString &homepage) { if (!m_aboutData) return; @@ -161,7 +161,7 @@ void AboutDialog::setHomepage(const QString &homepage) m_aboutData->setHomepage(m_homepage); } -void AboutDialog::setBugAddress(const QString &bugAddress) +void AboutDialog::setBugAddress(const TQString &bugAddress) { if (!m_aboutData) return; @@ -169,12 +169,12 @@ void AboutDialog::setBugAddress(const QString &bugAddress) m_aboutData->setBugAddress(m_bugaddress); } -void AboutDialog::setLicense(const QString &key) +void AboutDialog::setLicense(const TQString &key) { if (!m_aboutData) return; - QString license = key.upper(); - QString file; + TQString license = key.upper(); + TQString file; if (key == "GPL_V2") { file = locate("data", "LICENSES/GPL_V2"); @@ -191,7 +191,7 @@ void AboutDialog::setLicense(const QString &key) { file = locate("data", "LICENSES/ARTISTIC"); } - if (file.isEmpty() && !QFile::exists( key )) + if (file.isEmpty() && !TQFile::exists( key )) { if (!key.isEmpty()) m_license = key; @@ -209,12 +209,12 @@ void AboutDialog::setLicense(const QString &key) } -void AboutDialog::setPopulationText(const QString& a_text) +void AboutDialog::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString AboutDialog::populationText() const +TQString AboutDialog::populationText() const { return KommanderWidget::populationText(); } @@ -233,7 +233,7 @@ void AboutDialog::execute() } } -QString AboutDialog::handleDCOP(int function, const QStringList& args) +TQString AboutDialog::handleDCOP(int function, const TQStringList& args) { switch (function) { case Initialize: @@ -289,7 +289,7 @@ QString AboutDialog::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } #include "aboutdialog.moc" diff --git a/kommander/widgets/aboutdialog.h b/kommander/widgets/aboutdialog.h index 0d0249a7..64d6c9ab 100644 --- a/kommander/widgets/aboutdialog.h +++ b/kommander/widgets/aboutdialog.h @@ -12,7 +12,7 @@ #ifndef ABOUTDIALOG_H #define ABOUTDIALOG_H -#include <qlabel.h> +#include <tqlabel.h> #include <kommanderwidget.h> class KAboutApplication; @@ -21,52 +21,52 @@ class KAboutData; /** @author Andras Mantia <amantia@kdewebdev.org> */ -class AboutDialog : public QLabel, public KommanderWidget +class AboutDialog : public TQLabel, public KommanderWidget { Q_OBJECT Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) public: - AboutDialog(QWidget *parent = 0, const char *name = 0); + AboutDialog(TQWidget *parent = 0, const char *name = 0); ~AboutDialog(); virtual bool isKommanderWidget() const; - virtual QString currentState() const; + virtual TQString currentState() const; virtual bool isFunctionSupported(int function); - virtual QString handleDCOP(int function, const QStringList& args); - virtual QString populationText() const; - virtual void setPopulationText(const QString&); - virtual QStringList associatedText() const; - virtual void setAssociatedText(const QStringList&); + virtual TQString handleDCOP(int function, const TQStringList& args); + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); + virtual TQStringList associatedText() const; + virtual void setAssociatedText(const TQStringList&); public slots: virtual void populate(); virtual void execute(); private: - void initialize(const QString& appName, const QString &icon, const QString& version, const QString& copyright); - void addAuthor(const QString& author, const QString &task, const QString& email, const QString &webAddress); - void addTranslator(const QString& author, const QString& email); - void setDescription(const QString& description); - void setHomepage(const QString &homepage); - void setBugAddress(const QString &bugAddress); - void setLicense(const QString &license); + void initialize(const TQString& appName, const TQString &icon, const TQString& version, const TQString& copyright); + void addAuthor(const TQString& author, const TQString &task, const TQString& email, const TQString &webAddress); + void addTranslator(const TQString& author, const TQString& email); + void setDescription(const TQString& description); + void setHomepage(const TQString &homepage); + void setBugAddress(const TQString &bugAddress); + void setLicense(const TQString &license); KAboutData *m_aboutData; - QString m_version; - QString m_appName; - QString m_copyright; - QString m_icon; - QString m_bugaddress; - QStringList m_authors; - QStringList m_emails; - QStringList m_tasks; - QStringList m_addresses; - QString m_description; - QString m_homepage; - QString m_license; + TQString m_version; + TQString m_appName; + TQString m_copyright; + TQString m_icon; + TQString m_bugaddress; + TQStringList m_authors; + TQStringList m_emails; + TQStringList m_tasks; + TQStringList m_addresses; + TQString m_description; + TQString m_homepage; + TQString m_license; }; #endif diff --git a/kommander/widgets/buttongroup.cpp b/kommander/widgets/buttongroup.cpp index 0a6eafc2..751c8e5c 100644 --- a/kommander/widgets/buttongroup.cpp +++ b/kommander/widgets/buttongroup.cpp @@ -17,12 +17,12 @@ #include <klocale.h> /* QT INCLUDES */ -#include <qobject.h> -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> -#include <qbuttongroup.h> -#include <qevent.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> +#include <tqbuttongroup.h> +#include <tqevent.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -38,17 +38,17 @@ enum Functions { LastFunction }; -ButtonGroup::ButtonGroup(QWidget *a_parent, const char *a_name) - : QButtonGroup(a_parent, a_name), KommanderWidget(this) +ButtonGroup::ButtonGroup(TQWidget *a_parent, const char *a_name) + : TQButtonGroup(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "checked"; states << "unchecked"; setStates(states); setDisplayStates(states); KommanderPlugin::setDefaultGroup(Group::DCOP); - KommanderPlugin::registerFunction(BG_selectedId, "selectedId(QString widget)", i18n("Returns the ID of the selected button."), 1); + KommanderPlugin::registerFunction(BG_selectedId, "selectedId(TQString widget)", i18n("Returns the ID of the selected button."), 1); } @@ -56,7 +56,7 @@ ButtonGroup::~ButtonGroup() { } -QString ButtonGroup::currentState() const +TQString ButtonGroup::currentState() const { if (!isCheckable() || isChecked()) return "checked"; @@ -69,22 +69,22 @@ bool ButtonGroup::isKommanderWidget() const return true; } -QStringList ButtonGroup::associatedText() const +TQStringList ButtonGroup::associatedText() const { return KommanderWidget::associatedText(); } -void ButtonGroup::setAssociatedText(const QStringList& a_at) +void ButtonGroup::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void ButtonGroup::setPopulationText(const QString& a_text) +void ButtonGroup::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText( a_text ); } -QString ButtonGroup::populationText() const +TQString ButtonGroup::populationText() const { return KommanderWidget::populationText(); } @@ -94,16 +94,16 @@ void ButtonGroup::populate() //FIXME: implement } -void ButtonGroup::showEvent(QShowEvent* e) +void ButtonGroup::showEvent(TQShowEvent* e) { - QButtonGroup::showEvent(e); + TQButtonGroup::showEvent(e); emit widgetOpened(); } -void ButtonGroup::contextMenuEvent( QContextMenuEvent * e ) +void ButtonGroup::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } @@ -113,29 +113,29 @@ bool ButtonGroup::isFunctionSupported(int f) } -QString ButtonGroup::handleDCOP(int function, const QStringList& args) +TQString ButtonGroup::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: { - QString text; + TQString text; for (int i = 0; i < count(); i++) if (dynamic_cast<KommanderWidget*>(find(i))) text += (dynamic_cast<KommanderWidget*>(find(i)))->evalAssociatedText(); return text; } case DCOP::checked: - return QString::number(isChecked()); + return TQString::number(isChecked()); case DCOP::setChecked: setCheckable(true); setChecked(args[0] != "false"); break; case BG_selectedId: - return QString::number(this->selectedId() ); + return TQString::number(this->selectedId() ); break; case DCOP::geometry: { - QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; break; } @@ -144,7 +144,7 @@ QString ButtonGroup::handleDCOP(int function, const QStringList& args) break; case DCOP::setBackgroundColor: { - QColor color; + TQColor color; color.setNamedColor(args[0]); this->setPaletteBackgroundColor(color); break; @@ -152,7 +152,7 @@ QString ButtonGroup::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } diff --git a/kommander/widgets/buttongroup.h b/kommander/widgets/buttongroup.h index 0e123864..f5a01be3 100644 --- a/kommander/widgets/buttongroup.h +++ b/kommander/widgets/buttongroup.h @@ -19,10 +19,10 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qbuttongroup.h> -#include <qobject.h> -#include <qstringlist.h> -#include <qstring.h> +#include <tqbuttongroup.h> +#include <tqobject.h> +#include <tqstringlist.h> +#include <tqstring.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -31,36 +31,36 @@ class QWidget; class QShowEvent; -class KOMMANDER_EXPORT ButtonGroup : public QButtonGroup, public KommanderWidget +class KOMMANDER_EXPORT ButtonGroup : public TQButtonGroup, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget DESIGNABLE false) public: - ButtonGroup(QWidget *a_parent, const char *a_name); + ButtonGroup(TQWidget *a_parent, const char *a_name); ~ButtonGroup(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: virtual void populate(); signals: void widgetOpened(); - void widgetTextChanged(const QString&); + void widgetTextChanged(const TQString&); void contextMenuRequested(int xpos, int ypos); protected: - void showEvent(QShowEvent* e); - void contextMenuEvent( QContextMenuEvent * e ); + void showEvent(TQShowEvent* e); + void contextMenuEvent( TQContextMenuEvent * e ); private: }; diff --git a/kommander/widgets/checkbox.cpp b/kommander/widgets/checkbox.cpp index e78dbdb8..f7fe20be 100644 --- a/kommander/widgets/checkbox.cpp +++ b/kommander/widgets/checkbox.cpp @@ -16,27 +16,27 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qobject.h> -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qcheckbox.h> -#include <qbutton.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> +#include <tqevent.h> +#include <tqcheckbox.h> +#include <tqbutton.h> /* OTHER INCLUDES */ #include <specials.h> #include "checkbox.h" -CheckBox::CheckBox(QWidget *a_parent, const char *a_name) - : QCheckBox(a_parent, a_name), KommanderWidget(this) +CheckBox::CheckBox(TQWidget *a_parent, const char *a_name) + : TQCheckBox(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "unchecked"; states << "semichecked"; states << "checked"; setStates(states); - QStringList displayStates; + TQStringList displayStates; displayStates << "checked"; displayStates << "semichecked"; displayStates << "unchecked"; @@ -47,15 +47,15 @@ CheckBox::~CheckBox() { } -QString CheckBox::currentState() const +TQString CheckBox::currentState() const { - if (state() == QButton::Off) + if (state() == TQButton::Off) return "unchecked"; - else if (state() == QButton::NoChange) + else if (state() == TQButton::NoChange) return "semichecked"; - else if (state() == QButton::On) + else if (state() == TQButton::On) return "checked"; - return QString(); + return TQString(); } bool CheckBox::isKommanderWidget() const @@ -63,22 +63,22 @@ bool CheckBox::isKommanderWidget() const return true; } -QStringList CheckBox::associatedText() const +TQStringList CheckBox::associatedText() const { return KommanderWidget::associatedText(); } -void CheckBox::setAssociatedText(const QStringList & a_at) +void CheckBox::setAssociatedText(const TQStringList & a_at) { KommanderWidget::setAssociatedText(a_at); } -void CheckBox::setPopulationText(const QString & a_text) +void CheckBox::setPopulationText(const TQString & a_text) { KommanderWidget::setPopulationText(a_text); } -QString CheckBox::populationText() const +TQString CheckBox::populationText() const { return KommanderWidget::populationText(); } @@ -88,15 +88,15 @@ void CheckBox::populate() setWidgetText(KommanderWidget::evalAssociatedText(populationText())); } -void CheckBox::setWidgetText(const QString& a_text) +void CheckBox::setWidgetText(const TQString& a_text) { setText(a_text); emit widgetTextChanged(a_text); } -void CheckBox::showEvent(QShowEvent* e) +void CheckBox::showEvent(TQShowEvent* e) { - QCheckBox::showEvent(e); + TQCheckBox::showEvent(e); emit widgetOpened(); } @@ -105,14 +105,14 @@ bool CheckBox::isFunctionSupported(int f) return f == DCOP::text || f == DCOP::setText || f == DCOP::checked || f == DCOP::setChecked || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; } -void CheckBox::contextMenuEvent( QContextMenuEvent * e ) +void CheckBox::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } -QString CheckBox::handleDCOP(int function, const QStringList& args) +TQString CheckBox::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: @@ -121,13 +121,13 @@ QString CheckBox::handleDCOP(int function, const QStringList& args) setWidgetText(args[0]); break; case DCOP::checked: - return QString::number(isChecked()); + return TQString::number(isChecked()); case DCOP::setChecked: setChecked(args[0] != "false" && args[0] != "0"); break; case DCOP::geometry: { - QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; break; } @@ -136,7 +136,7 @@ QString CheckBox::handleDCOP(int function, const QStringList& args) break; case DCOP::setBackgroundColor: { - QColor color; + TQColor color; color.setNamedColor(args[0]); this->setPaletteBackgroundColor(color); break; @@ -144,7 +144,7 @@ QString CheckBox::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } diff --git a/kommander/widgets/checkbox.h b/kommander/widgets/checkbox.h index c9743434..f3da677f 100644 --- a/kommander/widgets/checkbox.h +++ b/kommander/widgets/checkbox.h @@ -19,10 +19,10 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qobject.h> -#include <qstringlist.h> -#include <qstring.h> -#include <qcheckbox.h> +#include <tqobject.h> +#include <tqstringlist.h> +#include <tqstring.h> +#include <tqcheckbox.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -31,36 +31,36 @@ class QWidget; class QShowEvent; -class KOMMANDER_EXPORT CheckBox : public QCheckBox, public KommanderWidget +class KOMMANDER_EXPORT CheckBox : public TQCheckBox, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - CheckBox(QWidget *a_parent, const char *a_name); + CheckBox(TQWidget *a_parent, const char *a_name); ~CheckBox(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: - virtual void setWidgetText(const QString&); + virtual void setWidgetText(const TQString&); virtual void populate(); signals: void widgetOpened(); - void widgetTextChanged(const QString&); + void widgetTextChanged(const TQString&); void contextMenuRequested(int xpos, int ypos); protected: - void showEvent(QShowEvent *e); - void contextMenuEvent( QContextMenuEvent * e ); + void showEvent(TQShowEvent *e); + void contextMenuEvent( TQContextMenuEvent * e ); private: }; diff --git a/kommander/widgets/closebutton.cpp b/kommander/widgets/closebutton.cpp index 9da9f1a0..d30a9346 100644 --- a/kommander/widgets/closebutton.cpp +++ b/kommander/widgets/closebutton.cpp @@ -19,45 +19,45 @@ #include <klocale.h> /* QT INCLUDES */ -#include <qdialog.h> -#include <qevent.h> -#include <qobject.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qwidget.h> +#include <tqdialog.h> +#include <tqevent.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqwidget.h> /* OTHER INCLUDES */ #include <specials.h> #include "closebutton.h" -CloseButton::CloseButton(QWidget* a_parent, const char* a_name) +CloseButton::CloseButton(TQWidget* a_parent, const char* a_name) : KPushButton(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); setWriteStdout(true); - connect(this, SIGNAL(clicked()), this, SLOT(startProcess())); + connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(startProcess())); - QObject *parent = this; + TQObject *parent = this; while (parent->parent() != 0) { parent = parent->parent(); - if (parent->inherits("QDialog")) + if (parent->inherits("TQDialog")) break; } - connect(this, SIGNAL(clicked()), parent, SLOT(reject())); + connect(this, TQT_SIGNAL(clicked()), parent, TQT_SLOT(reject())); } CloseButton::~CloseButton() { } -QString CloseButton::currentState() const +TQString CloseButton::currentState() const { - return QString("default"); + return TQString("default"); } bool CloseButton::isKommanderWidget() const @@ -65,22 +65,22 @@ bool CloseButton::isKommanderWidget() const return true; } -QStringList CloseButton::associatedText() const +TQStringList CloseButton::associatedText() const { return KommanderWidget::associatedText(); } -void CloseButton::setAssociatedText(const QStringList& a_at) +void CloseButton::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void CloseButton::setPopulationText(const QString& a_text) +void CloseButton::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString CloseButton::populationText() const +TQString CloseButton::populationText() const { return KommanderWidget::populationText(); } @@ -90,7 +90,7 @@ void CloseButton::populate() setWidgetText(KommanderWidget::evalAssociatedText(populationText())); } -void CloseButton::setWidgetText(const QString& a_text) +void CloseButton::setWidgetText(const TQString& a_text) { setText(a_text); emit widgetTextChanged(a_text); @@ -98,17 +98,17 @@ void CloseButton::setWidgetText(const QString& a_text) void CloseButton::startProcess() { - QString at = evalAssociatedText(); + TQString at = evalAssociatedText(); if (!at.isEmpty()) { KShellProcess *process = new KShellProcess("/bin/sh"); *process << at; - connect(process, SIGNAL(processExited(KProcess *)), SLOT(endProcess(KProcess *))); - connect(process, SIGNAL(receivedStdout(KProcess *, char *, int)), SLOT(appendOutput(KProcess *, + connect(process, TQT_SIGNAL(processExited(KProcess *)), TQT_SLOT(endProcess(KProcess *))); + connect(process, TQT_SIGNAL(receivedStdout(KProcess *, char *, int)), TQT_SLOT(appendOutput(KProcess *, char *, int))); - connect(process, SIGNAL(receivedStderr(KProcess *, char *, int)), SLOT(appendOutput(KProcess *, + connect(process, TQT_SIGNAL(receivedStderr(KProcess *, char *, int)), TQT_SLOT(appendOutput(KProcess *, char *, int))); if (!process->start(KProcess::Block, KProcess::Stdout)) @@ -128,7 +128,7 @@ void CloseButton::appendOutput(KProcess *, char *a_buffer, int a_len) for (int i = 0; i < a_len; ++i) buffer[i] = a_buffer[i]; - QString bufferString(buffer); + TQString bufferString(buffer); m_output += bufferString; if (writeStdout()) { @@ -155,9 +155,9 @@ void CloseButton::setWriteStdout(bool a_enable) m_writeStdout = a_enable; } -void CloseButton::showEvent(QShowEvent *e) +void CloseButton::showEvent(TQShowEvent *e) { - QPushButton::showEvent(e); + TQPushButton::showEvent(e); emit widgetOpened(); } @@ -166,7 +166,7 @@ bool CloseButton::isFunctionSupported(int f) return f == DCOP::text || f == DCOP::setText; } -QString CloseButton::handleDCOP(int function, const QStringList& args) +TQString CloseButton::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: @@ -177,7 +177,7 @@ QString CloseButton::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } #include "closebutton.moc" diff --git a/kommander/widgets/closebutton.h b/kommander/widgets/closebutton.h index 8b7aa57a..20c44eac 100644 --- a/kommander/widgets/closebutton.h +++ b/kommander/widgets/closebutton.h @@ -22,7 +22,7 @@ #include <kpushbutton.h> /* QT INCLUDES */ -#include <qobject.h> +#include <tqobject.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -34,38 +34,38 @@ class KOMMANDER_EXPORT CloseButton : public KPushButton, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) Q_PROPERTY(bool writeStdout READ writeStdout WRITE setWriteStdout) public: - CloseButton(QWidget* a_parent, const char* a_name); + CloseButton(TQWidget* a_parent, const char* a_name); ~CloseButton(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); bool writeStdout() const; - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: virtual void setWriteStdout(bool); - virtual void setWidgetText(const QString &); + virtual void setWidgetText(const TQString &); virtual void startProcess(); virtual void appendOutput(KProcess*, char*, int); virtual void endProcess(KProcess*); virtual void populate(); signals: void widgetOpened(); - void widgetTextChanged(const QString&); + void widgetTextChanged(const TQString&); protected: bool m_writeStdout; - QString m_output; - void showEvent(QShowEvent* e); + TQString m_output; + void showEvent(TQShowEvent* e); private: }; diff --git a/kommander/widgets/combobox.cpp b/kommander/widgets/combobox.cpp index 250d3820..cab29337 100644 --- a/kommander/widgets/combobox.cpp +++ b/kommander/widgets/combobox.cpp @@ -19,10 +19,10 @@ #include <klocale.h> /* QT INCLUDES */ -#include <qobject.h> -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> /* OTHER INCLUDES */ #include <kommanderplugin.h> @@ -36,18 +36,18 @@ enum Functions { }; -ComboBox::ComboBox(QWidget *a_parent, const char *a_name) +ComboBox::ComboBox(TQWidget *a_parent, const char *a_name) : KComboBox(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); - connect(this, SIGNAL(activated(int)), this, SLOT(emitWidgetTextChanged(int))); + connect(this, TQT_SIGNAL(activated(int)), this, TQT_SLOT(emitWidgetTextChanged(int))); KommanderPlugin::setDefaultGroup(Group::DCOP); - KommanderPlugin::registerFunction(popupList, "popupList(QString widget)", i18n("Make the ComboBox expose it's list without mousing around."), 1); + KommanderPlugin::registerFunction(popupList, "popupList(TQString widget)", i18n("Make the ComboBox expose it's list without mousing around."), 1); } @@ -55,9 +55,9 @@ ComboBox::~ComboBox() { } -QString ComboBox::currentState() const +TQString ComboBox::currentState() const { - return QString("default"); + return TQString("default"); } bool ComboBox::isKommanderWidget() const @@ -65,22 +65,22 @@ bool ComboBox::isKommanderWidget() const return true; } -QStringList ComboBox::associatedText() const +TQStringList ComboBox::associatedText() const { return KommanderWidget::associatedText(); } -void ComboBox::setAssociatedText(const QStringList& a_at) +void ComboBox::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void ComboBox::setPopulationText(const QString& a_text) +void ComboBox::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString ComboBox::populationText() const +TQString ComboBox::populationText() const { return KommanderWidget::populationText(); } @@ -90,10 +90,10 @@ void ComboBox::populate() setWidgetText(KommanderWidget::evalAssociatedText( populationText())); } -void ComboBox::setWidgetText(const QString& a_text) +void ComboBox::setWidgetText(const TQString& a_text) { clear(); - insertStringList(QStringList::split("\n", a_text)); + insertStringList(TQStringList::split("\n", a_text)); emit widgetTextChanged(a_text); } @@ -102,16 +102,16 @@ void ComboBox::emitWidgetTextChanged(int a_index) emit widgetTextChanged(text(a_index)); } -void ComboBox::showEvent(QShowEvent *e) +void ComboBox::showEvent(TQShowEvent *e) { - QComboBox::showEvent( e ); + TQComboBox::showEvent( e ); emit widgetOpened(); } -void ComboBox::contextMenuEvent( QContextMenuEvent * e ) +void ComboBox::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } @@ -124,7 +124,7 @@ bool ComboBox::isFunctionSupported(int f) f == DCOP::addUniqueItem || f == DCOP::clear || f == DCOP::count || f == DCOP::setEditable || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction); } -QString ComboBox::handleDCOP(int function, const QStringList& args) +TQString ComboBox::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: @@ -135,7 +135,7 @@ QString ComboBox::handleDCOP(int function, const QStringList& args) case DCOP::selection: return currentText(); case DCOP::currentItem: - return QString::number(currentItem()); + return TQString::number(currentItem()); case DCOP::setCurrentItem: setCurrentItem(args[0].toUInt()); break; @@ -153,19 +153,19 @@ QString ComboBox::handleDCOP(int function, const QStringList& args) insertItem(args[0], args[1].toInt()); break; case DCOP::insertItems: - insertStringList(QStringList::split("\n", args[0]), args[1].toInt()); + insertStringList(TQStringList::split("\n", args[0]), args[1].toInt()); break; case DCOP::addUniqueItem: for (int i=0; i<count(); i++) if (text(i) == args[0]) - return QString(); + return TQString(); insertItem(args[0]); break; case DCOP::clear: clear(); break; case DCOP::count: - return QString::number(count()); + return TQString::number(count()); case DCOP::setSelection: { for (int i = 0; i < count(); i++) @@ -184,27 +184,27 @@ QString ComboBox::handleDCOP(int function, const QStringList& args) break; case DCOP::setBackgroundColor: { - QColor color; + TQColor color; color.setNamedColor(args[0]); this->setPaletteBackgroundColor(color); break; } case popupList: - QComboBox::popup(); + TQComboBox::popup(); break; case DCOP::geometry: { - QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; break; } case DCOP::hasFocus: - return QString::number(this->hasFocus()); + return TQString::number(this->hasFocus()); break; default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } #include "combobox.moc" diff --git a/kommander/widgets/combobox.h b/kommander/widgets/combobox.h index 916846d9..6dd4fb71 100644 --- a/kommander/widgets/combobox.h +++ b/kommander/widgets/combobox.h @@ -20,9 +20,9 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qstringlist.h> -#include <qobject.h> -#include <qstring.h> +#include <tqstringlist.h> +#include <tqobject.h> +#include <tqstring.h> /* OTHER INCLUDES */ #include <kcombobox.h> @@ -35,35 +35,35 @@ class KOMMANDER_EXPORT ComboBox : public KComboBox, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - ComboBox(QWidget *a_parent, const char *a_name); + ComboBox(TQWidget *a_parent, const char *a_name); ~ComboBox(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: - virtual void setWidgetText(const QString&); + virtual void setWidgetText(const TQString&); virtual void populate(); virtual void emitWidgetTextChanged(int); signals: void widgetOpened(); - void widgetTextChanged(const QString&); + void widgetTextChanged(const TQString&); void contextMenuRequested(int xpos, int ypos); protected: - void showEvent(QShowEvent *e); - void contextMenuEvent( QContextMenuEvent * e ); + void showEvent(TQShowEvent *e); + void contextMenuEvent( TQContextMenuEvent * e ); private: }; diff --git a/kommander/widgets/datepicker.cpp b/kommander/widgets/datepicker.cpp index c1b1f834..928e1b81 100644 --- a/kommander/widgets/datepicker.cpp +++ b/kommander/widgets/datepicker.cpp @@ -17,19 +17,19 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qdatetime.h> -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> +#include <tqdatetime.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> /* OTHER INCLUDES */ #include <specials.h> #include "datepicker.h" -DatePicker::DatePicker(QWidget *a_parent, const char *a_name) +DatePicker::DatePicker(TQWidget *a_parent, const char *a_name) : KDatePicker(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); @@ -39,9 +39,9 @@ DatePicker::~DatePicker() { } -QString DatePicker::currentState() const +TQString DatePicker::currentState() const { - return QString("default"); + return TQString("default"); } bool DatePicker::isKommanderWidget() const @@ -49,22 +49,22 @@ bool DatePicker::isKommanderWidget() const return true; } -QStringList DatePicker::associatedText() const +TQStringList DatePicker::associatedText() const { return KommanderWidget::associatedText(); } -void DatePicker::setAssociatedText(const QStringList& a_at) +void DatePicker::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void DatePicker::setPopulationText(const QString& a_text) +void DatePicker::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString DatePicker::populationText() const +TQString DatePicker::populationText() const { return KommanderWidget::populationText(); } @@ -74,27 +74,27 @@ void DatePicker::populate() setWidgetText(KommanderWidget::evalAssociatedText( populationText())); } -void DatePicker::setWidgetText(const QString& a_text) +void DatePicker::setWidgetText(const TQString& a_text) { - setDate(QDate::fromString(a_text, Qt::ISODate)); + setDate(TQDate::fromString(a_text, Qt::ISODate)); emit widgetTextChanged(a_text); } -QString DatePicker::widgetText() const +TQString DatePicker::widgetText() const { return date().toString(Qt::ISODate); } -void DatePicker::showEvent(QShowEvent *e) +void DatePicker::showEvent(TQShowEvent *e) { KDatePicker::showEvent( e ); emit widgetOpened(); } -void DatePicker::contextMenuEvent( QContextMenuEvent * e ) +void DatePicker::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } @@ -104,27 +104,27 @@ bool DatePicker::isFunctionSupported(int f) return f == DCOP::text || f == DCOP::setText || f == DCOP::geometry || f == DCOP::hasFocus ; } -QString DatePicker::handleDCOP(int function, const QStringList& args) +TQString DatePicker::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: return date().toString(Qt::ISODate); case DCOP::setText: - setDate(QDate::fromString(args[0], Qt::ISODate)); + setDate(TQDate::fromString(args[0], Qt::ISODate)); break; case DCOP::geometry: { - QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; break; } case DCOP::hasFocus: - return QString::number(this->hasFocus()); + return TQString::number(this->hasFocus()); break; default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } #include "datepicker.moc" diff --git a/kommander/widgets/datepicker.h b/kommander/widgets/datepicker.h index 0383937a..242f1a65 100644 --- a/kommander/widgets/datepicker.h +++ b/kommander/widgets/datepicker.h @@ -20,9 +20,9 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qstringlist.h> -#include <qobject.h> -#include <qstring.h> +#include <tqstringlist.h> +#include <tqobject.h> +#include <tqstring.h> /* OTHER INCLUDES */ #include <kdatepicker.h> @@ -35,35 +35,35 @@ class KOMMANDER_EXPORT DatePicker : public KDatePicker, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - DatePicker(QWidget *a_parent, const char *a_name); + DatePicker(TQWidget *a_parent, const char *a_name); ~DatePicker(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); - virtual QString widgetText() const; + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); + virtual TQString widgetText() const; - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: - virtual void setWidgetText(const QString&); + virtual void setWidgetText(const TQString&); virtual void populate(); signals: void widgetOpened(); - void widgetTextChanged(const QString&); + void widgetTextChanged(const TQString&); void contextMenuRequested(int xpos, int ypos); protected: - void showEvent(QShowEvent *e); - void contextMenuEvent( QContextMenuEvent * e ); + void showEvent(TQShowEvent *e); + void contextMenuEvent( TQContextMenuEvent * e ); private: }; diff --git a/kommander/widgets/dialog.cpp b/kommander/widgets/dialog.cpp index ef9b727b..fd3b0b27 100644 --- a/kommander/widgets/dialog.cpp +++ b/kommander/widgets/dialog.cpp @@ -17,14 +17,14 @@ #include <klocale.h> /* QT INCLUDES */ -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qdialog.h> -#include <qpoint.h> -#include <qcursor.h> -#include <qapplication.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> +#include <tqevent.h> +#include <tqdialog.h> +#include <tqpoint.h> +#include <tqcursor.h> +#include <tqapplication.h> /* OTHER INCLUDES */ #include <specials.h> @@ -40,10 +40,10 @@ enum Functions { LastFunction }; -Dialog::Dialog(QWidget *a_parent, const char *a_name, bool a_modal, int a_flags) - : QDialog(a_parent, a_name, a_modal, a_flags), KommanderWindow(this) +Dialog::Dialog(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags) + : TQDialog(a_parent, a_name, a_modal, a_flags), KommanderWindow(this) { - QStringList states; + TQStringList states; states << "default"; states << "initialization"; states << "destroy"; @@ -53,9 +53,9 @@ Dialog::Dialog(QWidget *a_parent, const char *a_name, bool a_modal, int a_flags) m_shebang = "#!/usr/bin/kmdr-executor"; m_firstShow = true; KommanderPlugin::setDefaultGroup(Group::DCOP); - KommanderPlugin::registerFunction(D_focusWidget, "focusWidget(QString widget)", i18n("The name of the widget having focus"), 1); - KommanderPlugin::registerFunction(D_waitCursor, "waitCursor(QString widget)", i18n("Set a wait cursor. CAUTION: if set more than once an equal number of calls to restore must be made to clear it."), 1); - KommanderPlugin::registerFunction(D_restoreCursor, "restoreCursor(QString widget)", i18n("Restore normal curser. NOTE: must be called as many times as wait was."), 1); + KommanderPlugin::registerFunction(D_focusWidget, "focusWidget(TQString widget)", i18n("The name of the widget having focus"), 1); + KommanderPlugin::registerFunction(D_waitCursor, "waitCursor(TQString widget)", i18n("Set a wait cursor. CAUTION: if set more than once an equal number of calls to restore must be made to clear it."), 1); + KommanderPlugin::registerFunction(D_restoreCursor, "restoreCursor(TQString widget)", i18n("Restore normal curser. NOTE: must be called as many times as wait was."), 1); } Dialog::~Dialog() @@ -64,9 +64,9 @@ Dialog::~Dialog() destroy(); } -QString Dialog::currentState() const +TQString Dialog::currentState() const { - return QString("default"); + return TQString("default"); } bool Dialog::isKommanderWidget() const @@ -86,22 +86,22 @@ void Dialog::setUseInternalParser(bool b) } -QStringList Dialog::associatedText() const +TQStringList Dialog::associatedText() const { return KommanderWidget::associatedText(); } -void Dialog::setAssociatedText(const QStringList& a_at) +void Dialog::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void Dialog::setPopulationText(const QString& a_text) +void Dialog::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText( a_text ); } -QString Dialog::populationText() const +TQString Dialog::populationText() const { return KommanderWidget::populationText(); } @@ -113,7 +113,7 @@ void Dialog::populate() void Dialog::initialize() { - const QStringList assoc = associatedText(); + const TQStringList assoc = associatedText(); if (assoc.count() > 1 && !assoc[1].isEmpty()) { MyProcess proc(this); @@ -123,7 +123,7 @@ void Dialog::initialize() void Dialog::destroy() { - const QStringList assoc = associatedText(); + const TQStringList assoc = associatedText(); if (assoc.count() > 2 && !assoc[2].isEmpty()) { MyProcess proc(this); @@ -132,7 +132,7 @@ void Dialog::destroy() } -void Dialog::setWidgetText(const QString& a_text) +void Dialog::setWidgetText(const TQString& a_text) { setCaption(a_text); emit widgetTextChanged(a_text); @@ -140,7 +140,7 @@ void Dialog::setWidgetText(const QString& a_text) void Dialog::exec() { - QDialog::exec(); + TQDialog::exec(); emit finished(); } @@ -148,14 +148,14 @@ void Dialog::show() { //if the dialog is embedded in a KPart, the show can be called many times. //to avoid re-init and sending signals we don't want, in that case call only the -//QWidget's show method to show the widgets, but don't do any QDialog specific +//QWidget's show method to show the widgets, but don't do any TQDialog specific //task if (!m_firstShow) { - QWidget::show(); + TQWidget::show(); } else { - QDialog::show(); + TQDialog::show(); if (!inEditor) initialize(); m_firstShow = false; @@ -166,28 +166,28 @@ void Dialog::done(int r) { /* if (!inEditor) destroy();*/ - QDialog::done(r); + TQDialog::done(r); } -void Dialog::showEvent(QShowEvent *e) +void Dialog::showEvent(TQShowEvent *e) { - QDialog::showEvent( e ); + TQDialog::showEvent( e ); emit widgetOpened(); } -void Dialog::keyPressEvent( QKeyEvent *e ) +void Dialog::keyPressEvent( TQKeyEvent *e ) { if ( e->state() == 0 && e->key() == Key_Escape) return; else - QDialog::keyPressEvent(e); + TQDialog::keyPressEvent(e); } -void Dialog::contextMenuEvent( QContextMenuEvent * e ) +void Dialog::contextMenuEvent( TQContextMenuEvent * e ) { - QDialog::contextMenuEvent( e ); - QPoint p = e->globalPos(); + TQDialog::contextMenuEvent( e ); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } @@ -196,7 +196,7 @@ bool Dialog::isFunctionSupported(int f) return f == DCOP::text || f == DCOP::setText || f == DCOP::geometry || (f > FirstFunction && f < LastFunction); } -QString Dialog::handleDCOP(int function, const QStringList& args) +TQString Dialog::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: @@ -205,21 +205,21 @@ QString Dialog::handleDCOP(int function, const QStringList& args) setWidgetText(args[0]); break; case DCOP::geometry: - return QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + return TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); break; case D_focusWidget: return focusWidget()->name(); break; case D_waitCursor: - QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); + TQApplication::setOverrideCursor(TQCursor(Qt::WaitCursor)); break; case D_restoreCursor: - QApplication::restoreOverrideCursor(); + TQApplication::restoreOverrideCursor(); break; default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } diff --git a/kommander/widgets/dialog.h b/kommander/widgets/dialog.h index 091ff890..794e5dbc 100644 --- a/kommander/widgets/dialog.h +++ b/kommander/widgets/dialog.h @@ -20,46 +20,46 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qdialog.h> +#include <tqdialog.h> /* OTHER INCLUDES */ #include <kommanderwindow.h> #include <kommander_export.h> class QShowEvent; -class KOMMANDER_EXPORT Dialog : public QDialog, public KommanderWindow +class KOMMANDER_EXPORT Dialog : public TQDialog, public KommanderWindow { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) Q_PROPERTY(bool useInternalParser READ useInternalParser WRITE setUseInternalParser) Q_PROPERTY(bool useShebang READ useShebang WRITE setUseShebang DESIGNABLE true) - Q_PROPERTY(QString shebang READ Shebang WRITE setShebang DESIGNABLE true) + Q_PROPERTY(TQString shebang READ Shebang WRITE setShebang DESIGNABLE true) Q_OVERRIDE(bool modal DESIGNABLE false) public: - Dialog(QWidget *, const char *, bool = true, int=0); + Dialog(TQWidget *, const char *, bool = true, int=0); ~Dialog(); virtual bool isKommanderWidget() const; virtual bool useInternalParser() const; virtual void setUseInternalParser(bool b); - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); virtual void show(); bool useShebang() const { return m_useShebang; } void setUseShebang(bool useit) { m_useShebang = useit; } - QString Shebang() const { return m_shebang; } - void setShebang(const QString &text) { m_shebang = text; } + TQString Shebang() const { return m_shebang; } + void setShebang(const TQString &text) { m_shebang = text; } - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: - virtual void setWidgetText(const QString&); + virtual void setWidgetText(const TQString&); virtual void exec(); virtual void populate(); virtual void done(int r); @@ -69,19 +69,19 @@ protected slots: signals: void widgetOpened(); - void widgetTextChanged(const QString&); + void widgetTextChanged(const TQString&); void finished(); void contextMenuRequested(int xpos, int ypos); protected: - void showEvent( QShowEvent *e ); - void keyPressEvent( QKeyEvent * ); - void contextMenuEvent( QContextMenuEvent * e ); + void showEvent( TQShowEvent *e ); + void keyPressEvent( TQKeyEvent * ); + void contextMenuEvent( TQContextMenuEvent * e ); private: - QString m_fileName; + TQString m_fileName; bool m_useInternalParser; bool m_useShebang; //add m_shebang at the beginning of the dialog code or not bool m_firstShow; //tells if the show method was called before or not - QString m_shebang; //#!/usr/bin/kmdr-executor or similar + TQString m_shebang; //#!/usr/bin/kmdr-executor or similar }; #endif diff --git a/kommander/widgets/execbutton.cpp b/kommander/widgets/execbutton.cpp index 69d06f8b..eccfe306 100644 --- a/kommander/widgets/execbutton.cpp +++ b/kommander/widgets/execbutton.cpp @@ -20,14 +20,14 @@ #include <kmessagebox.h> /* QT INCLUDES */ -#include <qcursor.h> -#include <qevent.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qwidget.h> -#include <qpopupmenu.h> -#include <qapplication.h> -#include <qwidgetlist.h> +#include <tqcursor.h> +#include <tqevent.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqwidget.h> +#include <tqpopupmenu.h> +#include <tqapplication.h> +#include <tqwidgetlist.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -47,30 +47,30 @@ enum Functions { LastFunction }; -ExecButton::ExecButton(QWidget* a_parent, const char* a_name) +ExecButton::ExecButton(TQWidget* a_parent, const char* a_name) : KPushButton(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); setWriteStdout(true); setBlockGUI(Button); - connect(this, SIGNAL(clicked()), this, SLOT(startProcess())); + connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(startProcess())); KommanderPlugin::setDefaultGroup(Group::DCOP); - KommanderPlugin::registerFunction(EB_isOn, "isOn(QString widget)", i18n("For use only when button is togle type."), 1); - KommanderPlugin::registerFunction(EB_setPopup, "setPopup(QString widget, QString Menu)", i18n("Associate a Kommander PopupMenu with this ExecButton."), 2); - KommanderPlugin::registerFunction(EB_setButtonText, "setButtonText(QString widget, QString Text)", i18n("Set the text on the ExecButton."), 2); + KommanderPlugin::registerFunction(EB_isOn, "isOn(TQString widget)", i18n("For use only when button is togle type."), 1); + KommanderPlugin::registerFunction(EB_setPopup, "setPopup(TQString widget, TQString Menu)", i18n("Associate a Kommander PopupMenu with this ExecButton."), 2); + KommanderPlugin::registerFunction(EB_setButtonText, "setButtonText(TQString widget, TQString Text)", i18n("Set the text on the ExecButton."), 2); } ExecButton::~ExecButton() { } -QString ExecButton::currentState() const +TQString ExecButton::currentState() const { - return QString("default"); + return TQString("default"); } bool ExecButton::isKommanderWidget() const @@ -78,33 +78,33 @@ bool ExecButton::isKommanderWidget() const return true; } -QStringList ExecButton::associatedText() const +TQStringList ExecButton::associatedText() const { return KommanderWidget::associatedText(); } -void ExecButton::setAssociatedText(const QStringList& a_at) +void ExecButton::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void ExecButton::setPopulationText(const QString& a_text) +void ExecButton::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString ExecButton::populationText() const +TQString ExecButton::populationText() const { return KommanderWidget::populationText(); } void ExecButton::populate() { - QString txt = KommanderWidget::evalAssociatedText(populationText()); + TQString txt = KommanderWidget::evalAssociatedText(populationText()); setWidgetText(txt); } -void ExecButton::setWidgetText(const QString& a_text) +void ExecButton::setWidgetText(const TQString& a_text) { setText(a_text); emit widgetTextChanged(a_text); @@ -112,15 +112,15 @@ void ExecButton::setWidgetText(const QString& a_text) void ExecButton::startProcess() { - QString at = evalAssociatedText().stripWhiteSpace(); + TQString at = evalAssociatedText().stripWhiteSpace(); bool enabledStatus = isEnabled(); if (m_blockGUI != None) setEnabled(false); if (m_blockGUI == GUI) - KApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); + KApplication::setOverrideCursor(TQCursor(Qt::WaitCursor)); MyProcess* process = new MyProcess(this); process->setBlocking(m_blockGUI == GUI); - connect(process, SIGNAL(processExited(MyProcess*)), SLOT(processExited(MyProcess*))); + connect(process, TQT_SIGNAL(processExited(MyProcess*)), TQT_SLOT(processExited(MyProcess*))); m_output = process->run(at); if (m_blockGUI == GUI) { @@ -165,16 +165,16 @@ void ExecButton::processExited(MyProcess* p) } } -void ExecButton::showEvent(QShowEvent* e) +void ExecButton::showEvent(TQShowEvent* e) { KPushButton::showEvent(e); emit widgetOpened(); } -void ExecButton::contextMenuEvent( QContextMenuEvent * e ) +void ExecButton::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } @@ -183,7 +183,7 @@ bool ExecButton::isFunctionSupported(int f) return f == DCOP::text || f == DCOP::setText || f == DCOP::execute || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction); } -QString ExecButton::handleDCOP(int function, const QStringList& args) +TQString ExecButton::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: @@ -195,21 +195,21 @@ QString ExecButton::handleDCOP(int function, const QStringList& args) startProcess(); break; case EB_isOn: - return QString::number(this->isOn() ); + return TQString::number(this->isOn() ); break; case EB_setButtonText: ExecButton::setText(args[0]); break; case EB_setPopup: { - QWidgetList *list = QApplication::allWidgets(); - QWidgetListIt it( *list ); - QWidget * w; + TQWidgetList *list = TQApplication::allWidgets(); + TQWidgetListIt it( *list ); + TQWidget * w; while ( (w=it.current()) != 0 ) { // for each widget... ++it; if (w->name() == args[0] && w->className() == "PopupMenu") { - QPopupMenu *popup = dynamic_cast<QPopupMenu*>(w->child("unnamed", "KPopupMenu")); + TQPopupMenu *popup = dynamic_cast<TQPopupMenu*>(w->child("unnamed", "KPopupMenu")); this->setPopup(popup); } } @@ -217,7 +217,7 @@ QString ExecButton::handleDCOP(int function, const QStringList& args) } case DCOP::geometry: { - QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; break; } @@ -226,7 +226,7 @@ QString ExecButton::handleDCOP(int function, const QStringList& args) break; case DCOP::setBackgroundColor: { - QColor color; + TQColor color; color.setNamedColor(args[0]); this->setPaletteBackgroundColor(color); break; @@ -234,7 +234,7 @@ QString ExecButton::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } diff --git a/kommander/widgets/execbutton.h b/kommander/widgets/execbutton.h index 2e2ea60a..925fa498 100644 --- a/kommander/widgets/execbutton.h +++ b/kommander/widgets/execbutton.h @@ -22,7 +22,7 @@ #include <kpushbutton.h> /* QT INCLUDES */ -#include <qobject.h> +#include <tqobject.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -38,23 +38,23 @@ class KOMMANDER_EXPORT ExecButton : public KPushButton, public KommanderWidget Q_OBJECT Q_ENUMS(Blocking) - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) Q_PROPERTY(bool writeStdout READ writeStdout WRITE setWriteStdout) Q_PROPERTY(Blocking blockGUI READ blockGUI WRITE setBlockGUI) public: - ExecButton(QWidget *a_parent, const char *a_name); + ExecButton(TQWidget *a_parent, const char *a_name); ~ExecButton(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); // Handle stdout setting virtual void setWriteStdout(bool); @@ -64,11 +64,11 @@ public: virtual void setBlockGUI(Blocking a_enable); Blocking blockGUI() const; - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: virtual void populate(); - virtual void setWidgetText(const QString &); + virtual void setWidgetText(const TQString &); // Execute script from associastedText virtual void startProcess(); @@ -76,18 +76,18 @@ public slots: virtual void processExited(MyProcess* p); signals: void widgetOpened(); - void widgetTextChanged(const QString&); + void widgetTextChanged(const TQString&); void contextMenuRequested(int xpos, int ypos); protected: - void contextMenuEvent( QContextMenuEvent * e ); + void contextMenuEvent( TQContextMenuEvent * e ); // Whether output from process should be put in real stdout bool m_writeStdout; // Whether pressing execubtton should block GUI until process ends Blocking m_blockGUI; // Output from process - QString m_output; - void showEvent( QShowEvent *e ); + TQString m_output; + void showEvent( TQShowEvent *e ); private: }; diff --git a/kommander/widgets/fileselector.cpp b/kommander/widgets/fileselector.cpp index b220b8d9..a7c29673 100644 --- a/kommander/widgets/fileselector.cpp +++ b/kommander/widgets/fileselector.cpp @@ -23,21 +23,21 @@ #include <kiconloader.h> /* QT INCLUDES */ -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qlayout.h> -#include <qsizepolicy.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> +#include <tqevent.h> +#include <tqlayout.h> +#include <tqsizepolicy.h> /* OTHER INCLUDES */ #include <specials.h> #include "fileselector.h" -FileSelector::FileSelector(QWidget * a_parent, const char *a_name) - : QWidget(a_parent, a_name), KommanderWidget(this) +FileSelector::FileSelector(TQWidget * a_parent, const char *a_name) + : TQWidget(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); @@ -46,15 +46,15 @@ FileSelector::FileSelector(QWidget * a_parent, const char *a_name) m_selectButton = new KPushButton(BarIconSet("fileopen"), "", this); - m_boxLayout = new QHBoxLayout(this, 0, 11); + m_boxLayout = new TQHBoxLayout(this, 0, 11); m_boxLayout->addWidget(m_lineEdit); m_boxLayout->addWidget(m_selectButton); setSizePolicy(m_lineEdit->sizePolicy()); - m_lineEdit->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); - m_selectButton->setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding)); + m_lineEdit->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding)); + m_selectButton->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Expanding)); - connect(m_selectButton, SIGNAL(clicked()), this, SLOT(makeSelection())); + connect(m_selectButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(makeSelection())); setSelectionType(Open); setSelectionOpenMultiple(false); @@ -64,9 +64,9 @@ FileSelector::~FileSelector() { } -QString FileSelector::currentState() const +TQString FileSelector::currentState() const { - return QString("default"); + return TQString("default"); } bool FileSelector::isKommanderWidget() const @@ -74,33 +74,33 @@ bool FileSelector::isKommanderWidget() const return true; } -QStringList FileSelector::associatedText() const +TQStringList FileSelector::associatedText() const { return KommanderWidget::associatedText(); } -void FileSelector::setAssociatedText(const QStringList& a_at) +void FileSelector::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void FileSelector::setPopulationText(const QString& a_text) +void FileSelector::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString FileSelector::populationText() const +TQString FileSelector::populationText() const { return KommanderWidget::populationText(); } void FileSelector::populate() { - QString txt = KommanderWidget::evalAssociatedText(populationText()); + TQString txt = KommanderWidget::evalAssociatedText(populationText()); setWidgetText(txt); } -void FileSelector::setWidgetText(const QString& a_text) +void FileSelector::setWidgetText(const TQString& a_text) { m_lineEdit->setText(a_text); emit widgetTextChanged(a_text); @@ -122,22 +122,22 @@ void FileSelector::setSelectionType(SelectionType a_selectionType) } -QString FileSelector::selectionFilter() const +TQString FileSelector::selectionFilter() const { return m_filter; } -void FileSelector::setSelectionFilter(const QString& a_filter) +void FileSelector::setSelectionFilter(const TQString& a_filter) { m_filter = a_filter; } -QString FileSelector::selectionCaption() const +TQString FileSelector::selectionCaption() const { return m_caption; } -void FileSelector::setSelectionCaption(const QString& a_caption) +void FileSelector::setSelectionCaption(const TQString& a_caption) { m_caption = a_caption; } @@ -154,7 +154,7 @@ void FileSelector::setSelectionOpenMultiple(bool a_openMultiple) void FileSelector::makeSelection() { - QString text; + TQString text; if (m_selectionType == Open && m_openMultiple) text = KFileDialog::getOpenFileNames(m_lineEdit->text(), m_filter, this, m_caption).join("\n"); else if (m_selectionType == Open && !m_openMultiple) @@ -168,12 +168,12 @@ void FileSelector::makeSelection() setWidgetText(text); } -QString FileSelector::caption() const +TQString FileSelector::caption() const { return m_selectButton->text(); } -void FileSelector::setCaption(const QString& a_text) +void FileSelector::setCaption(const TQString& a_text) { m_selectButton->setText(a_text); } @@ -191,16 +191,16 @@ void FileSelector::setShowEditor(bool a_visible) m_lineEdit->hide(); } -void FileSelector::showEvent(QShowEvent * e) +void FileSelector::showEvent(TQShowEvent * e) { - QWidget::showEvent(e); + TQWidget::showEvent(e); emit widgetOpened(); } -void FileSelector::contextMenuEvent( QContextMenuEvent * e ) +void FileSelector::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } @@ -210,7 +210,7 @@ bool FileSelector::isFunctionSupported(int f) f == DCOP::clear; } -QString FileSelector::handleDCOP(int function, const QStringList& args) +TQString FileSelector::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: @@ -228,12 +228,12 @@ QString FileSelector::handleDCOP(int function, const QStringList& args) break; } case DCOP::clear: - setWidgetText(QString::null); + setWidgetText(TQString::null); break; default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } diff --git a/kommander/widgets/fileselector.h b/kommander/widgets/fileselector.h index 9da6847d..c80648e0 100644 --- a/kommander/widgets/fileselector.h +++ b/kommander/widgets/fileselector.h @@ -19,10 +19,10 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qobject.h> -#include <qstringlist.h> -#include <qstring.h> -#include <qwidget.h> +#include <tqobject.h> +#include <tqstringlist.h> +#include <tqstring.h> +#include <tqwidget.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -33,69 +33,69 @@ class KPushButton; class KLineEdit; class QShowEvent; -class KOMMANDER_EXPORT FileSelector : public QWidget, public KommanderWidget +class KOMMANDER_EXPORT FileSelector : public TQWidget, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) Q_PROPERTY(bool showEditor READ showEditor WRITE setShowEditor) - Q_PROPERTY(QString buttonCaption READ caption WRITE setCaption) - Q_PROPERTY(QString selectionFilter READ selectionFilter WRITE setSelectionFilter) - Q_PROPERTY(QString selectionCaption READ selectionCaption WRITE setSelectionCaption) + Q_PROPERTY(TQString buttonCaption READ caption WRITE setCaption) + Q_PROPERTY(TQString selectionFilter READ selectionFilter WRITE setSelectionFilter) + Q_PROPERTY(TQString selectionCaption READ selectionCaption WRITE setSelectionCaption) Q_PROPERTY(SelectionType selectionType READ selectionType WRITE setSelectionType) Q_ENUMS(SelectionType) Q_PROPERTY(bool selectionOpenMultiple READ selectionOpenMultiple WRITE setSelectionOpenMultiple) public: - FileSelector(QWidget *a_parent, const char *a_name); + FileSelector(TQWidget *a_parent, const char *a_name); ~FileSelector(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); enum SelectionType { Open, Save, Directory }; SelectionType selectionType() const; void setSelectionType(SelectionType); bool selectionOpenMultiple() const; void setSelectionOpenMultiple(bool); - QString selectionFilter() const; - void setSelectionFilter(const QString&); - QString selectionCaption() const; - void setSelectionCaption(const QString&); - QString caption() const; - void setCaption(const QString&); + TQString selectionFilter() const; + void setSelectionFilter(const TQString&); + TQString selectionCaption() const; + void setSelectionCaption(const TQString&); + TQString caption() const; + void setCaption(const TQString&); bool showEditor() const; void setShowEditor(bool); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: - virtual void setWidgetText(const QString&); + virtual void setWidgetText(const TQString&); virtual void makeSelection(); virtual void populate(); signals: void widgetOpened(); - void widgetTextChanged(const QString&); + void widgetTextChanged(const TQString&); void contextMenuRequested(int xpos, int ypos); protected: - void contextMenuEvent( QContextMenuEvent * e ); + void contextMenuEvent( TQContextMenuEvent * e ); bool m_openMultiple; - QString m_caption; - QString m_filter; + TQString m_caption; + TQString m_filter; SelectionType m_selectionType; KLineEdit *m_lineEdit; KPushButton *m_selectButton; - QBoxLayout *m_boxLayout; - void showEvent(QShowEvent *e); + TQBoxLayout *m_boxLayout; + void showEvent(TQShowEvent *e); private: }; diff --git a/kommander/widgets/fontdialog.cpp b/kommander/widgets/fontdialog.cpp index 432b2d7f..5fc17edc 100644 --- a/kommander/widgets/fontdialog.cpp +++ b/kommander/widgets/fontdialog.cpp @@ -28,32 +28,32 @@ enum Functions { LastFunction }; -FontDialog::FontDialog(QWidget *parent, const char *name) - : QLabel(parent, name), KommanderWidget(this) +FontDialog::FontDialog(TQWidget *parent, const char *name) + : TQLabel(parent, name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); if (KommanderWidget::inEditor) { setPixmap(KGlobal::iconLoader()->loadIcon("kfontcombo", KIcon::NoGroup, KIcon::SizeMedium)); - setFrameStyle(QFrame::Box | QFrame::Plain); + setFrameStyle(TQFrame::Box | TQFrame::Plain); setLineWidth(1); setFixedSize(pixmap()->size()); } else setHidden(true); KommanderPlugin::setDefaultGroup(Group::DCOP); - KommanderPlugin::registerFunction(SetFont, "setFont(QString widget, QString family, int pointSize, bool bold, bool italic)", + KommanderPlugin::registerFunction(SetFont, "setFont(TQString widget, TQString family, int pointSize, bool bold, bool italic)", i18n("Sets the default font for the dialog, by specifying the family, the size and other style options."), 2, 5); - KommanderPlugin::registerFunction(Family, "family(QString widget)", + KommanderPlugin::registerFunction(Family, "family(TQString widget)", i18n("Returns the font family."), 1); - KommanderPlugin::registerFunction(PointSize, "pointSize(QString widget)", + KommanderPlugin::registerFunction(PointSize, "pointSize(TQString widget)", i18n("Returns the font size in point."), 1); - KommanderPlugin::registerFunction(Bold, "bold(QString widget)", + KommanderPlugin::registerFunction(Bold, "bold(TQString widget)", i18n("Returns true, if the font is bold."), 1); - KommanderPlugin::registerFunction(Italic, "italic(QString widget)", + KommanderPlugin::registerFunction(Italic, "italic(TQString widget)", i18n("Returns true, if the font is italic."), 1); } @@ -61,9 +61,9 @@ FontDialog::~FontDialog() { } -QString FontDialog::currentState() const +TQString FontDialog::currentState() const { - return QString("default"); + return TQString("default"); } bool FontDialog::isKommanderWidget() const @@ -71,27 +71,27 @@ bool FontDialog::isKommanderWidget() const return true; } -QStringList FontDialog::associatedText() const +TQStringList FontDialog::associatedText() const { return KommanderWidget::associatedText(); } -void FontDialog::setAssociatedText(const QStringList& a_at) +void FontDialog::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void FontDialog::setWidgetText(const QString& a_text) +void FontDialog::setWidgetText(const TQString& a_text) { KommanderWidget::setAssociatedText(a_text); } -void FontDialog::setPopulationText(const QString& a_text) +void FontDialog::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString FontDialog::populationText() const +TQString FontDialog::populationText() const { return KommanderWidget::populationText(); } @@ -106,7 +106,7 @@ bool FontDialog::isFunctionSupported(int f) return (f > FirstFunction && f < LastFunction) || f == DCOP::execute; } -QString FontDialog::handleDCOP(int function, const QStringList& args) +TQString FontDialog::handleDCOP(int function, const TQStringList& args) { switch (function) { case SetFont: @@ -127,7 +127,7 @@ QString FontDialog::handleDCOP(int function, const QStringList& args) } case PointSize: { - return QString::number(m_font.pointSize()); + return TQString::number(m_font.pointSize()); break; } case Bold: @@ -150,7 +150,7 @@ QString FontDialog::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } diff --git a/kommander/widgets/fontdialog.h b/kommander/widgets/fontdialog.h index 38bf7830..f7ccdf0f 100644 --- a/kommander/widgets/fontdialog.h +++ b/kommander/widgets/fontdialog.h @@ -12,39 +12,39 @@ #ifndef FONTDIALOG_H #define FONTDIALOG_H -#include <qlabel.h> +#include <tqlabel.h> #include <kommanderwidget.h> -#include <qfont.h> +#include <tqfont.h> /** @author Andras Mantia <amantia@kdewebdev.org> */ -class FontDialog : public QLabel, public KommanderWidget +class FontDialog : public TQLabel, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - FontDialog(QWidget *parent = 0, const char *name = 0); + FontDialog(TQWidget *parent = 0, const char *name = 0); ~FontDialog(); virtual bool isKommanderWidget() const; - virtual QString currentState() const; + virtual TQString currentState() const; virtual bool isFunctionSupported(int function); - virtual QString handleDCOP(int function, const QStringList& args); - virtual QStringList associatedText() const; - virtual void setAssociatedText(const QStringList&); - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual TQString handleDCOP(int function, const TQStringList& args); + virtual TQStringList associatedText() const; + virtual void setAssociatedText(const TQStringList&); + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); public slots: - virtual void setWidgetText(const QString &); + virtual void setWidgetText(const TQString &); virtual void populate(); - QFont m_font; + TQFont m_font; }; #endif diff --git a/kommander/widgets/groupbox.cpp b/kommander/widgets/groupbox.cpp index 29947eb1..7ca1c199 100644 --- a/kommander/widgets/groupbox.cpp +++ b/kommander/widgets/groupbox.cpp @@ -16,13 +16,13 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qobject.h> -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qgroupbox.h> -#include <qobjectlist.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> +#include <tqevent.h> +#include <tqgroupbox.h> +#include <tqobjectlist.h> #include <klocale.h> /* OTHER INCLUDES */ @@ -31,10 +31,10 @@ #include "groupbox.h" -GroupBox::GroupBox(QWidget *a_parent, const char *a_name) - : QGroupBox(a_parent, a_name), KommanderWidget(this) +GroupBox::GroupBox(TQWidget *a_parent, const char *a_name) + : TQGroupBox(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); @@ -44,9 +44,9 @@ GroupBox::~GroupBox() { } -QString GroupBox::currentState() const +TQString GroupBox::currentState() const { - return QString("default"); + return TQString("default"); } bool GroupBox::isKommanderWidget() const @@ -54,55 +54,55 @@ bool GroupBox::isKommanderWidget() const return true; } -QStringList GroupBox::associatedText() const +TQStringList GroupBox::associatedText() const { return KommanderWidget::associatedText(); } -void GroupBox::setAssociatedText(const QStringList& a_at) +void GroupBox::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void GroupBox::setPopulationText(const QString& a_text) +void GroupBox::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString GroupBox::populationText() const +TQString GroupBox::populationText() const { return KommanderWidget::populationText(); } void GroupBox::populate() { - QString txt = KommanderWidget::evalAssociatedText( populationText() ); + TQString txt = KommanderWidget::evalAssociatedText( populationText() ); //FIXME: setWidgetText( txt ); } /* We need to keep track of all widgets created as a child of a groupbox, in order of creation. */ -void GroupBox::insertChild(QObject *a_child) +void GroupBox::insertChild(TQObject *a_child) { m_childList.append(a_child); - QObject::insertChild(a_child); + TQObject::insertChild(a_child); } -void GroupBox::removeChild(QObject *a_child) +void GroupBox::removeChild(TQObject *a_child) { m_childList.remove(a_child); - QObject::removeChild(a_child); + TQObject::removeChild(a_child); } -void GroupBox::showEvent( QShowEvent *e ) +void GroupBox::showEvent( TQShowEvent *e ) { - QGroupBox::showEvent(e); + TQGroupBox::showEvent(e); emit widgetOpened(); } -void GroupBox::contextMenuEvent( QContextMenuEvent * e ) +void GroupBox::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } @@ -112,13 +112,13 @@ bool GroupBox::isFunctionSupported(int f) // || (f >= FirstFunction && f <= LastFunction); } -QString GroupBox::handleDCOP(int function, const QStringList& args) +TQString GroupBox::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: { - QString text; - for (QObjectListIt it(m_childList); it.current(); ++it) + TQString text; + for (TQObjectListIt it(m_childList); it.current(); ++it) if (dynamic_cast<KommanderWidget*>(it.current())) text += (dynamic_cast<KommanderWidget*>(it.current()))->evalAssociatedText(); return text; @@ -128,7 +128,7 @@ QString GroupBox::handleDCOP(int function, const QStringList& args) break; case DCOP::geometry: { - QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; break; } @@ -137,7 +137,7 @@ QString GroupBox::handleDCOP(int function, const QStringList& args) break; case DCOP::setBackgroundColor: { - QColor color; + TQColor color; color.setNamedColor(args[0]); this->setPaletteBackgroundColor(color); break; @@ -145,7 +145,7 @@ QString GroupBox::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } diff --git a/kommander/widgets/groupbox.h b/kommander/widgets/groupbox.h index b7de75e1..47889416 100644 --- a/kommander/widgets/groupbox.h +++ b/kommander/widgets/groupbox.h @@ -19,11 +19,11 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qgroupbox.h> -#include <qobject.h> -#include <qstringlist.h> -#include <qstring.h> -#include <qobjectlist.h> +#include <tqgroupbox.h> +#include <tqobject.h> +#include <tqstringlist.h> +#include <tqstring.h> +#include <tqobjectlist.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -31,39 +31,39 @@ class QWidget; class QShowEvent; -class KOMMANDER_EXPORT GroupBox : public QGroupBox, public KommanderWidget +class KOMMANDER_EXPORT GroupBox : public TQGroupBox, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - GroupBox(QWidget *a_parent, const char *a_name); + GroupBox(TQWidget *a_parent, const char *a_name); ~GroupBox(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual void insertChild(QObject*); - virtual void removeChild(QObject*); + virtual void insertChild(TQObject*); + virtual void removeChild(TQObject*); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: virtual void populate(); signals: void widgetOpened(); - void widgetTextChanged(const QString &); + void widgetTextChanged(const TQString &); void contextMenuRequested(int xpos, int ypos); protected: - QObjectList m_childList; - void showEvent(QShowEvent *e); - void contextMenuEvent( QContextMenuEvent * e ); + TQObjectList m_childList; + void showEvent(TQShowEvent *e); + void contextMenuEvent( TQContextMenuEvent * e ); private: }; diff --git a/kommander/widgets/konsole.cpp b/kommander/widgets/konsole.cpp index 587f2318..c27cb8fe 100644 --- a/kommander/widgets/konsole.cpp +++ b/kommander/widgets/konsole.cpp @@ -14,10 +14,10 @@ ***************************************************************************/ /* QT INCLUDES */ -#include <qcursor.h> -#include <qstring.h> -#include <qstringlist.h> -#include <qwidget.h> +#include <tqcursor.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqwidget.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -25,10 +25,10 @@ #include "konsole.h" #include <myprocess.h> -Konsole::Konsole(QWidget* a_parent, const char* a_name) +Konsole::Konsole(TQWidget* a_parent, const char* a_name) : KTextEdit(a_parent, a_name), KommanderWidget(this), mSeenEOL(false), mProcess(false) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); @@ -38,9 +38,9 @@ Konsole::~Konsole() { } -QString Konsole::currentState() const +TQString Konsole::currentState() const { - return QString("default"); + return TQString("default"); } bool Konsole::isKommanderWidget() const @@ -48,48 +48,48 @@ bool Konsole::isKommanderWidget() const return true; } -QStringList Konsole::associatedText() const +TQStringList Konsole::associatedText() const { return KommanderWidget::associatedText(); } -void Konsole::setAssociatedText(const QStringList& a_at) +void Konsole::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void Konsole::setPopulationText(const QString& a_text) +void Konsole::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString Konsole::populationText() const +TQString Konsole::populationText() const { return KommanderWidget::populationText(); } void Konsole::populate() { - QString txt = KommanderWidget::evalAssociatedText(populationText()); + TQString txt = KommanderWidget::evalAssociatedText(populationText()); setWidgetText(txt); } -void Konsole::setWidgetText(const QString&) +void Konsole::setWidgetText(const TQString&) { // FIXME: emit widgetTextChanged(a_text); } void Konsole::execute() { - QString at = evalAssociatedText().stripWhiteSpace(); + TQString at = evalAssociatedText().stripWhiteSpace(); if (mProcess) cancel(); mSeenEOL = false; mProcess = new MyProcess(this); mProcess->setBlocking(false); - connect(mProcess, SIGNAL(processExited(MyProcess*)), SLOT(processExited(MyProcess*))); - connect(mProcess, SIGNAL(processReceivedStdout(MyProcess*, char*, int)), SLOT(processReceivedStdout(MyProcess*, char*, int))); - setCursor(QCursor(Qt::WaitCursor)); + connect(mProcess, TQT_SIGNAL(processExited(MyProcess*)), TQT_SLOT(processExited(MyProcess*))); + connect(mProcess, TQT_SIGNAL(processReceivedStdout(MyProcess*, char*, int)), TQT_SLOT(processReceivedStdout(MyProcess*, char*, int))); + setCursor(TQCursor(Qt::WaitCursor)); mProcess->run(at); } @@ -104,7 +104,7 @@ void Konsole::cancel() void Konsole::processReceivedStdout(MyProcess*, char* buffer, int buflen) { - QString pBuf = QString::fromLocal8Bit(buffer, buflen); + TQString pBuf = TQString::fromLocal8Bit(buffer, buflen); if (mSeenEOL) pBuf = '\n' + pBuf; mSeenEOL = pBuf[pBuf.length()-1] == '\n'; @@ -126,7 +126,7 @@ bool Konsole::isFunctionSupported(int f) return f == DCOP::setText || f == DCOP::text || f == DCOP::clear || f == DCOP::execute || f == DCOP::cancel; } -QString Konsole::handleDCOP(int function, const QStringList& args) +TQString Konsole::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::setText: @@ -146,7 +146,7 @@ QString Konsole::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } diff --git a/kommander/widgets/konsole.h b/kommander/widgets/konsole.h index a031adef..feddbbac 100644 --- a/kommander/widgets/konsole.h +++ b/kommander/widgets/konsole.h @@ -21,7 +21,7 @@ #include <ktextedit.h> /* QT INCLUDES */ -#include <qobject.h> +#include <tqobject.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -33,28 +33,28 @@ class KOMMANDER_EXPORT Konsole : public KTextEdit, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_OVERRIDE(bool readOnly DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - Konsole(QWidget *a_parent, const char *a_name); + Konsole(TQWidget *a_parent, const char *a_name); ~Konsole(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: virtual void populate(); - virtual void setWidgetText(const QString &); + virtual void setWidgetText(const TQString &); // Execute current script virtual void execute(); // Stop executing current script diff --git a/kommander/widgets/label.cpp b/kommander/widgets/label.cpp index a9a24e3b..ee422325 100644 --- a/kommander/widgets/label.cpp +++ b/kommander/widgets/label.cpp @@ -14,21 +14,21 @@ ***************************************************************************/ /* QT INCLUDES */ -#include <qobject.h> -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> -#include <qevent.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> +#include <tqevent.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> #include <specials.h> #include "label.h" -Label::Label(QWidget *a_parent, const char *a_name) - : QLabel(a_parent, a_name), KommanderWidget(this) +Label::Label(TQWidget *a_parent, const char *a_name) + : TQLabel(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); @@ -40,9 +40,9 @@ Label::~Label() { } -QString Label::currentState() const +TQString Label::currentState() const { - return QString("default"); + return TQString("default"); } bool Label::isKommanderWidget() const @@ -50,22 +50,22 @@ bool Label::isKommanderWidget() const return true; } -QStringList Label::associatedText() const +TQStringList Label::associatedText() const { return KommanderWidget::associatedText(); } -void Label::setAssociatedText(const QStringList& a_at) +void Label::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void Label::setPopulationText(const QString& a_text) +void Label::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString Label::populationText() const +TQString Label::populationText() const { return KommanderWidget::populationText(); } @@ -75,14 +75,14 @@ void Label::populate() setWidgetText(KommanderWidget::evalAssociatedText(populationText())); } -void Label::setWidgetText(const QString& a_text) +void Label::setWidgetText(const TQString& a_text) { setText(a_text); } -void Label::showEvent(QShowEvent *e) +void Label::showEvent(TQShowEvent *e) { - QLabel::showEvent(e); + TQLabel::showEvent(e); emit widgetOpened(); } @@ -91,7 +91,7 @@ bool Label::isFunctionSupported(int f) return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; } -QString Label::handleDCOP(int function, const QStringList& args) +TQString Label::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: @@ -104,7 +104,7 @@ QString Label::handleDCOP(int function, const QStringList& args) break; case DCOP::geometry: { - QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; break; } @@ -113,7 +113,7 @@ QString Label::handleDCOP(int function, const QStringList& args) break; case DCOP::setBackgroundColor: { - QColor color; + TQColor color; color.setNamedColor(args[0]); this->setPaletteBackgroundColor(color); break; @@ -121,7 +121,7 @@ QString Label::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } #include "label.moc" diff --git a/kommander/widgets/label.h b/kommander/widgets/label.h index 216998db..8ce4b58c 100644 --- a/kommander/widgets/label.h +++ b/kommander/widgets/label.h @@ -19,45 +19,45 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qstringlist.h> -#include <qobject.h> -#include <qstring.h> +#include <tqstringlist.h> +#include <tqobject.h> +#include <tqstring.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> -#include <qlabel.h> +#include <tqlabel.h> class QWidget; class QShowEvent; -class KOMMANDER_EXPORT Label : public QLabel, public KommanderWidget +class KOMMANDER_EXPORT Label : public TQLabel, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - Label(QWidget *a_parent, const char *a_name); + Label(TQWidget *a_parent, const char *a_name); ~Label(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: - virtual void setWidgetText(const QString&); + virtual void setWidgetText(const TQString&); virtual void populate(); signals: void widgetOpened(); - void widgetTextChanged(const QString&); + void widgetTextChanged(const TQString&); protected: - void showEvent(QShowEvent *e); + void showEvent(TQShowEvent *e); private: }; diff --git a/kommander/widgets/lineedit.cpp b/kommander/widgets/lineedit.cpp index d243660a..08913b4e 100644 --- a/kommander/widgets/lineedit.cpp +++ b/kommander/widgets/lineedit.cpp @@ -15,8 +15,8 @@ ***************************************************************************/ /* QT INCLUDES */ -#include <qlayout.h> -#include <qevent.h> +#include <tqlayout.h> +#include <tqevent.h> /* OTHER INCLUDES */ #include <specials.h> @@ -30,42 +30,42 @@ enum functions { LastFunction }; -LineEdit::LineEdit(QWidget *a_parent, const char *a_name) - : KLineEdit(a_parent, a_name), KommanderWidget((QObject *)this) +LineEdit::LineEdit(TQWidget *a_parent, const char *a_name) + : KLineEdit(a_parent, a_name), KommanderWidget((TQObject *)this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); - connect(this, SIGNAL(textChanged(const QString &)), this, - SIGNAL(widgetTextChanged(const QString &))); + connect(this, TQT_SIGNAL(textChanged(const TQString &)), this, + TQT_SIGNAL(widgetTextChanged(const TQString &))); KommanderPlugin::setDefaultGroup(Group::DCOP); - KommanderPlugin::registerFunction(LE_clearModified, "clearModified(QString widget)", i18n("Clear widget modified status."), 1); + KommanderPlugin::registerFunction(LE_clearModified, "clearModified(TQString widget)", i18n("Clear widget modified status."), 1); } -void LineEdit::showEvent(QShowEvent *e) +void LineEdit::showEvent(TQShowEvent *e) { - QLineEdit::showEvent(e); + TQLineEdit::showEvent(e); emit widgetOpened(); } -void LineEdit::focusInEvent( QFocusEvent * e) +void LineEdit::focusInEvent( TQFocusEvent * e) { - QLineEdit::focusInEvent(e); + TQLineEdit::focusInEvent(e); emit gotFocus(); } -void LineEdit::focusOutEvent( QFocusEvent * e) +void LineEdit::focusOutEvent( TQFocusEvent * e) { - QLineEdit::focusOutEvent(e); + TQLineEdit::focusOutEvent(e); emit lostFocus(); } -QString LineEdit::currentState() const +TQString LineEdit::currentState() const { - return QString("default"); + return TQString("default"); } LineEdit::~LineEdit() @@ -77,47 +77,47 @@ bool LineEdit::isKommanderWidget() const return true; } -QStringList LineEdit::associatedText() const +TQStringList LineEdit::associatedText() const { return KommanderWidget::associatedText(); } -void LineEdit::setAssociatedText(const QStringList& a_at) +void LineEdit::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void LineEdit::setPopulationText(const QString& a_text) +void LineEdit::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString LineEdit::populationText() const +TQString LineEdit::populationText() const { return KommanderWidget::populationText(); } void LineEdit::populate() { - QString txt = KommanderWidget::evalAssociatedText(populationText()); + TQString txt = KommanderWidget::evalAssociatedText(populationText()); setWidgetText(txt); } -void LineEdit::setSelectedWidgetText(const QString& a_text) +void LineEdit::setSelectedWidgetText(const TQString& a_text) { insert(a_text); } -void LineEdit::setWidgetText(const QString& a_text) +void LineEdit::setWidgetText(const TQString& a_text) { setText(a_text); emit widgetTextChanged(a_text); } -void LineEdit::contextMenuEvent( QContextMenuEvent * e ) +void LineEdit::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } @@ -127,7 +127,7 @@ bool LineEdit::isFunctionSupported(int f) f == DCOP::clear || f == DCOP::setEditable || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || f == DCOP::isModified || (f >= FirstFunction && f <= LastFunction) ; } -QString LineEdit::handleDCOP(int function, const QStringList& args) +TQString LineEdit::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: @@ -148,19 +148,19 @@ QString LineEdit::handleDCOP(int function, const QStringList& args) break; case DCOP::geometry: { - QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; break; } case DCOP::hasFocus: - return QString::number(this->hasFocus()); + return TQString::number(this->hasFocus()); break; case DCOP::getBackgroundColor: return this->paletteBackgroundColor().name(); break; case DCOP::setBackgroundColor: { - QColor color; + TQColor color; color.setNamedColor(args[0]); this->setPaletteBackgroundColor(color); break; @@ -174,7 +174,7 @@ QString LineEdit::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } diff --git a/kommander/widgets/lineedit.h b/kommander/widgets/lineedit.h index 8b4d403a..05fb79c4 100644 --- a/kommander/widgets/lineedit.h +++ b/kommander/widgets/lineedit.h @@ -21,9 +21,9 @@ #include <klineedit.h> /* QT INCLUDES */ -#include <qtextedit.h> -#include <qstringlist.h> -#include <qstring.h> +#include <tqtextedit.h> +#include <tqstringlist.h> +#include <tqstring.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -35,37 +35,37 @@ class KOMMANDER_EXPORT LineEdit : public KLineEdit, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - LineEdit(QWidget *, const char *); + LineEdit(TQWidget *, const char *); virtual ~LineEdit(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: - virtual void setWidgetText(const QString &); - virtual void setSelectedWidgetText(const QString &a_text); + virtual void setWidgetText(const TQString &); + virtual void setSelectedWidgetText(const TQString &a_text); virtual void populate(); signals: void widgetOpened(); - void widgetTextChanged(const QString &); + void widgetTextChanged(const TQString &); void contextMenuRequested(int xpos, int ypos); void gotFocus(); void lostFocus(); protected: - virtual void showEvent( QShowEvent *e ); - void contextMenuEvent( QContextMenuEvent * e ); - void focusInEvent( QFocusEvent* e); - void focusOutEvent( QFocusEvent* e); + virtual void showEvent( TQShowEvent *e ); + void contextMenuEvent( TQContextMenuEvent * e ); + void focusInEvent( TQFocusEvent* e); + void focusOutEvent( TQFocusEvent* e); private: }; diff --git a/kommander/widgets/listbox.cpp b/kommander/widgets/listbox.cpp index 19b1b540..3dd36357 100644 --- a/kommander/widgets/listbox.cpp +++ b/kommander/widgets/listbox.cpp @@ -18,21 +18,21 @@ #include <kiconloader.h> /* QT INCLUDES */ -#include <qobject.h> -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> -#include <qevent.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> +#include <tqevent.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> #include <specials.h> #include "listbox.h" -ListBox::ListBox(QWidget *a_parent, const char *a_name) +ListBox::ListBox(TQWidget *a_parent, const char *a_name) : KListBox(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); @@ -42,9 +42,9 @@ ListBox::~ListBox() { } -QString ListBox::currentState() const +TQString ListBox::currentState() const { - return QString("default"); + return TQString("default"); } bool ListBox::isKommanderWidget() const @@ -52,42 +52,42 @@ bool ListBox::isKommanderWidget() const return true; } -QStringList ListBox::associatedText() const +TQStringList ListBox::associatedText() const { return KommanderWidget::associatedText(); } -void ListBox::setAssociatedText(const QStringList& a_at) +void ListBox::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void ListBox::setPopulationText(const QString& a_text) +void ListBox::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString ListBox::populationText() const +TQString ListBox::populationText() const { return KommanderWidget::populationText(); } void ListBox::populate() { - QString txt = KommanderWidget::evalAssociatedText(populationText()); + TQString txt = KommanderWidget::evalAssociatedText(populationText()); setWidgetText(txt); } -void ListBox::setWidgetText(const QString& a_text) +void ListBox::setWidgetText(const TQString& a_text) { clear(); - insertStringList(QStringList::split("\n", a_text)); + insertStringList(TQStringList::split("\n", a_text)); emit widgetTextChanged(a_text); } -void ListBox::showEvent(QShowEvent *e) +void ListBox::showEvent(TQShowEvent *e) { - QListBox::showEvent(e); + TQListBox::showEvent(e); emit widgetOpened(); } @@ -99,15 +99,15 @@ bool ListBox::isFunctionSupported(int f) f == DCOP::findItem || f == DCOP::setPixmap || f == DCOP::count || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; } -void ListBox::contextMenuEvent( QContextMenuEvent * e ) +void ListBox::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } -QString ListBox::handleDCOP(int function, const QStringList& args) +TQString ListBox::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::setText: @@ -117,7 +117,7 @@ QString ListBox::handleDCOP(int function, const QStringList& args) { if (selectionMode() == Single) return currentText(); - QString value; + TQString value; for (uint i=0; i<count(); i++) if (isSelected(i)) value += (value.length() ? "\n" : "") + item(i)->text(); @@ -125,13 +125,13 @@ QString ListBox::handleDCOP(int function, const QStringList& args) } case DCOP::setSelection: { - QListBoxItem* found = findItem(args[0], Qt::ExactMatch); + TQListBoxItem* found = findItem(args[0], Qt::ExactMatch); if (found) setCurrentItem(index(found)); break; } case DCOP::insertItems: - insertStringList(QStringList::split("\n", args[0]), args[1].toInt()); + insertStringList(TQStringList::split("\n", args[0]), args[1].toInt()); break; case DCOP::insertItem: insertItem(args[0], args[1].toInt()); @@ -143,9 +143,9 @@ QString ListBox::handleDCOP(int function, const QStringList& args) clear(); break; case DCOP::count: - return QString::number(count()); + return TQString::number(count()); case DCOP::currentItem: - return QString::number(currentItem()); + return TQString::number(currentItem()); case DCOP::setCurrentItem: { int index = args[0].toInt(); @@ -159,7 +159,7 @@ QString ListBox::handleDCOP(int function, const QStringList& args) if (index >= 0 && index < (int)count()) return item(index)->text(); else - return QString(); + return TQString(); } case DCOP::addUniqueItem: if (!findItem(args[0], Qt::ExactMatch)) @@ -167,17 +167,17 @@ QString ListBox::handleDCOP(int function, const QStringList& args) break; case DCOP::findItem: { - QListBoxItem* found = findItem(args[0], Qt::ExactMatch); + TQListBoxItem* found = findItem(args[0], Qt::ExactMatch); if (!found) found = findItem(args[0], Qt::BeginsWith); if (!found) found = findItem(args[0], Qt::Contains); if (found) - return QString::number(index(found)); - else return QString::number(-1); + return TQString::number(index(found)); + else return TQString::number(-1); break; } case DCOP::setPixmap: { - QPixmap pixmap = KGlobal::iconLoader()->loadIcon(args[0], KIcon::Small); + TQPixmap pixmap = KGlobal::iconLoader()->loadIcon(args[0], KIcon::Small); if (pixmap.isNull()) pixmap.load(args[0]); int index = args[1].toInt(); @@ -192,26 +192,26 @@ QString ListBox::handleDCOP(int function, const QStringList& args) } case DCOP::text: { - QStringList strings; + TQStringList strings; for(uint i=0; i < count() ; ++i) strings += item(i)->text(); return strings.join("\n"); } case DCOP::geometry: { - QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; break; } case DCOP::hasFocus: - return QString::number(this->hasFocus()); + return TQString::number(this->hasFocus()); break; case DCOP::getBackgroundColor: return this->paletteBackgroundColor().name(); break; case DCOP::setBackgroundColor: { - QColor color; + TQColor color; color.setNamedColor(args[0]); this->setPaletteBackgroundColor(color); break; @@ -219,7 +219,7 @@ QString ListBox::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } #include "listbox.moc" diff --git a/kommander/widgets/listbox.h b/kommander/widgets/listbox.h index 516e9f86..ebd5784f 100644 --- a/kommander/widgets/listbox.h +++ b/kommander/widgets/listbox.h @@ -20,9 +20,9 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qstringlist.h> -#include <qobject.h> -#include <qstring.h> +#include <tqstringlist.h> +#include <tqobject.h> +#include <tqstring.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -35,32 +35,32 @@ class KOMMANDER_EXPORT ListBox : public KListBox, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - ListBox(QWidget *a_parent, const char *a_name); + ListBox(TQWidget *a_parent, const char *a_name); ~ListBox(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: - virtual void setWidgetText(const QString&); + virtual void setWidgetText(const TQString&); virtual void populate(); signals: void widgetOpened(); - void widgetTextChanged(const QString&); + void widgetTextChanged(const TQString&); void contextMenuRequested(int xpos, int ypos); protected: - void showEvent(QShowEvent *e); - void contextMenuEvent( QContextMenuEvent * e ); + void showEvent(TQShowEvent *e); + void contextMenuEvent( TQContextMenuEvent * e ); private: }; diff --git a/kommander/widgets/pixmaplabel.cpp b/kommander/widgets/pixmaplabel.cpp index 7d7095e3..78077c5c 100644 --- a/kommander/widgets/pixmaplabel.cpp +++ b/kommander/widgets/pixmaplabel.cpp @@ -14,12 +14,12 @@ ***************************************************************************/ /* QT INCLUDES */ -#include <qobject.h> -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qpixmap.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> +#include <tqevent.h> +#include <tqpixmap.h> /* KDE INCLUDES */ #include <kglobal.h> @@ -30,10 +30,10 @@ #include <specials.h> #include "pixmaplabel.h" -PixmapLabel::PixmapLabel(QWidget *a_parent, const char *a_name) - : QLabel(a_parent, a_name), KommanderWidget(this) +PixmapLabel::PixmapLabel(TQWidget *a_parent, const char *a_name) + : TQLabel(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); @@ -46,9 +46,9 @@ PixmapLabel::~PixmapLabel() { } -QString PixmapLabel::currentState() const +TQString PixmapLabel::currentState() const { - return QString("default"); + return TQString("default"); } bool PixmapLabel::isKommanderWidget() const @@ -56,22 +56,22 @@ bool PixmapLabel::isKommanderWidget() const return true; } -QStringList PixmapLabel::associatedText() const +TQStringList PixmapLabel::associatedText() const { return KommanderWidget::associatedText(); } -void PixmapLabel::setAssociatedText(const QStringList& a_at) +void PixmapLabel::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void PixmapLabel::setPopulationText(const QString& a_text) +void PixmapLabel::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString PixmapLabel::populationText() const +TQString PixmapLabel::populationText() const { return KommanderWidget::populationText(); } @@ -81,23 +81,23 @@ void PixmapLabel::populate() setWidgetText(KommanderWidget::evalAssociatedText(populationText())); } -void PixmapLabel::setWidgetText(const QString& a_text) +void PixmapLabel::setWidgetText(const TQString& a_text) { - QPixmap pixmap; + TQPixmap pixmap; if (pixmap.load(a_text)) setPixmap(pixmap); } -void PixmapLabel::showEvent(QShowEvent *e) +void PixmapLabel::showEvent(TQShowEvent *e) { - QLabel::showEvent(e); + TQLabel::showEvent(e); emit widgetOpened(); } -void PixmapLabel::contextMenuEvent( QContextMenuEvent * e ) +void PixmapLabel::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } @@ -106,27 +106,27 @@ bool PixmapLabel::isFunctionSupported(int f) return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::geometry; } -QString PixmapLabel::handleDCOP(int function, const QStringList& args) +TQString PixmapLabel::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::setText: setWidgetText(args[0]); break; case DCOP::clear: - setPixmap(QPixmap()); + setPixmap(TQPixmap()); break; case DCOP::text: return text(); case DCOP::geometry: { - QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; break; } default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } #include "pixmaplabel.moc" diff --git a/kommander/widgets/pixmaplabel.h b/kommander/widgets/pixmaplabel.h index a932ad1e..a9ba9ca9 100644 --- a/kommander/widgets/pixmaplabel.h +++ b/kommander/widgets/pixmaplabel.h @@ -20,46 +20,46 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qstringlist.h> -#include <qobject.h> -#include <qstring.h> +#include <tqstringlist.h> +#include <tqobject.h> +#include <tqstring.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> -#include <qlabel.h> +#include <tqlabel.h> class QWidget; class QShowEvent; -class KOMMANDER_EXPORT PixmapLabel : public QLabel, public KommanderWidget +class KOMMANDER_EXPORT PixmapLabel : public TQLabel, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - PixmapLabel(QWidget *a_parent, const char *a_name); + PixmapLabel(TQWidget *a_parent, const char *a_name); ~PixmapLabel(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: - virtual void setWidgetText(const QString&); + virtual void setWidgetText(const TQString&); virtual void populate(); signals: void widgetOpened(); - void widgetTextChanged(const QString&); + void widgetTextChanged(const TQString&); void contextMenuRequested(int xpos, int ypos); protected: - void showEvent(QShowEvent *e); - void contextMenuEvent( QContextMenuEvent * e ); + void showEvent(TQShowEvent *e); + void contextMenuEvent( TQContextMenuEvent * e ); private: }; diff --git a/kommander/widgets/plugin.cpp b/kommander/widgets/plugin.cpp index 9319bc00..020ae6da 100644 --- a/kommander/widgets/plugin.cpp +++ b/kommander/widgets/plugin.cpp @@ -57,7 +57,7 @@ class KomStdPlugin : public KommanderPlugin { public: KomStdPlugin(); - virtual QWidget *create( const QString &key, QWidget *parent = 0, const char *name = 0 ); + virtual TQWidget *create( const TQString &key, TQWidget *parent = 0, const char *name = 0 ); }; KomStdPlugin::KomStdPlugin() @@ -80,7 +80,7 @@ KomStdPlugin::KomStdPlugin() addWidget("SpinBoxInt", group, "", 0); // addWidget("Wizard", group, ""); addWidget("TabWidget", group, "", 0); - addWidget("ToolBox", group, "", new QIconSet(KGlobal::iconLoader()->loadIcon("toolbox", KIcon::NoGroup, KIcon::SizeMedium)), "", true); + addWidget("ToolBox", group, "", new TQIconSet(KGlobal::iconLoader()->loadIcon("toolbox", KIcon::NoGroup, KIcon::SizeMedium)), "", true); // addWidget("SubDialog", group, ""); addWidget("ListBox", group, "", 0); addWidget("Timer", group, "", 0); @@ -92,12 +92,12 @@ KomStdPlugin::KomStdPlugin() addWidget("Slider", group, "", 0); addWidget("Table", group, "", 0); addWidget("DatePicker", group, "", 0); - addWidget("PopupMenu", group, "", new QIconSet(KGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium))); - addWidget("FontDialog", group, "", new QIconSet(KGlobal::iconLoader()->loadIcon("kfontcombo", KIcon::NoGroup, KIcon::SizeMedium))); - addWidget("AboutDialog", group, "", new QIconSet(KGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium))); + addWidget("PopupMenu", group, "", new TQIconSet(KGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium))); + addWidget("FontDialog", group, "", new TQIconSet(KGlobal::iconLoader()->loadIcon("kfontcombo", KIcon::NoGroup, KIcon::SizeMedium))); + addWidget("AboutDialog", group, "", new TQIconSet(KGlobal::iconLoader()->loadIcon("kommander", KIcon::NoGroup, KIcon::SizeMedium))); } -QWidget *KomStdPlugin::create( const QString &key, QWidget *parent, const char *name ) +TQWidget *KomStdPlugin::create( const TQString &key, TQWidget *parent, const char *name ) { if (key == "ButtonGroup") return new ButtonGroup(parent, name); else if (key == "CheckBox") return new CheckBox(parent, name); diff --git a/kommander/widgets/popupmenu.cpp b/kommander/widgets/popupmenu.cpp index 696bd0be..48bb4474 100644 --- a/kommander/widgets/popupmenu.cpp +++ b/kommander/widgets/popupmenu.cpp @@ -12,7 +12,7 @@ #include "popupmenu.h" #include "specials.h" -#include <qcursor.h> +#include <tqcursor.h> #include <kglobal.h> #include <kiconloader.h> @@ -32,17 +32,17 @@ #define INSERTSUBMENU 109 #define LAST_FUNCTION INSERTSUBMENU -PopupMenu::PopupMenu(QWidget *parent, const char *name) - : QLabel(parent, name), KommanderWidget(this) +PopupMenu::PopupMenu(TQWidget *parent, const char *name) + : TQLabel(parent, name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); if (KommanderWidget::inEditor) { setPixmap(KGlobal::iconLoader()->loadIcon("contents", KIcon::NoGroup, KIcon::SizeMedium)); - setFrameStyle(QFrame::Box | QFrame::Plain); + setFrameStyle(TQFrame::Box | TQFrame::Plain); setLineWidth(1); setFixedSize(pixmap()->size()); } @@ -50,19 +50,19 @@ PopupMenu::PopupMenu(QWidget *parent, const char *name) setHidden(true); m_menu = new KPopupMenu(this); - connect(m_menu, SIGNAL(activated(int)), this, SLOT(slotMenuItemActivated(int))); + connect(m_menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuItemActivated(int))); KommanderPlugin::setDefaultGroup(Group::DCOP); - KommanderPlugin::registerFunction(INSERTMENUITEM, "insertMenuItem(QString widget, QString text, QString executeWidget, int index, QString icon)", i18n("Insert an item into the popup menu. The executeWidget's execute method will be run when this item is selected. Returns the id of the inserted item. Use -1 for index to insert to the end. The icon is optional."), 4, 5); - KommanderPlugin::registerFunction(INSERTSEPARATOR, "insertSeparator(QString widget, int index)", i18n("Insert a separator item into the popup menu. Use -1 for index to insert to the end."), 2); - KommanderPlugin::registerFunction(CHANGEMENUITEM, "changeMenuItem(QString widget, int id, QString text, QString executeWidget, QString icon)", i18n("Change an item specified by id in the popup menu. The executeWidget's execute method will be run when this item is selected."), 4, 5); - KommanderPlugin::registerFunction(SETITEMENABLED, "setItemEnabled(QString widget, int id, bool enable)", i18n("Enable the item specified by id in the popup menu."), 3); - KommanderPlugin::registerFunction(ITEMENABLED, "itemEnabled(QString widget, int id)", i18n("Check if the item specified by id is enabled."), 2); - KommanderPlugin::registerFunction(SETITEMVISIBLE, "setItemVisible(QString widget, int id, bool enable)", i18n("Make the item specified by id visible."), 3); - KommanderPlugin::registerFunction(SETITEMCHECKED, "setItemChecked(QString widget, int id, bool enable)", i18n("Apply checked status for the item specified by id."), 3); - KommanderPlugin::registerFunction(ITEMVISIBLE, "itemVisible(QString widget, int id)", i18n("Check if the item specified by id is visible."), 2); - KommanderPlugin::registerFunction(ITEMCHECKED, "itemChecked(QString widget, int id)", i18n("Verify if the item specified by id is checked."), 2); - KommanderPlugin::registerFunction(INSERTSUBMENU, "insertSubmenu(QString widget, QString text, QString menuWidget, int index, QString icon)", i18n("Insert submenu widget into the popup menu. Use -1 for index to insert to the end. The icon is optional."), 4, 5); + KommanderPlugin::registerFunction(INSERTMENUITEM, "insertMenuItem(TQString widget, TQString text, TQString executeWidget, int index, TQString icon)", i18n("Insert an item into the popup menu. The executeWidget's execute method will be run when this item is selected. Returns the id of the inserted item. Use -1 for index to insert to the end. The icon is optional."), 4, 5); + KommanderPlugin::registerFunction(INSERTSEPARATOR, "insertSeparator(TQString widget, int index)", i18n("Insert a separator item into the popup menu. Use -1 for index to insert to the end."), 2); + KommanderPlugin::registerFunction(CHANGEMENUITEM, "changeMenuItem(TQString widget, int id, TQString text, TQString executeWidget, TQString icon)", i18n("Change an item specified by id in the popup menu. The executeWidget's execute method will be run when this item is selected."), 4, 5); + KommanderPlugin::registerFunction(SETITEMENABLED, "setItemEnabled(TQString widget, int id, bool enable)", i18n("Enable the item specified by id in the popup menu."), 3); + KommanderPlugin::registerFunction(ITEMENABLED, "itemEnabled(TQString widget, int id)", i18n("Check if the item specified by id is enabled."), 2); + KommanderPlugin::registerFunction(SETITEMVISIBLE, "setItemVisible(TQString widget, int id, bool enable)", i18n("Make the item specified by id visible."), 3); + KommanderPlugin::registerFunction(SETITEMCHECKED, "setItemChecked(TQString widget, int id, bool enable)", i18n("Apply checked status for the item specified by id."), 3); + KommanderPlugin::registerFunction(ITEMVISIBLE, "itemVisible(TQString widget, int id)", i18n("Check if the item specified by id is visible."), 2); + KommanderPlugin::registerFunction(ITEMCHECKED, "itemChecked(TQString widget, int id)", i18n("Verify if the item specified by id is checked."), 2); + KommanderPlugin::registerFunction(INSERTSUBMENU, "insertSubmenu(TQString widget, TQString text, TQString menuWidget, int index, TQString icon)", i18n("Insert submenu widget into the popup menu. Use -1 for index to insert to the end. The icon is optional."), 4, 5); } @@ -71,9 +71,9 @@ PopupMenu::~PopupMenu() delete m_menu; } -QString PopupMenu::currentState() const +TQString PopupMenu::currentState() const { - return QString("default"); + return TQString("default"); } bool PopupMenu::isKommanderWidget() const @@ -81,40 +81,40 @@ bool PopupMenu::isKommanderWidget() const return true; } -QStringList PopupMenu::associatedText() const +TQStringList PopupMenu::associatedText() const { return KommanderWidget::associatedText(); } -void PopupMenu::setAssociatedText(const QStringList& a_at) +void PopupMenu::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void PopupMenu::setWidgetText(const QString& a_text) +void PopupMenu::setWidgetText(const TQString& a_text) { KommanderWidget::setAssociatedText(a_text); } -void PopupMenu::setPopulationText(const QString& a_text) +void PopupMenu::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString PopupMenu::populationText() const +TQString PopupMenu::populationText() const { return KommanderWidget::populationText(); } void PopupMenu::popup(int x, int y) { - m_menu->exec(QPoint(x, y)); + m_menu->exec(TQPoint(x, y)); } void PopupMenu::slotMenuItemActivated(int id) { - QString widget = m_associations[id]; - KommanderWidget::evalAssociatedText(QString("#!kommander\n%1.execute(%2)").arg(widget).arg(id)); + TQString widget = m_associations[id]; + KommanderWidget::evalAssociatedText(TQString("#!kommander\n%1.execute(%2)").arg(widget).arg(id)); } void PopupMenu::populate() @@ -122,17 +122,17 @@ void PopupMenu::populate() setAssociatedText(KommanderWidget::evalAssociatedText( populationText())); } -QString PopupMenu::insertSubmenu(const QString& title, const QString &menuWidget, int index, const QString& icon) +TQString PopupMenu::insertSubmenu(const TQString& title, const TQString &menuWidget, int index, const TQString& icon) { KommanderWidget *w = widgetByName(menuWidget); if (dynamic_cast<PopupMenu*>(w)) { if (icon.isEmpty()) - return QString::number(m_menu->insertItem(title, dynamic_cast<PopupMenu*>(w)->menu(), index)); + return TQString::number(m_menu->insertItem(title, dynamic_cast<PopupMenu*>(w)->menu(), index)); else - return QString::number( m_menu->insertItem(KGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, KIcon::SizeMedium), title, dynamic_cast<PopupMenu*>(w)->menu(), index)); + return TQString::number( m_menu->insertItem(KGlobal::iconLoader()->loadIcon(icon, KIcon::NoGroup, KIcon::SizeMedium), title, dynamic_cast<PopupMenu*>(w)->menu(), index)); } - return QString(); + return TQString(); } @@ -141,7 +141,7 @@ bool PopupMenu::isFunctionSupported(int f) return f == DCOP::clear || f == DCOP::execute || f == DCOP::item || (f >= INSERTMENUITEM && f <= LAST_FUNCTION) || f == DCOP::count || f == DCOP::geometry; } -QString PopupMenu::handleDCOP(int function, const QStringList& args) +TQString PopupMenu::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::clear: @@ -161,7 +161,7 @@ QString PopupMenu::handleDCOP(int function, const QStringList& args) else id = m_menu->insertItem(KGlobal::iconLoader()->loadIcon(args[3], KIcon::NoGroup, KIcon::SizeMedium), args[0], index); m_associations[id] = args[1]; - return QString::number(id); + return TQString::number(id); break; } case INSERTSUBMENU: @@ -223,22 +223,22 @@ QString PopupMenu::handleDCOP(int function, const QStringList& args) case DCOP::item: { uint index = args[0].toInt(); - return index < m_params.count() ? m_params[index] : QString::null; + return index < m_params.count() ? m_params[index] : TQString::null; break; } case DCOP::count: - return QString::number(m_menu->count()); + return TQString::number(m_menu->count()); break; case DCOP::geometry: { - QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; break; } default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } diff --git a/kommander/widgets/popupmenu.h b/kommander/widgets/popupmenu.h index f2db18a6..dff28a86 100644 --- a/kommander/widgets/popupmenu.h +++ b/kommander/widgets/popupmenu.h @@ -12,8 +12,8 @@ #ifndef POPUPMENU_H #define POPUPMENU_H -#include <qlabel.h> -#include <qmap.h> +#include <tqlabel.h> +#include <tqmap.h> #include <kommanderwidget.h> @@ -22,28 +22,28 @@ class KPopupMenu; /** @author Andras Mantia <amantia@kdewebdev.org> */ -class PopupMenu : public QLabel, public KommanderWidget +class PopupMenu : public TQLabel, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - PopupMenu(QWidget *parent = 0, const char *name = 0); + PopupMenu(TQWidget *parent = 0, const char *name = 0); ~PopupMenu(); virtual bool isKommanderWidget() const; - virtual QString currentState() const; + virtual TQString currentState() const; virtual bool isFunctionSupported(int function); - virtual QString handleDCOP(int function, const QStringList& args); - virtual QStringList associatedText() const; - virtual void setAssociatedText(const QStringList&); - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual TQString handleDCOP(int function, const TQStringList& args); + virtual TQStringList associatedText() const; + virtual void setAssociatedText(const TQStringList&); + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); KPopupMenu *menu() {return m_menu;} public slots: - virtual void setWidgetText(const QString &); + virtual void setWidgetText(const TQString &); virtual void populate(); void popup(int x, int y); @@ -51,11 +51,11 @@ private slots: void slotMenuItemActivated(int id); private: - QString insertSubmenu(const QString& title, const QString &menuWidget, int index, const QString& icon); + TQString insertSubmenu(const TQString& title, const TQString &menuWidget, int index, const TQString& icon); KPopupMenu *m_menu; - QMap<int, QString> m_associations; - QStringList m_params; + TQMap<int, TQString> m_associations; + TQStringList m_params; }; #endif diff --git a/kommander/widgets/progressbar.cpp b/kommander/widgets/progressbar.cpp index 874601f5..30d4f329 100644 --- a/kommander/widgets/progressbar.cpp +++ b/kommander/widgets/progressbar.cpp @@ -17,11 +17,11 @@ #include <klocale.h> /* QT INCLUDES */ -#include <qobject.h> -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> -#include <qevent.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> +#include <tqevent.h> /* OTHER INCLUDES */ #include <specials.h> @@ -35,25 +35,25 @@ enum Functions { LastFunction }; -ProgressBar::ProgressBar(QWidget *a_parent, const char *a_name) +ProgressBar::ProgressBar(TQWidget *a_parent, const char *a_name) : KProgress(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); KommanderPlugin::setDefaultGroup(Group::DCOP); - KommanderPlugin::registerFunction(PB_setHighlightColor, "setBarColor(QString widget, QString Color)", i18n("Sets the ProgresBar color"), 2); - KommanderPlugin::registerFunction(PB_setHightlightTextColor, "setBarTextColor(QString widget, QString Color)", i18n("Sets the ProgresBar text color"), 2); + KommanderPlugin::registerFunction(PB_setHighlightColor, "setBarColor(TQString widget, TQString Color)", i18n("Sets the ProgresBar color"), 2); + KommanderPlugin::registerFunction(PB_setHightlightTextColor, "setBarTextColor(TQString widget, TQString Color)", i18n("Sets the ProgresBar text color"), 2); } ProgressBar::~ProgressBar() { } -QString ProgressBar::currentState() const +TQString ProgressBar::currentState() const { - return QString("default"); + return TQString("default"); } bool ProgressBar::isKommanderWidget() const @@ -61,22 +61,22 @@ bool ProgressBar::isKommanderWidget() const return true; } -QStringList ProgressBar::associatedText() const +TQStringList ProgressBar::associatedText() const { return KommanderWidget::associatedText(); } -void ProgressBar::setAssociatedText(const QStringList& a_at) +void ProgressBar::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void ProgressBar::setPopulationText(const QString& a_text) +void ProgressBar::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString ProgressBar::populationText() const +TQString ProgressBar::populationText() const { return KommanderWidget::populationText(); } @@ -86,9 +86,9 @@ void ProgressBar::populate() setProgress(KommanderWidget::evalAssociatedText(populationText()).toUInt()); } -void ProgressBar::showEvent(QShowEvent *e) +void ProgressBar::showEvent(TQShowEvent *e) { - QProgressBar::showEvent(e); + TQProgressBar::showEvent(e); emit widgetOpened(); } @@ -97,11 +97,11 @@ bool ProgressBar::isFunctionSupported(int f) return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::setMaximum || f == DCOP::geometry || (f > FirstFunction && f < LastFunction); } -QString ProgressBar::handleDCOP(int function, const QStringList& args) +TQString ProgressBar::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: - return QString::number(progress()); + return TQString::number(progress()); case DCOP::setText: setProgress(args[0].toUInt()); break; @@ -113,32 +113,32 @@ QString ProgressBar::handleDCOP(int function, const QStringList& args) break; case DCOP::geometry: { - QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; break; } case PB_setHighlightColor: { - QColor color; + TQColor color; color.setNamedColor(args[0]); - QPalette p = this->palette(); - p.setColor(QPalette::Active, QColorGroup::Highlight, color); + TQPalette p = this->palette(); + p.setColor(TQPalette::Active, TQColorGroup::Highlight, color); this->setPalette( p, TRUE ); break; } case PB_setHightlightTextColor: { - QColor color; + TQColor color; color.setNamedColor(args[0]); - QPalette p = this->palette(); - p.setColor(QPalette::Active, QColorGroup::HighlightedText, color); + TQPalette p = this->palette(); + p.setColor(TQPalette::Active, TQColorGroup::HighlightedText, color); this->setPalette( p, TRUE ); break; } default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } #include "progressbar.moc" diff --git a/kommander/widgets/progressbar.h b/kommander/widgets/progressbar.h index b4aa3d94..d54e1185 100644 --- a/kommander/widgets/progressbar.h +++ b/kommander/widgets/progressbar.h @@ -19,9 +19,9 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qstringlist.h> -#include <qobject.h> -#include <qstring.h> +#include <tqstringlist.h> +#include <tqobject.h> +#include <tqstring.h> /* OTHER INCLUDES */ #include <kprogress.h> @@ -34,29 +34,29 @@ class KOMMANDER_EXPORT ProgressBar: public KProgress, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - ProgressBar(QWidget *a_parent, const char *a_name); + ProgressBar(TQWidget *a_parent, const char *a_name); ~ProgressBar(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: virtual void populate(); signals: void widgetOpened(); protected: - void showEvent(QShowEvent *e); + void showEvent(TQShowEvent *e); private: }; diff --git a/kommander/widgets/radiobutton.cpp b/kommander/widgets/radiobutton.cpp index a7faa91a..ba46248d 100644 --- a/kommander/widgets/radiobutton.cpp +++ b/kommander/widgets/radiobutton.cpp @@ -16,25 +16,25 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qobject.h> -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qradiobutton.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> +#include <tqevent.h> +#include <tqradiobutton.h> /* OTHER INCLUDES */ #include <specials.h> #include "radiobutton.h" -RadioButton::RadioButton(QWidget *a_parent, const char *a_name) - : QRadioButton(a_parent, a_name), KommanderWidget(this) +RadioButton::RadioButton(TQWidget *a_parent, const char *a_name) + : TQRadioButton(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "unchecked"; states << "checked"; setStates(states); - QStringList displayStates; + TQStringList displayStates; displayStates << "checked"; displayStates << "unchecked"; setDisplayStates(displayStates); @@ -44,7 +44,7 @@ RadioButton::~RadioButton() { } -QString RadioButton::currentState() const +TQString RadioButton::currentState() const { return (isChecked() ? "checked" : "unchecked"); } @@ -54,48 +54,48 @@ bool RadioButton::isKommanderWidget() const return true; } -QStringList RadioButton::associatedText() const +TQStringList RadioButton::associatedText() const { return KommanderWidget::associatedText(); } -void RadioButton::setAssociatedText(const QStringList& a_at) +void RadioButton::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void RadioButton::setWidgetText(const QString &a_text) +void RadioButton::setWidgetText(const TQString &a_text) { setText(a_text); emit widgetTextChanged(a_text); } -void RadioButton::setPopulationText(const QString& a_text) +void RadioButton::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText( a_text ); } -QString RadioButton::populationText() const +TQString RadioButton::populationText() const { return KommanderWidget::populationText(); } void RadioButton::populate() { - QString txt = KommanderWidget::evalAssociatedText( populationText() ); + TQString txt = KommanderWidget::evalAssociatedText( populationText() ); setWidgetText( txt ); } -void RadioButton::showEvent( QShowEvent *e ) +void RadioButton::showEvent( TQShowEvent *e ) { - QRadioButton::showEvent( e ); + TQRadioButton::showEvent( e ); emit widgetOpened(); } -void RadioButton::contextMenuEvent( QContextMenuEvent * e ) +void RadioButton::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } @@ -104,7 +104,7 @@ bool RadioButton::isFunctionSupported(int f) return f == DCOP::text || f == DCOP::setText || f == DCOP::setChecked || f == DCOP::checked || f == DCOP::geometry || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; } -QString RadioButton::handleDCOP(int function, const QStringList& args) +TQString RadioButton::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: @@ -116,10 +116,10 @@ QString RadioButton::handleDCOP(int function, const QStringList& args) setChecked(args[0] != "false"); break; case DCOP::checked: - return QString::number(isOn()); + return TQString::number(isOn()); case DCOP::geometry: { - QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; break; } @@ -128,7 +128,7 @@ QString RadioButton::handleDCOP(int function, const QStringList& args) break; case DCOP::setBackgroundColor: { - QColor color; + TQColor color; color.setNamedColor(args[0]); this->setPaletteBackgroundColor(color); break; @@ -136,7 +136,7 @@ QString RadioButton::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } diff --git a/kommander/widgets/radiobutton.h b/kommander/widgets/radiobutton.h index f9fb5a16..88dcdcb1 100644 --- a/kommander/widgets/radiobutton.h +++ b/kommander/widgets/radiobutton.h @@ -19,10 +19,10 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qradiobutton.h> -#include <qobject.h> -#include <qstringlist.h> -#include <qstring.h> +#include <tqradiobutton.h> +#include <tqobject.h> +#include <tqstringlist.h> +#include <tqstring.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -30,36 +30,36 @@ class QWidget; class QShowEvent; -class KOMMANDER_EXPORT RadioButton : public QRadioButton, public KommanderWidget +class KOMMANDER_EXPORT RadioButton : public TQRadioButton, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - RadioButton(QWidget *a_parent, const char *a_name); + RadioButton(TQWidget *a_parent, const char *a_name); ~RadioButton(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: - virtual void setWidgetText(const QString &); + virtual void setWidgetText(const TQString &); virtual void populate(); signals: void widgetOpened(); - void widgetTextChanged(const QString &); + void widgetTextChanged(const TQString &); void contextMenuRequested(int xpos, int ypos); protected: - void showEvent( QShowEvent *e ); - void contextMenuEvent( QContextMenuEvent * e ); + void showEvent( TQShowEvent *e ); + void contextMenuEvent( TQContextMenuEvent * e ); private: }; diff --git a/kommander/widgets/richtexteditor.cpp b/kommander/widgets/richtexteditor.cpp index eea0b0d6..9e54f07c 100644 --- a/kommander/widgets/richtexteditor.cpp +++ b/kommander/widgets/richtexteditor.cpp @@ -17,18 +17,18 @@ #include <klocale.h> /* QT INCLUDES */ -#include <qlayout.h> -#include <qevent.h> -#include <qtextedit.h> -#include <qframe.h> -#include <qwidget.h> -#include <qlayout.h> -#include <qtoolbutton.h> -#include <qpixmap.h> -#include <qhbuttongroup.h> -#include <qfont.h> -#include <qstringlist.h> -#include <qevent.h> +#include <tqlayout.h> +#include <tqevent.h> +#include <tqtextedit.h> +#include <tqframe.h> +#include <tqwidget.h> +#include <tqlayout.h> +#include <tqtoolbutton.h> +#include <tqpixmap.h> +#include <tqhbuttongroup.h> +#include <tqfont.h> +#include <tqstringlist.h> +#include <tqevent.h> /* OTHER INCLUDES */ #include <specials.h> @@ -42,38 +42,38 @@ #include "pixmaps/textleft.xpm" #include "pixmaps/textright.xpm" -RichTextEditor::RichTextEditor(QWidget *a_parent, const char *a_name) - : QWidget(a_parent, a_name), KommanderWidget((QObject *)this) +RichTextEditor::RichTextEditor(TQWidget *a_parent, const char *a_name) + : TQWidget(a_parent, a_name), KommanderWidget((TQObject *)this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); // setup toolbar - m_toolbar = new QFrame(this, "buttonBar"); + m_toolbar = new TQFrame(this, "buttonBar"); m_toolbar->setMinimumSize(0, 32); - m_toolbar->setFrameShape(QFrame::NoFrame); - m_toolbar->setFrameShadow(QFrame::Plain); + m_toolbar->setFrameShape(TQFrame::NoFrame); + m_toolbar->setFrameShadow(TQFrame::Plain); //setup textedit - m_textedit = new QTextEdit(this, "editor"); + m_textedit = new TQTextEdit(this, "editor"); m_textedit->setTextFormat(RichText); // layout the widgets - QVBoxLayout *layout = new QVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); layout->addWidget(m_toolbar); layout->addWidget(m_textedit); layout->setSpacing(1); // setup buttons - QHBoxLayout *tbLayout = new QHBoxLayout(m_toolbar); + TQHBoxLayout *tbLayout = new TQHBoxLayout(m_toolbar); //bold italic underline left right center link - m_formatGroup = new QHButtonGroup(m_toolbar, "formatGroup"); + m_formatGroup = new TQHButtonGroup(m_toolbar, "formatGroup"); //m_formatGroup->setFlat(true); - m_alignGroup = new QHButtonGroup(m_toolbar, "alignGroup"); + m_alignGroup = new TQHButtonGroup(m_toolbar, "alignGroup"); //m_alignGroup->setFlat(true); m_alignGroup->setExclusive(true); tbLayout->insertStretch(0); @@ -81,40 +81,40 @@ RichTextEditor::RichTextEditor(QWidget *a_parent, const char *a_name) tbLayout->addWidget(m_alignGroup); tbLayout->insertStretch(3); - m_buttonTextBold = new QToolButton(m_formatGroup, "textBold"); - m_buttonTextBold->setPixmap(QPixmap((const char **)bold_xpm)); + m_buttonTextBold = new TQToolButton(m_formatGroup, "textBold"); + m_buttonTextBold->setPixmap(TQPixmap((const char **)bold_xpm)); m_buttonTextBold->setToggleButton(true); - connect(m_buttonTextBold, SIGNAL(toggled(bool)), this, SLOT(textBold(bool))); - m_buttonTextItalic = new QToolButton(m_formatGroup, "textItalic"); - m_buttonTextItalic->setPixmap(QPixmap((const char **)italic_xpm)); + connect(m_buttonTextBold, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(textBold(bool))); + m_buttonTextItalic = new TQToolButton(m_formatGroup, "textItalic"); + m_buttonTextItalic->setPixmap(TQPixmap((const char **)italic_xpm)); m_buttonTextItalic->setToggleButton(true); - connect(m_buttonTextItalic, SIGNAL(toggled(bool)), this, SLOT(textItalic(bool))); - m_buttonTextUnder = new QToolButton(m_formatGroup, "textUnder"); - m_buttonTextUnder->setPixmap(QPixmap((const char **)under_xpm)); + connect(m_buttonTextItalic, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(textItalic(bool))); + m_buttonTextUnder = new TQToolButton(m_formatGroup, "textUnder"); + m_buttonTextUnder->setPixmap(TQPixmap((const char **)under_xpm)); m_buttonTextUnder->setToggleButton(true); - connect(m_buttonTextUnder, SIGNAL(toggled(bool)), this, SLOT(textUnder(bool))); + connect(m_buttonTextUnder, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(textUnder(bool))); - m_buttonTextLeft = new QToolButton(m_alignGroup, "textLeft"); - m_buttonTextLeft->setPixmap(QPixmap((const char **)left_xpm)); + m_buttonTextLeft = new TQToolButton(m_alignGroup, "textLeft"); + m_buttonTextLeft->setPixmap(TQPixmap((const char **)left_xpm)); m_buttonTextLeft->setToggleButton(true); - m_buttonTextCenter = new QToolButton(m_alignGroup, "textCenter"); - m_buttonTextCenter->setPixmap(QPixmap((const char **)center_xpm)); + m_buttonTextCenter = new TQToolButton(m_alignGroup, "textCenter"); + m_buttonTextCenter->setPixmap(TQPixmap((const char **)center_xpm)); m_buttonTextCenter->setToggleButton(true); - m_buttonTextRight = new QToolButton(m_alignGroup, "textRight"); - m_buttonTextRight->setPixmap(QPixmap((const char **)right_xpm)); + m_buttonTextRight = new TQToolButton(m_alignGroup, "textRight"); + m_buttonTextRight->setPixmap(TQPixmap((const char **)right_xpm)); m_buttonTextRight->setToggleButton(true); - connect(m_alignGroup, SIGNAL(clicked(int)), this, SLOT(textAlign(int))); - connect(m_textedit, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(fontChanged(const QFont &))); - connect(m_textedit, SIGNAL(currentAlignmentChanged(int)), this, SLOT(alignmentChanged(int))); + connect(m_alignGroup, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(textAlign(int))); + connect(m_textedit, TQT_SIGNAL(currentFontChanged(const TQFont &)), this, TQT_SLOT(fontChanged(const TQFont &))); + connect(m_textedit, TQT_SIGNAL(currentAlignmentChanged(int)), this, TQT_SLOT(alignmentChanged(int))); - connect(m_textedit, SIGNAL(textChanged()), this, SLOT(setTextChanged())); + connect(m_textedit, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setTextChanged())); } -QString RichTextEditor::currentState() const +TQString RichTextEditor::currentState() const { - return QString("default"); + return TQString("default"); } RichTextEditor::~RichTextEditor() @@ -126,33 +126,33 @@ bool RichTextEditor::isKommanderWidget() const return true; } -QStringList RichTextEditor::associatedText() const +TQStringList RichTextEditor::associatedText() const { return KommanderWidget::associatedText(); } -void RichTextEditor::setAssociatedText(const QStringList& a_at) +void RichTextEditor::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void RichTextEditor::setPopulationText(const QString& a_text) +void RichTextEditor::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText( a_text ); } -QString RichTextEditor::populationText() const +TQString RichTextEditor::populationText() const { return KommanderWidget::populationText(); } void RichTextEditor::populate() { - QString txt = KommanderWidget::evalAssociatedText( populationText() ); + TQString txt = KommanderWidget::evalAssociatedText( populationText() ); setWidgetText( txt ); } -void RichTextEditor::setWidgetText(const QString &a_text) +void RichTextEditor::setWidgetText(const TQString &a_text) { m_textedit->setText(a_text); emit widgetTextChanged(a_text); @@ -180,7 +180,7 @@ void RichTextEditor::textItalic(bool a_isOn) void RichTextEditor::textAlign(int a_id) { - QToolButton *b = (QToolButton *)m_alignGroup->find(a_id); + TQToolButton *b = (TQToolButton *)m_alignGroup->find(a_id); if(b == m_buttonTextLeft) m_textedit->setAlignment(Qt::AlignLeft); else if(b == m_buttonTextCenter) @@ -189,7 +189,7 @@ void RichTextEditor::textAlign(int a_id) m_textedit->setAlignment(Qt::AlignRight); } -void RichTextEditor::fontChanged(const QFont &a_font) +void RichTextEditor::fontChanged(const TQFont &a_font) { m_buttonTextBold->setOn(a_font.bold()); m_buttonTextItalic->setOn(a_font.italic()); @@ -206,16 +206,16 @@ void RichTextEditor::alignmentChanged(int a_alignment) m_buttonTextRight->setOn(true); } -void RichTextEditor::showEvent( QShowEvent *e ) +void RichTextEditor::showEvent( TQShowEvent *e ) { - QWidget::showEvent(e); + TQWidget::showEvent(e); emit widgetOpened(); } -void RichTextEditor::contextMenuEvent( QContextMenuEvent * e ) +void RichTextEditor::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } @@ -224,7 +224,7 @@ bool RichTextEditor::isFunctionSupported(int f) return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::selection || f == DCOP::setEditable; } -QString RichTextEditor::handleDCOP(int function, const QStringList& args) +TQString RichTextEditor::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: @@ -243,7 +243,7 @@ QString RichTextEditor::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } #include "richtexteditor.moc" diff --git a/kommander/widgets/richtexteditor.h b/kommander/widgets/richtexteditor.h index 4436d73f..5a0ab8d6 100644 --- a/kommander/widgets/richtexteditor.h +++ b/kommander/widgets/richtexteditor.h @@ -19,9 +19,9 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qstringlist.h> -#include <qstring.h> -#include <qwidget.h> +#include <tqstringlist.h> +#include <tqstring.h> +#include <tqwidget.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -34,51 +34,51 @@ class QToolButton; class QHButtonGroup; class QShowEvent; -class KOMMANDER_EXPORT RichTextEditor : public QWidget, public KommanderWidget +class KOMMANDER_EXPORT RichTextEditor : public TQWidget, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - RichTextEditor(QWidget *, const char *); + RichTextEditor(TQWidget *, const char *); virtual ~RichTextEditor(); bool isKommanderWidget() const; - void setAssociatedText(const QStringList&); - QStringList associatedText() const; - QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + void setAssociatedText(const TQStringList&); + TQStringList associatedText() const; + TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: void setTextChanged(); - void setWidgetText(const QString &); + void setWidgetText(const TQString &); void textAlign(int); void textBold(bool); void textUnder(bool); void textItalic(bool); - void fontChanged(const QFont &); + void fontChanged(const TQFont &); void alignmentChanged(int); virtual void populate(); signals: void widgetOpened(); - void widgetTextChanged(const QString&); + void widgetTextChanged(const TQString&); void contextMenuRequested(int xpos, int ypos); protected: - void showEvent( QShowEvent *e ); - void contextMenuEvent( QContextMenuEvent * e ); + void showEvent( TQShowEvent *e ); + void contextMenuEvent( TQContextMenuEvent * e ); private: - QFrame *m_toolbar; - QTextEdit *m_textedit; + TQFrame *m_toolbar; + TQTextEdit *m_textedit; - QToolButton *m_buttonTextBold, *m_buttonTextUnder, *m_buttonTextItalic, + TQToolButton *m_buttonTextBold, *m_buttonTextUnder, *m_buttonTextItalic, *m_buttonTextLeft, *m_buttonTextCenter, *m_buttonTextRight; - QHButtonGroup *m_formatGroup, *m_alignGroup; + TQHButtonGroup *m_formatGroup, *m_alignGroup; }; diff --git a/kommander/widgets/scriptobject.cpp b/kommander/widgets/scriptobject.cpp index 859d87d0..2824d81f 100644 --- a/kommander/widgets/scriptobject.cpp +++ b/kommander/widgets/scriptobject.cpp @@ -14,8 +14,8 @@ * * ***************************************************************************/ /* QT INCLUDES */ -#include <qstringlist.h> -#include <qwidget.h> +#include <tqstringlist.h> +#include <tqwidget.h> /* KDE INCLUDES */ #include <kglobal.h> @@ -29,17 +29,17 @@ #include <myprocess.h> #include <specials.h> -ScriptObject::ScriptObject(QWidget *a_parent, const char *a_name) - : QLabel(a_parent, a_name), KommanderWidget(this) +ScriptObject::ScriptObject(TQWidget *a_parent, const char *a_name) + : TQLabel(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); if (KommanderWidget::inEditor) { setPixmap(KGlobal::iconLoader()->loadIcon("shellscript", KIcon::NoGroup, KIcon::SizeMedium)); - setFrameStyle(QFrame::Box | QFrame::Plain); + setFrameStyle(TQFrame::Box | TQFrame::Plain); setLineWidth(1); setFixedSize(pixmap()->size()); } @@ -51,9 +51,9 @@ ScriptObject::~ScriptObject() { } -QString ScriptObject::currentState() const +TQString ScriptObject::currentState() const { - return QString("default"); + return TQString("default"); } bool ScriptObject::isKommanderWidget() const @@ -61,27 +61,27 @@ bool ScriptObject::isKommanderWidget() const return true; } -QStringList ScriptObject::associatedText() const +TQStringList ScriptObject::associatedText() const { return KommanderWidget::associatedText(); } -void ScriptObject::setAssociatedText(const QStringList& a_at) +void ScriptObject::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void ScriptObject::setWidgetText(const QString& a_text) +void ScriptObject::setWidgetText(const TQString& a_text) { KommanderWidget::setAssociatedText(a_text); } -void ScriptObject::setPopulationText(const QString& a_text) +void ScriptObject::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString ScriptObject::populationText() const +TQString ScriptObject::populationText() const { return KommanderWidget::populationText(); } @@ -91,15 +91,15 @@ void ScriptObject::populate() setAssociatedText(KommanderWidget::evalAssociatedText(populationText())); } -QString ScriptObject::executeProcess(bool blocking) +TQString ScriptObject::executeProcess(bool blocking) { int index = ( states().findIndex( currentState()) ); if (index == -1) { printError(i18n("Invalid state for associated text.")); - return QString(); + return TQString(); } - QString evalText = m_associatedText[index]; + TQString evalText = m_associatedText[index]; if ((KommanderWidget::useInternalParser && !evalText.startsWith("#!")) || evalText.startsWith("#!kommander")) { @@ -119,14 +119,14 @@ void ScriptObject::execute() executeProcess(true); } -void ScriptObject::execute(const QString& s) +void ScriptObject::execute(const TQString& s) { m_params.clear(); m_params.append(s); executeProcess(true); } -void ScriptObject::execute(const QString& s1, const QString& s2) +void ScriptObject::execute(const TQString& s1, const TQString& s2) { m_params.clear(); m_params.append(s1); @@ -137,22 +137,22 @@ void ScriptObject::execute(const QString& s1, const QString& s2) void ScriptObject::execute(int i) { m_params.clear(); - m_params.append(QString::number(i)); + m_params.append(TQString::number(i)); executeProcess(true); } void ScriptObject::execute(int i, int j) { m_params.clear(); - m_params.append(QString::number(i)); - m_params.append(QString::number(j)); + m_params.append(TQString::number(i)); + m_params.append(TQString::number(j)); executeProcess(true); } void ScriptObject::execute(bool i) { m_params.clear(); - m_params.append(QString::number(i)); + m_params.append(TQString::number(i)); executeProcess(true); } @@ -162,14 +162,14 @@ bool ScriptObject::isFunctionSupported(int f) || f == DCOP::count; } -QString ScriptObject::handleDCOP(int function, const QStringList& args) +TQString ScriptObject::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::setText: setAssociatedText(args[0]); break; case DCOP::clear: - setAssociatedText(QString::null); + setAssociatedText(TQString::null); break; case DCOP::execute: m_params = args; @@ -178,14 +178,14 @@ QString ScriptObject::handleDCOP(int function, const QStringList& args) case DCOP::item: { uint index = args[0].toInt(); - return index < m_params.count() ? m_params[index] : QString::null; + return index < m_params.count() ? m_params[index] : TQString::null; } case DCOP::count: - return QString::number(m_params.count()); + return TQString::number(m_params.count()); default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } #include "scriptobject.moc" diff --git a/kommander/widgets/scriptobject.h b/kommander/widgets/scriptobject.h index 3906d5e4..325903cc 100644 --- a/kommander/widgets/scriptobject.h +++ b/kommander/widgets/scriptobject.h @@ -20,39 +20,39 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qlabel.h> +#include <tqlabel.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> #include <kommander_export.h> -class KOMMANDER_EXPORT ScriptObject : public QLabel, public KommanderWidget +class KOMMANDER_EXPORT ScriptObject : public TQLabel, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - ScriptObject(QWidget *a_parent, const char *a_name); + ScriptObject(TQWidget *a_parent, const char *a_name); ~ScriptObject(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: - virtual void setWidgetText(const QString &); + virtual void setWidgetText(const TQString &); virtual void populate(); virtual void execute(); - virtual void execute(const QString&); - virtual void execute(const QString&, const QString&); + virtual void execute(const TQString&); + virtual void execute(const TQString&, const TQString&); virtual void execute(int); virtual void execute(int, int); virtual void execute(bool); @@ -60,9 +60,9 @@ signals: void widgetOpened(); protected: - virtual QString executeProcess(bool blocking); + virtual TQString executeProcess(bool blocking); private: - QStringList m_params; + TQStringList m_params; }; #endif diff --git a/kommander/widgets/slider.cpp b/kommander/widgets/slider.cpp index 52f6d47a..b3bef6fc 100644 --- a/kommander/widgets/slider.cpp +++ b/kommander/widgets/slider.cpp @@ -15,25 +15,25 @@ ***************************************************************************/ /* QT INCLUDES */ -#include <qstringlist.h> -#include <qevent.h> +#include <tqstringlist.h> +#include <tqevent.h> /* OTHER INCLUDES */ #include <specials.h> #include "slider.h" -Slider::Slider(QWidget * a_parent, const char *a_name) - : QSlider(a_parent, a_name), KommanderWidget((QObject *) this) +Slider::Slider(TQWidget * a_parent, const char *a_name) + : TQSlider(a_parent, a_name), KommanderWidget((TQObject *) this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); } -QString Slider::currentState() const +TQString Slider::currentState() const { - return QString("default"); + return TQString("default"); } Slider::~Slider() @@ -45,40 +45,40 @@ bool Slider::isKommanderWidget() const return true; } -QStringList Slider::associatedText() const +TQStringList Slider::associatedText() const { return KommanderWidget::associatedText(); } -void Slider::setAssociatedText(const QStringList & a_at) +void Slider::setAssociatedText(const TQStringList & a_at) { KommanderWidget::setAssociatedText(a_at); } -void Slider::setPopulationText(const QString & a_text) +void Slider::setPopulationText(const TQString & a_text) { KommanderWidget::setPopulationText(a_text); } -QString Slider::populationText() const +TQString Slider::populationText() const { return KommanderWidget::populationText(); } void Slider::populate() { - QString txt = KommanderWidget::evalAssociatedText(populationText()); + TQString txt = KommanderWidget::evalAssociatedText(populationText()); setWidgetText(txt); } -void Slider::setWidgetText(const QString & a_text) +void Slider::setWidgetText(const TQString & a_text) { setValue(a_text.toInt()); } -void Slider::showEvent(QShowEvent * e) +void Slider::showEvent(TQShowEvent * e) { - QSlider::showEvent(e); + TQSlider::showEvent(e); emit widgetOpened(); } @@ -87,11 +87,11 @@ bool Slider::isFunctionSupported(int f) return f == DCOP::text || f == DCOP::setText || f == DCOP::clear || f == DCOP::setMaximum || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; } -QString Slider::handleDCOP(int function, const QStringList& args) +TQString Slider::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: - return QString::number(value()); + return TQString::number(value()); case DCOP::setText: setValue(args[0].toInt()); break; @@ -106,7 +106,7 @@ QString Slider::handleDCOP(int function, const QStringList& args) break; case DCOP::setBackgroundColor: { - QColor color; + TQColor color; color.setNamedColor(args[0]); this->setPaletteBackgroundColor(color); break; @@ -114,7 +114,7 @@ QString Slider::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } diff --git a/kommander/widgets/slider.h b/kommander/widgets/slider.h index 59526deb..365abe3c 100644 --- a/kommander/widgets/slider.h +++ b/kommander/widgets/slider.h @@ -17,44 +17,44 @@ #define _HAVE_SLIDER_H_ /* KDE INCLUDES */ -#include <qslider.h> +#include <tqslider.h> /* QT INCLUDES */ -#include <qstringlist.h> -#include <qstring.h> +#include <tqstringlist.h> +#include <tqstring.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> #include <kommander_export.h> class QShowEvent; -class KOMMANDER_EXPORT Slider: public QSlider, public KommanderWidget +class KOMMANDER_EXPORT Slider: public TQSlider, public KommanderWidget { - Q_OBJECT Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_OBJECT Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - Slider(QWidget*, const char*); + Slider(TQWidget*, const char*); virtual ~Slider(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList &); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString &); + virtual void setAssociatedText(const TQStringList &); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString &); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: - virtual void setWidgetText(const QString &); + virtual void setWidgetText(const TQString &); virtual void populate(); signals: void widgetOpened(); protected: - void showEvent(QShowEvent* e); + void showEvent(TQShowEvent* e); }; #endif diff --git a/kommander/widgets/spinboxint.cpp b/kommander/widgets/spinboxint.cpp index ce013333..a2b9af6a 100644 --- a/kommander/widgets/spinboxint.cpp +++ b/kommander/widgets/spinboxint.cpp @@ -16,21 +16,21 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qobject.h> -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qspinbox.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> +#include <tqevent.h> +#include <tqspinbox.h> /* OTHER INCLUDES */ #include <specials.h> #include "spinboxint.h" -SpinBoxInt::SpinBoxInt(QWidget *a_parent, const char *a_name) - : QSpinBox(a_parent, a_name), KommanderWidget(this) +SpinBoxInt::SpinBoxInt(TQWidget *a_parent, const char *a_name) + : TQSpinBox(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); @@ -40,7 +40,7 @@ SpinBoxInt::~SpinBoxInt() { } -QString SpinBoxInt::currentState() const +TQString SpinBoxInt::currentState() const { return "default"; } @@ -50,22 +50,22 @@ bool SpinBoxInt::isKommanderWidget() const return true; } -QStringList SpinBoxInt::associatedText() const +TQStringList SpinBoxInt::associatedText() const { return KommanderWidget::associatedText(); } -void SpinBoxInt::setAssociatedText(const QStringList& a_at) +void SpinBoxInt::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void SpinBoxInt::setPopulationText(const QString& a_text) +void SpinBoxInt::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString SpinBoxInt::populationText() const +TQString SpinBoxInt::populationText() const { return KommanderWidget::populationText(); } @@ -75,27 +75,27 @@ void SpinBoxInt::populate() setWidgetText(KommanderWidget::evalAssociatedText( populationText())); } -void SpinBoxInt::setWidgetText(const QString &a_text) +void SpinBoxInt::setWidgetText(const TQString &a_text) { setValue(a_text.toInt()); emit widgetTextChanged(a_text); } -void SpinBoxInt::showEvent( QShowEvent *e ) +void SpinBoxInt::showEvent( TQShowEvent *e ) { - QSpinBox::showEvent(e); + TQSpinBox::showEvent(e); emit widgetOpened(); } -void SpinBoxInt::focusOutEvent( QFocusEvent * e) +void SpinBoxInt::focusOutEvent( TQFocusEvent * e) { - QSpinBox::focusOutEvent(e); + TQSpinBox::focusOutEvent(e); emit lostFocus(); } -void SpinBoxInt::focusInEvent( QFocusEvent * e) +void SpinBoxInt::focusInEvent( TQFocusEvent * e) { - QSpinBox::focusInEvent(e); + TQSpinBox::focusInEvent(e); emit gotFocus(); } @@ -104,7 +104,7 @@ bool SpinBoxInt::isFunctionSupported(int f) return f == DCOP::text || f == DCOP::setText || f == DCOP::setMaximum || f == DCOP::geometry|| f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; } -QString SpinBoxInt::handleDCOP(int function, const QStringList& args) +TQString SpinBoxInt::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: @@ -117,7 +117,7 @@ QString SpinBoxInt::handleDCOP(int function, const QStringList& args) break; case DCOP::geometry: { - QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; break; } @@ -126,7 +126,7 @@ QString SpinBoxInt::handleDCOP(int function, const QStringList& args) break; case DCOP::setBackgroundColor: { - QColor color; + TQColor color; color.setNamedColor(args[0]); this->setPaletteBackgroundColor(color); break; @@ -134,7 +134,7 @@ QString SpinBoxInt::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } #include "spinboxint.moc" diff --git a/kommander/widgets/spinboxint.h b/kommander/widgets/spinboxint.h index 03c30b24..ffd135e7 100644 --- a/kommander/widgets/spinboxint.h +++ b/kommander/widgets/spinboxint.h @@ -19,10 +19,10 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qobject.h> -#include <qstringlist.h> -#include <qstring.h> -#include <qspinbox.h> +#include <tqobject.h> +#include <tqstringlist.h> +#include <tqstring.h> +#include <tqspinbox.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -30,38 +30,38 @@ class QWidget; class QShowEvent; -class KOMMANDER_EXPORT SpinBoxInt : public QSpinBox, public KommanderWidget +class KOMMANDER_EXPORT SpinBoxInt : public TQSpinBox, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - SpinBoxInt(QWidget *a_parent, const char *a_name); + SpinBoxInt(TQWidget *a_parent, const char *a_name); ~SpinBoxInt(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: - virtual void setWidgetText(const QString&); + virtual void setWidgetText(const TQString&); virtual void populate(); signals: void widgetOpened(); - void widgetTextChanged(const QString&); + void widgetTextChanged(const TQString&); void lostFocus(); void gotFocus(); protected: - void showEvent(QShowEvent *e); - void focusOutEvent( QFocusEvent* e); - void focusInEvent( QFocusEvent* e); + void showEvent(TQShowEvent *e); + void focusOutEvent( TQFocusEvent* e); + void focusInEvent( TQFocusEvent* e); private: }; diff --git a/kommander/widgets/statusbar.cpp b/kommander/widgets/statusbar.cpp index 90b23999..59070884 100644 --- a/kommander/widgets/statusbar.cpp +++ b/kommander/widgets/statusbar.cpp @@ -16,24 +16,24 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qobject.h> -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> -#include <qevent.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> +#include <tqevent.h> /* OTHER INCLUDES */ #include <specials.h> #include "statusbar.h" -StatusBar::StatusBar(QWidget *a_parent, const char *a_name) +StatusBar::StatusBar(TQWidget *a_parent, const char *a_name) : KStatusBar(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); - insertItem(QString::null, 0, 1); + insertItem(TQString::null, 0, 1); setItemAlignment(0, Qt::AlignLeft); } @@ -41,9 +41,9 @@ StatusBar::~StatusBar() { } -QString StatusBar::currentState() const +TQString StatusBar::currentState() const { - return QString("default"); + return TQString("default"); } bool StatusBar::isKommanderWidget() const @@ -51,22 +51,22 @@ bool StatusBar::isKommanderWidget() const return true; } -QStringList StatusBar::associatedText() const +TQStringList StatusBar::associatedText() const { return KommanderWidget::associatedText(); } -void StatusBar::setAssociatedText(const QStringList& a_at) +void StatusBar::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void StatusBar::setPopulationText(const QString& a_text) +void StatusBar::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString StatusBar::populationText() const +TQString StatusBar::populationText() const { return KommanderWidget::populationText(); } @@ -76,16 +76,16 @@ void StatusBar::populate() changeItem(KommanderWidget::evalAssociatedText(populationText()), 0); } -void StatusBar::showEvent(QShowEvent *e) +void StatusBar::showEvent(TQShowEvent *e) { - QStatusBar::showEvent(e); + TQStatusBar::showEvent(e); emit widgetOpened(); } -void StatusBar::contextMenuEvent( QContextMenuEvent * e ) +void StatusBar::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } @@ -94,7 +94,7 @@ bool StatusBar::isFunctionSupported(int f) return f == DCOP::setText || f == DCOP::insertItem || f == DCOP::removeItem || f == DCOP::clear || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor; } -QString StatusBar::handleDCOP(int function, const QStringList& args) +TQString StatusBar::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::setText: @@ -117,7 +117,7 @@ QString StatusBar::handleDCOP(int function, const QStringList& args) break; case DCOP::setBackgroundColor: { - QColor color; + TQColor color; color.setNamedColor(args[0]); this->setPaletteBackgroundColor(color); break; @@ -125,7 +125,7 @@ QString StatusBar::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } #include "statusbar.moc" diff --git a/kommander/widgets/statusbar.h b/kommander/widgets/statusbar.h index 4920abca..30b9beae 100644 --- a/kommander/widgets/statusbar.h +++ b/kommander/widgets/statusbar.h @@ -19,9 +19,9 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qstringlist.h> -#include <qobject.h> -#include <qstring.h> +#include <tqstringlist.h> +#include <tqobject.h> +#include <tqstring.h> /* OTHER INCLUDES */ #include <kstatusbar.h> @@ -34,22 +34,22 @@ class KOMMANDER_EXPORT StatusBar : public KStatusBar, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - StatusBar(QWidget *a_parent, const char *a_name); + StatusBar(TQWidget *a_parent, const char *a_name); ~StatusBar(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: virtual void populate(); @@ -57,8 +57,8 @@ signals: void widgetOpened(); void contextMenuRequested(int xpos, int ypos); protected: - void showEvent(QShowEvent *e); - void contextMenuEvent( QContextMenuEvent * e ); + void showEvent(TQShowEvent *e); + void contextMenuEvent( TQContextMenuEvent * e ); private: }; diff --git a/kommander/widgets/subdialog.cpp b/kommander/widgets/subdialog.cpp index 4986d174..292ac541 100644 --- a/kommander/widgets/subdialog.cpp +++ b/kommander/widgets/subdialog.cpp @@ -16,13 +16,13 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qobject.h> -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qpushbutton.h> -#include <qdialog.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> +#include <tqevent.h> +#include <tqpushbutton.h> +#include <tqdialog.h> /* OTHER INCLUDES */ #include <kdebug.h> @@ -31,15 +31,15 @@ #include <specials.h> #include "subdialog.h" -SubDialog::SubDialog(QWidget *a_parent, const char *a_name) - : QPushButton(a_parent, a_name), KommanderWidget(this), m_dialog(0) +SubDialog::SubDialog(TQWidget *a_parent, const char *a_name) + : TQPushButton(a_parent, a_name), KommanderWidget(this), m_dialog(0) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); - connect(this, SIGNAL(clicked()), this, SLOT(showDialog())); + connect(this, TQT_SIGNAL(clicked()), this, TQT_SLOT(showDialog())); } @@ -47,9 +47,9 @@ SubDialog::~SubDialog() { } -QString SubDialog::currentState() const +TQString SubDialog::currentState() const { - return QString("default"); + return TQString("default"); } bool SubDialog::isKommanderWidget() const @@ -57,39 +57,39 @@ bool SubDialog::isKommanderWidget() const return true; } -QStringList SubDialog::associatedText() const +TQStringList SubDialog::associatedText() const { return KommanderWidget::associatedText(); } -void SubDialog::setAssociatedText(const QStringList& a_at) +void SubDialog::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void SubDialog::setPopulationText(const QString& a_text) +void SubDialog::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText( a_text ); } -QString SubDialog::populationText() const +TQString SubDialog::populationText() const { return KommanderWidget::populationText(); } void SubDialog::populate() { - QString txt = KommanderWidget::evalAssociatedText( populationText() ); + TQString txt = KommanderWidget::evalAssociatedText( populationText() ); //FIXME } -void SubDialog::setKmdrFile(QString a_kmdrFile) +void SubDialog::setKmdrFile(TQString a_kmdrFile) { m_kmdrFile = a_kmdrFile; } -QString SubDialog::kmdrFile() const +TQString SubDialog::kmdrFile() const { return m_kmdrFile; } @@ -99,11 +99,11 @@ void SubDialog::showDialog() delete m_dialog; KommanderFactory::loadPlugins(); - m_dialog = (QDialog *)KommanderFactory::create(kmdrFile()); + m_dialog = (TQDialog *)KommanderFactory::create(kmdrFile()); if(!m_dialog) { kdWarning() << "Creation of sub dialog failed .." << endl; - connect(m_dialog, SIGNAL(finished()), this, SLOT(slotFinished())); + connect(m_dialog, TQT_SIGNAL(finished()), this, TQT_SLOT(slotFinished())); m_dialog->exec(); } @@ -119,19 +119,19 @@ void SubDialog::slotFinished() } } -void SubDialog::showEvent( QShowEvent *e ) +void SubDialog::showEvent( TQShowEvent *e ) { - QPushButton::showEvent( e ); + TQPushButton::showEvent( e ); emit widgetOpened(); } -QString SubDialog::handleDCOP(int function, const QStringList& args) +TQString SubDialog::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: { if (!m_dialog) - return QString(); + return TQString(); KommanderWidget *atw = dynamic_cast<KommanderWidget *>(m_dialog); if(atw) return atw->evalAssociatedText(); @@ -139,7 +139,7 @@ QString SubDialog::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } diff --git a/kommander/widgets/subdialog.h b/kommander/widgets/subdialog.h index ad19fec5..941455ca 100644 --- a/kommander/widgets/subdialog.h +++ b/kommander/widgets/subdialog.h @@ -19,10 +19,10 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qpushbutton.h> -#include <qobject.h> -#include <qstring.h> -#include <qstringlist.h> +#include <tqpushbutton.h> +#include <tqobject.h> +#include <tqstring.h> +#include <tqstringlist.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -31,39 +31,39 @@ class QWidget; class QDialog; class QShowEvent; -class KOMMANDER_EXPORT SubDialog : public QPushButton, public KommanderWidget +class KOMMANDER_EXPORT SubDialog : public TQPushButton, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QString kmdrFile READ kmdrFile WRITE setKmdrFile) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQString kmdrFile READ kmdrFile WRITE setKmdrFile) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - SubDialog(QWidget *a_parent, const char *a_name); + SubDialog(TQWidget *a_parent, const char *a_name); ~SubDialog(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); - QString kmdrFile() const; + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); + TQString kmdrFile() const; - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); public slots: - void setKmdrFile(QString); + void setKmdrFile(TQString); virtual void showDialog(); virtual void slotFinished(); virtual void populate(); signals: void widgetOpened(); - void widgetTextChanged(const QString &); + void widgetTextChanged(const TQString &); protected: - QDialog *m_dialog; - QString m_kmdrFile; - void showEvent( QShowEvent *e ); + TQDialog *m_dialog; + TQString m_kmdrFile; + void showEvent( TQShowEvent *e ); private: }; diff --git a/kommander/widgets/table.cpp b/kommander/widgets/table.cpp index 358b548b..b7e2d68a 100644 --- a/kommander/widgets/table.cpp +++ b/kommander/widgets/table.cpp @@ -20,11 +20,11 @@ #include <kmessagebox.h> /* QT INCLUDES */ -#include <qmetaobject.h> -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> -#include <qpoint.h> +#include <tqmetaobject.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> +#include <tqpoint.h> /* OTHER INCLUDES */ #include "kommanderplugin.h" @@ -47,24 +47,24 @@ enum Functions { }; -Table::Table(QWidget *a_parent, const char *a_name) - : QTable(a_parent, a_name), KommanderWidget(this) +Table::Table(TQWidget *a_parent, const char *a_name) + : TQTable(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); KommanderPlugin::setDefaultGroup(Group::DCOP); - KommanderPlugin::registerFunction(TBL_sortColumnExtra, "sortColumnExtra(QString widget, int col, bool ascending, bool wholeRows)", i18n("Sets a column to sort ascending or descending. Optionally can sort with rows intact for database use."), 2, 4); - KommanderPlugin::registerFunction(TBL_keepCellVisible, "keepCellVisible(QString widget, int row, int col)", i18n("Scrolls the table so the cell indicated is visible."), 3); - KommanderPlugin::registerFunction(TBL_selectCells, "selectCells(QString widget, int row, int col, int row, int col)", i18n("Select cells using the upper left and lower right cell addresses<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 5); - KommanderPlugin::registerFunction(TBL_selectRow, "selectRow(QString widget, int row)", i18n("Select the row with the zero based index."), 2); - KommanderPlugin::registerFunction(TBL_selectColumn, "selectColumn(QString widget, int col)", i18n("Select the column with the zero based index.<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 2); - KommanderPlugin::registerFunction(TBL_setColumnReadOnly, "setColumnReadOnly(QString widget, int col, bool Readonly)", i18n("Set the column read only using zero based index.<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 3); - KommanderPlugin::registerFunction(TBL_setRowReadOnly, "setRowReadOnly(QString widget, int row, bool Readonly)", i18n("Set the row read only using zero based index.<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 3); - KommanderPlugin::registerFunction(TBL_rowCount, "rowCount(QString widget)", i18n("Returns the number of rows of the table"), 1); - KommanderPlugin::registerFunction(TBL_colHeader, "columnHeader(QString widget, int Column)", i18n("Returns the text of the header for the column index"), 2); - KommanderPlugin::registerFunction(TBL_rowHeader, "rowHeader(QString widget, int Row)", i18n("Returns the text of the header for the row index"), 2); + KommanderPlugin::registerFunction(TBL_sortColumnExtra, "sortColumnExtra(TQString widget, int col, bool ascending, bool wholeRows)", i18n("Sets a column to sort ascending or descending. Optionally can sort with rows intact for database use."), 2, 4); + KommanderPlugin::registerFunction(TBL_keepCellVisible, "keepCellVisible(TQString widget, int row, int col)", i18n("Scrolls the table so the cell indicated is visible."), 3); + KommanderPlugin::registerFunction(TBL_selectCells, "selectCells(TQString widget, int row, int col, int row, int col)", i18n("Select cells using the upper left and lower right cell addresses<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 5); + KommanderPlugin::registerFunction(TBL_selectRow, "selectRow(TQString widget, int row)", i18n("Select the row with the zero based index."), 2); + KommanderPlugin::registerFunction(TBL_selectColumn, "selectColumn(TQString widget, int col)", i18n("Select the column with the zero based index.<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 2); + KommanderPlugin::registerFunction(TBL_setColumnReadOnly, "setColumnReadOnly(TQString widget, int col, bool Readonly)", i18n("Set the column read only using zero based index.<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 3); + KommanderPlugin::registerFunction(TBL_setRowReadOnly, "setRowReadOnly(TQString widget, int row, bool Readonly)", i18n("Set the row read only using zero based index.<br /><b>Not guaranteed to have KDE4 compatiblility</b>"), 3); + KommanderPlugin::registerFunction(TBL_rowCount, "rowCount(TQString widget)", i18n("Returns the number of rows of the table"), 1); + KommanderPlugin::registerFunction(TBL_colHeader, "columnHeader(TQString widget, int Column)", i18n("Returns the text of the header for the column index"), 2); + KommanderPlugin::registerFunction(TBL_rowHeader, "rowHeader(TQString widget, int Row)", i18n("Returns the text of the header for the row index"), 2); } @@ -72,9 +72,9 @@ Table::~Table() { } -QString Table::currentState() const +TQString Table::currentState() const { - return QString("default"); + return TQString("default"); } bool Table::isKommanderWidget() const @@ -82,22 +82,22 @@ bool Table::isKommanderWidget() const return true; } -QStringList Table::associatedText() const +TQStringList Table::associatedText() const { return KommanderWidget::associatedText(); } -void Table::setAssociatedText(const QStringList& a_at) +void Table::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void Table::setPopulationText(const QString& a_text) +void Table::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString Table::populationText() const +TQString Table::populationText() const { return KommanderWidget::populationText(); } @@ -107,14 +107,14 @@ void Table::populate() setWidgetText(KommanderWidget::evalAssociatedText( populationText())); } -void Table::setWidgetText(const QString&) +void Table::setWidgetText(const TQString&) { } -QString Table::selectedArea() +TQString Table::selectedArea() { - QTableSelection sel = selection(currentSelection()); - return QString("%1,%2,%3,%4").arg(sel.topRow()).arg(sel.leftCol()).arg(sel.bottomRow()).arg(sel.rightCol()); + TQTableSelection sel = selection(currentSelection()); + return TQString("%1,%2,%3,%4").arg(sel.topRow()).arg(sel.leftCol()).arg(sel.bottomRow()).arg(sel.rightCol()); } @@ -126,48 +126,48 @@ bool Table::isFunctionSupported(int f) f == DCOP::setRowCaption || f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f >= FirstFunction && f <= LastFunction); } -void Table::setCellWidget(int row, int col, const QString & _widgetName) +void Table::setCellWidget(int row, int col, const TQString & _widgetName) { KommanderWidget *w = widgetByName(_widgetName); if (w) { - QWidget *widget = static_cast<QWidget*>(w->object()); - if (QTable::cellWidget(row, col) != widget) + TQWidget *widget = static_cast<TQWidget*>(w->object()); + if (TQTable::cellWidget(row, col) != widget) { setCurrentCell(-1, -1); //hack to not delete the cellwidget after clicking away to another cell. //I don't know why it does so, but without this on a click to another cell calls endEdit, which calls //clearCellWidget, all this before the currentChanged signal is emitted. //this hack does ugly things once table starts scrolling - let's try to minize damage //we should have a way to test doe cellWidget looses focus and send it right or down too - QTable::ensureCellVisible(row, col); + TQTable::ensureCellVisible(row, col); clearCellWidget(row, col); - QTable::setCellWidget(row, col, widget); + TQTable::setCellWidget(row, col, widget); } } else clearCellWidget(row, col); } -QString Table::cellWidget(int row, int col) +TQString Table::cellWidget(int row, int col) { - QWidget *widget = QTable::cellWidget(row, col); + TQWidget *widget = TQTable::cellWidget(row, col); if (widget) { KommanderWidget *w = widgetByName(widget->name()); if (w) return widget->name(); } - return QString(); + return TQString(); } -void Table::setCellText(int row, int col, const QString& text) +void Table::setCellText(int row, int col, const TQString& text) { - QWidget *widget = QTable::cellWidget(row, col); + TQWidget *widget = TQTable::cellWidget(row, col); if (widget) { KommanderWidget *w = widgetByName(widget->name()); if (w) - widget->reparent(parentDialog(), QPoint(0,0)); + widget->reparent(parentDialog(), TQPoint(0,0)); } setText(row, col, text); endEdit(row, col, false, false); @@ -175,13 +175,13 @@ void Table::setCellText(int row, int col, const QString& text) void Table::clearCellWidget(int row, int col) { - QTable::clearCellWidget(row, col); //just for debugging + TQTable::clearCellWidget(row, col); //just for debugging } -void Table::contextMenuEvent( QContextMenuEvent * e ) +void Table::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } @@ -194,7 +194,7 @@ void Table::columnClicked(int col) sortColumn( col, ascending, TRUE); } -QString Table::handleDCOP(int function, const QStringList& args) +TQString Table::handleDCOP(int function, const TQStringList& args) { switch (function) { @@ -218,11 +218,11 @@ QString Table::handleDCOP(int function, const QStringList& args) insertColumns(args[0].toInt(), args.count() == 1 ? 1 : args[1].toInt()); break; case DCOP::currentColumn: - return QString::number(currentColumn()); + return TQString::number(currentColumn()); case DCOP::currentRow: - return QString::number(currentRow()); + return TQString::number(currentRow()); case DCOP::columnCount: - return QString::number(numCols()); + return TQString::number(numCols()); break; case DCOP::removeColumn: if (numCols() >= args[0].toInt()) @@ -239,7 +239,7 @@ QString Table::handleDCOP(int function, const QStringList& args) break; } case TBL_rowCount: - return QString::number(numRows()); + return TQString::number(numRows()); break; case DCOP::removeRow: { @@ -259,10 +259,10 @@ QString Table::handleDCOP(int function, const QStringList& args) break; case DCOP::text: { - QString rows; + TQString rows; for (int r = 0; r < numRows(); r++) { - QString row; + TQString row; for (int c = 0; c < numCols(); c++) { if (c) @@ -280,17 +280,17 @@ QString Table::handleDCOP(int function, const QStringList& args) int r = 0, c = 0; setNumCols(0); setNumRows(0); - QStringList rows; - QStringList row; - rows = QStringList::split("\n", args[0], true); + TQStringList rows; + TQStringList row; + rows = TQStringList::split("\n", args[0], true); setNumRows(rows.count()); - for (QStringList::Iterator it = rows.begin(); it != rows.end(); ++it, ++r) + for (TQStringList::Iterator it = rows.begin(); it != rows.end(); ++it, ++r) { - row = QStringList::split("\t", *it, true); + row = TQStringList::split("\t", *it, true); if (!r) setNumCols(row.count()); c = 0; - for (QStringList::Iterator itr = row.begin(); itr != row.end(); ++itr, ++c) + for (TQStringList::Iterator itr = row.begin(); itr != row.end(); ++itr, ++c) setText(r, c, *itr); } break; @@ -303,42 +303,42 @@ QString Table::handleDCOP(int function, const QStringList& args) break; case DCOP::setBackgroundColor: { - QColor color; + TQColor color; color.setNamedColor(args[0]); this->setPaletteBackgroundColor(color); break; } case TBL_sortColumnExtra: if (numCols() >= args[0].toInt()) - QTable::sortColumn(args[0].toInt(), args[1].toInt(), args[2].toInt()); + TQTable::sortColumn(args[0].toInt(), args[1].toInt(), args[2].toInt()); break; case TBL_keepCellVisible: if (numRows() >= args[0].toInt() && numCols() >+ args[1].toInt()) - QTable::ensureCellVisible(args[0].toInt()-1, args[1].toInt()-1); + TQTable::ensureCellVisible(args[0].toInt()-1, args[1].toInt()-1); break; case TBL_selectCells: if (numRows() >= args[0].toInt() && numCols() >+ args[1].toInt() && numRows() >= args[2].toInt() && numCols() >+ args[3].toInt()) - QTable::selectCells (args[0].toInt(), args[1].toInt(), args[2].toInt(), args[3].toInt()); + TQTable::selectCells (args[0].toInt(), args[1].toInt(), args[2].toInt(), args[3].toInt()); break; case TBL_selectRow: if (numRows() >= args[0].toInt()) - QTable::selectRow (args[0].toInt()); + TQTable::selectRow (args[0].toInt()); break; case TBL_selectColumn: if (numCols() >= args[0].toInt()) - QTable::selectColumn (args[0].toInt()); + TQTable::selectColumn (args[0].toInt()); break; case TBL_setColumnReadOnly: if (numCols() >= args[0].toInt()) - QTable::setColumnReadOnly (args[0].toInt(), args[1].toUInt()); + TQTable::setColumnReadOnly (args[0].toInt(), args[1].toUInt()); break; case TBL_setRowReadOnly: if (numRows() >= args[0].toInt()) - QTable::setRowReadOnly (args[0].toInt(), args[1].toUInt()); + TQTable::setRowReadOnly (args[0].toInt(), args[1].toUInt()); break; case TBL_colHeader: { - QHeader* hdr = QTable::horizontalHeader(); + TQHeader* hdr = TQTable::horizontalHeader(); if (numCols() >= args[0].toInt()) return hdr->label(args[0].toInt()); else @@ -347,7 +347,7 @@ QString Table::handleDCOP(int function, const QStringList& args) } case TBL_rowHeader: { - QHeader* hdr = QTable::verticalHeader(); + TQHeader* hdr = TQTable::verticalHeader(); if (numRows() >= args[0].toInt()) return hdr->label(args[0].toInt()); else @@ -356,17 +356,17 @@ QString Table::handleDCOP(int function, const QStringList& args) } case DCOP::geometry: { - QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; break; } case DCOP::hasFocus: - return QString::number(this->hasFocus()); + return TQString::number(this->hasFocus()); break; default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } #include "table.moc" diff --git a/kommander/widgets/table.h b/kommander/widgets/table.h index 26ed3b36..c2ec755e 100644 --- a/kommander/widgets/table.h +++ b/kommander/widgets/table.h @@ -20,53 +20,53 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qtable.h> -#include <qobject.h> +#include <tqtable.h> +#include <tqobject.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> class QWidget; -class KOMMANDER_EXPORT Table : public QTable, public KommanderWidget +class KOMMANDER_EXPORT Table : public TQTable, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_OVERRIDE(bool readOnly DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - Table(QWidget *a_parent, const char *a_name); + Table(TQWidget *a_parent, const char *a_name); ~Table(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); virtual void clearCellWidget(int row, int col); virtual void columnClicked(int col); public slots: virtual void populate(); - virtual void setWidgetText(const QString &); + virtual void setWidgetText(const TQString &); //void adjustColumn(int col); signals: void contextMenuRequested(int xpos, int ypos); void columnHeaderClicked(int col); protected: - void contextMenuEvent( QContextMenuEvent * e ); + void contextMenuEvent( TQContextMenuEvent * e ); private: - QString selectedArea(); - QString cellWidget(int row, int col); - void setCellWidget(int row, int col, const QString &widgetName); - void setCellText(int row, int col, const QString &text); + TQString selectedArea(); + TQString cellWidget(int row, int col); + void setCellWidget(int row, int col, const TQString &widgetName); + void setCellText(int row, int col, const TQString &text); }; #endif diff --git a/kommander/widgets/tabwidget.cpp b/kommander/widgets/tabwidget.cpp index ec0a02cf..8ffc95b1 100644 --- a/kommander/widgets/tabwidget.cpp +++ b/kommander/widgets/tabwidget.cpp @@ -18,12 +18,12 @@ #include <kiconloader.h> /* QT INCLUDES */ -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qtabwidget.h> -#include <qtabbar.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> +#include <tqevent.h> +#include <tqtabwidget.h> +#include <tqtabbar.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -43,31 +43,31 @@ enum Functions { LastFunction }; -TabWidget::TabWidget(QWidget *a_parent, const char *a_name, int a_flags) - : QTabWidget(a_parent, a_name, a_flags), KommanderWidget(this) +TabWidget::TabWidget(TQWidget *a_parent, const char *a_name, int a_flags) + : TQTabWidget(a_parent, a_name, a_flags), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); KommanderPlugin::setDefaultGroup(Group::DCOP); - KommanderPlugin::registerFunction(TAB_setTabIcon, "setTabIcon(QString widget, int Tab, QString Icon)", i18n("Sets an icon on the specified tab. Index is zero based."), 3); - KommanderPlugin::registerFunction(TAB_tabLabel, "tabLabel(QString widget, int Tab)", i18n("Returns the tab label at the given index. Index is zero based."), 2); - KommanderPlugin::registerFunction(TAB_isTabEnabled, "isTabEnabled(QString widget, int Tab)", i18n("Returns true if tab at specified index is enabled, otherwise returns false."), 2); - KommanderPlugin::registerFunction(TAB_setTabEnabled, "setTabEnabled(QString widget, int Tab, bool Enabled)", i18n("Sets the tab at the given index to enabled or disabled."), 3); - KommanderPlugin::registerFunction(TAB_showTabBar, "showTabBar(QString widget, bool Show)", i18n("Show or hide the tabs on the tab widget."), 2); - KommanderPlugin::registerFunction(TAB_setCurrentPage, "setCurrentPage(QString widget, QString Page)", i18n("Set the current page by name."), 2); - KommanderPlugin::registerFunction(TAB_setTabLabel, "setTabLabel(QString widget, int Tab, QString Text)", i18n("Sets the tab tab label."), 3); + KommanderPlugin::registerFunction(TAB_setTabIcon, "setTabIcon(TQString widget, int Tab, TQString Icon)", i18n("Sets an icon on the specified tab. Index is zero based."), 3); + KommanderPlugin::registerFunction(TAB_tabLabel, "tabLabel(TQString widget, int Tab)", i18n("Returns the tab label at the given index. Index is zero based."), 2); + KommanderPlugin::registerFunction(TAB_isTabEnabled, "isTabEnabled(TQString widget, int Tab)", i18n("Returns true if tab at specified index is enabled, otherwise returns false."), 2); + KommanderPlugin::registerFunction(TAB_setTabEnabled, "setTabEnabled(TQString widget, int Tab, bool Enabled)", i18n("Sets the tab at the given index to enabled or disabled."), 3); + KommanderPlugin::registerFunction(TAB_showTabBar, "showTabBar(TQString widget, bool Show)", i18n("Show or hide the tabs on the tab widget."), 2); + KommanderPlugin::registerFunction(TAB_setCurrentPage, "setCurrentPage(TQString widget, TQString Page)", i18n("Set the current page by name."), 2); + KommanderPlugin::registerFunction(TAB_setTabLabel, "setTabLabel(TQString widget, int Tab, TQString Text)", i18n("Sets the tab tab label."), 3); } TabWidget::~TabWidget() { } -QString TabWidget::currentState() const +TQString TabWidget::currentState() const { - return QString("default"); + return TQString("default"); } bool TabWidget::isKommanderWidget() const @@ -75,22 +75,22 @@ bool TabWidget::isKommanderWidget() const return true; } -QStringList TabWidget::associatedText() const +TQStringList TabWidget::associatedText() const { return KommanderWidget::associatedText(); } -void TabWidget::setAssociatedText(const QStringList& a_at) +void TabWidget::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void TabWidget::setPopulationText(const QString& a_text) +void TabWidget::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText( a_text ); } -QString TabWidget::populationText() const +TQString TabWidget::populationText() const { return KommanderWidget::populationText(); } @@ -99,16 +99,16 @@ void TabWidget::populate() { } -void TabWidget::showEvent(QShowEvent* e) +void TabWidget::showEvent(TQShowEvent* e) { - QTabWidget::showEvent(e); + TQTabWidget::showEvent(e); emit widgetOpened(); } -void TabWidget::contextMenuEvent( QContextMenuEvent * e ) +void TabWidget::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } @@ -117,11 +117,11 @@ bool TabWidget::isFunctionSupported(int f) return f == DCOP::currentItem || f == DCOP::setCurrentItem || f == DCOP::insertTab || (f >= FirstFunction && f <= LastFunction) ; } -QString TabWidget::handleDCOP(int function, const QStringList& args) +TQString TabWidget::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::currentItem: - return QString::number(currentPageIndex()); + return TQString::number(currentPageIndex()); case DCOP::setCurrentItem: setCurrentPage(args[0].toUInt()); break; @@ -130,31 +130,31 @@ QString TabWidget::handleDCOP(int function, const QStringList& args) break; case TAB_tabLabel: { - QString s = this->label(args[0].toInt()); + TQString s = this->label(args[0].toInt()); return s.remove("&"); break; } case TAB_setTabIcon: { - QWidget *w = page(args[0].toInt()); + TQWidget *w = page(args[0].toInt()); setTabIconSet(w, KGlobal::iconLoader()->loadIcon(args[1], KIcon::NoGroup, KIcon::SizeMedium)); break; } case TAB_isTabEnabled: { - QWidget *w = page(args[0].toInt()); - return QString::number(this->isTabEnabled(w)); + TQWidget *w = page(args[0].toInt()); + return TQString::number(this->isTabEnabled(w)); break; } case TAB_setTabLabel: { - QWidget *w = page(args[0].toInt()); + TQWidget *w = page(args[0].toInt()); setTabLabel(w, args[1]); break; } case TAB_setTabEnabled: { - QWidget *w = page(args[0].toInt()); + TQWidget *w = page(args[0].toInt()); this->setTabEnabled(w, args[1].toInt()); break; } @@ -164,7 +164,7 @@ QString TabWidget::handleDCOP(int function, const QStringList& args) int i = 0; bool found = false; while (i < cnt) { - QString s = this->label(i); + TQString s = this->label(i); if (s.remove("&") == args[0]) { setCurrentPage(i); @@ -173,12 +173,12 @@ QString TabWidget::handleDCOP(int function, const QStringList& args) } i++; } - return QString::number(found); + return TQString::number(found); break; } case TAB_showTabBar: { - QTabBar *t = this->tabBar(); + TQTabBar *t = this->tabBar(); if (args[0].toInt() == 1) t->show(); else @@ -188,7 +188,7 @@ QString TabWidget::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } #include "tabwidget.moc" diff --git a/kommander/widgets/tabwidget.h b/kommander/widgets/tabwidget.h index 48f19232..87376279 100644 --- a/kommander/widgets/tabwidget.h +++ b/kommander/widgets/tabwidget.h @@ -19,31 +19,31 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qtabwidget.h> +#include <tqtabwidget.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> #include <kommander_export.h> class QShowEvent; -class KOMMANDER_EXPORT TabWidget : public QTabWidget, public KommanderWidget +class KOMMANDER_EXPORT TabWidget : public TQTabWidget, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - TabWidget(QWidget *, const char *, int=0); + TabWidget(TQWidget *, const char *, int=0); ~TabWidget(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: @@ -52,8 +52,8 @@ signals: void widgetOpened(); void contextMenuRequested(int xpos, int ypos); protected: - void showEvent(QShowEvent *e); - void contextMenuEvent( QContextMenuEvent * e ); + void showEvent(TQShowEvent *e); + void contextMenuEvent( TQContextMenuEvent * e ); private: }; diff --git a/kommander/widgets/textbrowser.cpp b/kommander/widgets/textbrowser.cpp index 324bc62c..a2f9e744 100644 --- a/kommander/widgets/textbrowser.cpp +++ b/kommander/widgets/textbrowser.cpp @@ -18,9 +18,9 @@ #include <klocale.h> /* QT INCLUDES */ -#include <qstringlist.h> -#include <qevent.h> -#include <qstring.h> +#include <tqstringlist.h> +#include <tqevent.h> +#include <tqstring.h> /* OTHER INCLUDES */ #include "kommanderplugin.h" @@ -34,21 +34,21 @@ enum Functions { LastFunction }; -TextBrowser::TextBrowser(QWidget * a_parent, const char *a_name) - : KTextBrowser(a_parent, a_name), KommanderWidget((QObject *) this) +TextBrowser::TextBrowser(TQWidget * a_parent, const char *a_name) + : KTextBrowser(a_parent, a_name), KommanderWidget((TQObject *) this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); KommanderPlugin::setDefaultGroup(Group::DCOP); - KommanderPlugin::registerFunction(TBR_setNotifyClick, "setNotifyClick(QString widget, bool Set)",i18n("Set notify click to intercept clicks and handle links"), 2, 2); - KommanderPlugin::registerFunction(TBR_isNotifyClick, "isNotifyClick(QString widget)",i18n("Set notify click to intercept clicks and handle links"), 1); + KommanderPlugin::registerFunction(TBR_setNotifyClick, "setNotifyClick(TQString widget, bool Set)",i18n("Set notify click to intercept clicks and handle links"), 2, 2); + KommanderPlugin::registerFunction(TBR_isNotifyClick, "isNotifyClick(TQString widget)",i18n("Set notify click to intercept clicks and handle links"), 1); } -QString TextBrowser::currentState() const +TQString TextBrowser::currentState() const { - return QString("default"); + return TQString("default"); } TextBrowser::~TextBrowser() @@ -60,47 +60,47 @@ bool TextBrowser::isKommanderWidget() const return true; } -QStringList TextBrowser::associatedText() const +TQStringList TextBrowser::associatedText() const { return KommanderWidget::associatedText(); } -void TextBrowser::setAssociatedText(const QStringList & a_at) +void TextBrowser::setAssociatedText(const TQStringList & a_at) { KommanderWidget::setAssociatedText(a_at); } -void TextBrowser::setPopulationText(const QString & a_text) +void TextBrowser::setPopulationText(const TQString & a_text) { KommanderWidget::setPopulationText(a_text); } -QString TextBrowser::populationText() const +TQString TextBrowser::populationText() const { return KommanderWidget::populationText(); } void TextBrowser::populate() { - QString txt = KommanderWidget::evalAssociatedText(populationText()); + TQString txt = KommanderWidget::evalAssociatedText(populationText()); setWidgetText(txt); } -void TextBrowser::setWidgetText(const QString & a_text) +void TextBrowser::setWidgetText(const TQString & a_text) { setText(a_text); } -void TextBrowser::showEvent(QShowEvent * e) +void TextBrowser::showEvent(TQShowEvent * e) { - QTextBrowser::showEvent(e); + TQTextBrowser::showEvent(e); emit widgetOpened(); } -void TextBrowser::contextMenuEvent( QContextMenuEvent * e ) +void TextBrowser::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } @@ -110,7 +110,7 @@ bool TextBrowser::isFunctionSupported(int f) return f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::clear || (f >= FirstFunction && f <= LastFunction); } -QString TextBrowser::handleDCOP(int function, const QStringList& args) +TQString TextBrowser::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: @@ -124,7 +124,7 @@ QString TextBrowser::handleDCOP(int function, const QStringList& args) KTextBrowser::setNotifyClick(args[0]); break; case TBR_isNotifyClick: - return QString::number(KTextBrowser::isNotifyClick()); + return TQString::number(KTextBrowser::isNotifyClick()); break; case DCOP::clear: clear(); @@ -132,7 +132,7 @@ QString TextBrowser::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } diff --git a/kommander/widgets/textbrowser.h b/kommander/widgets/textbrowser.h index f34e374e..e640bb3f 100644 --- a/kommander/widgets/textbrowser.h +++ b/kommander/widgets/textbrowser.h @@ -20,8 +20,8 @@ #include <ktextbrowser.h> /* QT INCLUDES */ -#include <qstringlist.h> -#include <qstring.h> +#include <tqstringlist.h> +#include <tqstring.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -30,25 +30,25 @@ class QShowEvent; class KOMMANDER_EXPORT TextBrowser: public KTextBrowser, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - TextBrowser(QWidget*, const char*); + TextBrowser(TQWidget*, const char*); virtual ~TextBrowser(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList &); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString &); + virtual void setAssociatedText(const TQStringList &); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString &); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: - virtual void setWidgetText(const QString &); + virtual void setWidgetText(const TQString &); virtual void populate(); signals: @@ -56,8 +56,8 @@ signals: void contextMenuRequested(int xpos, int ypos); protected: - void showEvent(QShowEvent* e); - void contextMenuEvent( QContextMenuEvent * e ); + void showEvent(TQShowEvent* e); + void contextMenuEvent( TQContextMenuEvent * e ); }; #endif diff --git a/kommander/widgets/textedit.cpp b/kommander/widgets/textedit.cpp index b59e0513..72f8c754 100644 --- a/kommander/widgets/textedit.cpp +++ b/kommander/widgets/textedit.cpp @@ -16,10 +16,10 @@ ***************************************************************************/ /* QT INCLUDES */ -#include <qlayout.h> -#include <qlineedit.h> -#include <qstringlist.h> -#include <qevent.h> +#include <tqlayout.h> +#include <tqlineedit.h> +#include <tqstringlist.h> +#include <tqevent.h> /* OTHER INCLUDES */ #include <specials.h> @@ -42,33 +42,33 @@ enum Functions { LastFunction }; -TextEdit::TextEdit(QWidget * a_parent, const char *a_name):KTextEdit(a_parent, a_name), -KommanderWidget((QObject *) this) +TextEdit::TextEdit(TQWidget * a_parent, const char *a_name):KTextEdit(a_parent, a_name), +KommanderWidget((TQObject *) this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); - connect(this, SIGNAL(textChanged()), this, SLOT(setTextChanged())); + connect(this, TQT_SIGNAL(textChanged()), this, TQT_SLOT(setTextChanged())); KommanderPlugin::setDefaultGroup(Group::DCOP); - KommanderPlugin::registerFunction(TE_setModified, "setModified(QString widget, bool Modified)", i18n("Set widget modified status."), 1); - KommanderPlugin::registerFunction(TE_selectText, "selectText(QString widget, int paraFrom, int indexFrom, int paraTo, int indexTo)", i18n("Select a block of text using the paragraph number and character index of the line. You can use the cursorPositionChanged(int, int) signal to get this data in real time into a script."), 5); - KommanderPlugin::registerFunction(TE_findText, "findText(QString widget, QString Text, bool Case-Sensitive, bool Forward)", i18n("Search for text from the cursor or a specified position. You can specifiy case sensitive search and forward or backward."), 5); -// KommanderPlugin::registerFunction(TE_findText, "findText(QString widget, QString Text, bool Case-Sensitive, bool Forward, int Paragraph, int Index)", i18n("Search for text from the cursor or a specified position. You can specifiy case sensitive search and forward or backward."), 5, 7); - KommanderPlugin::registerFunction(TE_paragraphs, "paragraphs(QString widget)", i18n("Get the number of paragraphs in the widget."), 1); - KommanderPlugin::registerFunction(TE_length, "length(QString widget)", i18n("Get the total length of all text."), 1); -// KommanderPlugin::registerFunction(TE_getCursorPosition, "getCursorPosition(QString widget)", i18n("Get the cursor postion in the form of paragraph and postion integers."), 1); - KommanderPlugin::registerFunction(TE_paragraphLength, "paragraphLength(QString widget, int Paragraph)", i18n("Get the length of the paragraph."), 2); - KommanderPlugin::registerFunction(TE_linesOfParagraph, "linesOfParagraph(QString widget, int Paragraph)", i18n("Get the number of lines in the paragraph."), 2); - KommanderPlugin::registerFunction(TE_VAsuperScript, "setSuperScript(QString widget)", i18n("Use to set superscript."), 1); - KommanderPlugin::registerFunction(TE_VAnormalScript, "setNormalScript(QString widget)", i18n("Use to revert from superscript to normal script."), 1); + KommanderPlugin::registerFunction(TE_setModified, "setModified(TQString widget, bool Modified)", i18n("Set widget modified status."), 1); + KommanderPlugin::registerFunction(TE_selectText, "selectText(TQString widget, int paraFrom, int indexFrom, int paraTo, int indexTo)", i18n("Select a block of text using the paragraph number and character index of the line. You can use the cursorPositionChanged(int, int) signal to get this data in real time into a script."), 5); + KommanderPlugin::registerFunction(TE_findText, "findText(TQString widget, TQString Text, bool Case-Sensitive, bool Forward)", i18n("Search for text from the cursor or a specified position. You can specifiy case sensitive search and forward or backward."), 5); +// KommanderPlugin::registerFunction(TE_findText, "findText(TQString widget, TQString Text, bool Case-Sensitive, bool Forward, int Paragraph, int Index)", i18n("Search for text from the cursor or a specified position. You can specifiy case sensitive search and forward or backward."), 5, 7); + KommanderPlugin::registerFunction(TE_paragraphs, "paragraphs(TQString widget)", i18n("Get the number of paragraphs in the widget."), 1); + KommanderPlugin::registerFunction(TE_length, "length(TQString widget)", i18n("Get the total length of all text."), 1); +// KommanderPlugin::registerFunction(TE_getCursorPosition, "getCursorPosition(TQString widget)", i18n("Get the cursor postion in the form of paragraph and postion integers."), 1); + KommanderPlugin::registerFunction(TE_paragraphLength, "paragraphLength(TQString widget, int Paragraph)", i18n("Get the length of the paragraph."), 2); + KommanderPlugin::registerFunction(TE_linesOfParagraph, "linesOfParagraph(TQString widget, int Paragraph)", i18n("Get the number of lines in the paragraph."), 2); + KommanderPlugin::registerFunction(TE_VAsuperScript, "setSuperScript(TQString widget)", i18n("Use to set superscript."), 1); + KommanderPlugin::registerFunction(TE_VAnormalScript, "setNormalScript(TQString widget)", i18n("Use to revert from superscript to normal script."), 1); } -QString TextEdit::currentState() const +TQString TextEdit::currentState() const { - return QString("default"); + return TQString("default"); } TextEdit::~TextEdit() @@ -80,22 +80,22 @@ bool TextEdit::isKommanderWidget() const return true; } -QStringList TextEdit::associatedText() const +TQStringList TextEdit::associatedText() const { return KommanderWidget::associatedText(); } -void TextEdit::setAssociatedText(const QStringList & a_at) +void TextEdit::setAssociatedText(const TQStringList & a_at) { KommanderWidget::setAssociatedText(a_at); } -void TextEdit::setPopulationText(const QString & a_text) +void TextEdit::setPopulationText(const TQString & a_text) { KommanderWidget::setPopulationText(a_text); } -QString TextEdit::populationText() const +TQString TextEdit::populationText() const { return KommanderWidget::populationText(); } @@ -105,7 +105,7 @@ void TextEdit::populate() setWidgetText(KommanderWidget::evalAssociatedText(populationText())); } -void TextEdit::setWidgetText(const QString & a_text) +void TextEdit::setWidgetText(const TQString & a_text) { setText(a_text); emit widgetTextChanged(text()); @@ -116,28 +116,28 @@ void TextEdit::setTextChanged() emit widgetTextChanged(text()); } -void TextEdit::focusOutEvent( QFocusEvent * e) +void TextEdit::focusOutEvent( TQFocusEvent * e) { - QTextEdit::focusOutEvent(e); + TQTextEdit::focusOutEvent(e); emit lostFocus(); } -void TextEdit::focusInEvent( QFocusEvent * e) +void TextEdit::focusInEvent( TQFocusEvent * e) { - QTextEdit::focusInEvent(e); + TQTextEdit::focusInEvent(e); emit gotFocus(); } -void TextEdit::showEvent(QShowEvent * e) +void TextEdit::showEvent(TQShowEvent * e) { - QTextEdit::showEvent(e); + TQTextEdit::showEvent(e); emit widgetOpened(); } -void TextEdit::contextMenuEvent( QContextMenuEvent * e ) +void TextEdit::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } @@ -146,7 +146,7 @@ bool TextEdit::isFunctionSupported(int f) return f == DCOP::text || f == DCOP::setText || f == DCOP::selection || f == DCOP::setSelection || f == DCOP::clear || f == DCOP::setEditable || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || f == DCOP::isModified || (f >= FirstFunction && f <= LastFunction); } -QString TextEdit::handleDCOP(int function, const QStringList& args) +TQString TextEdit::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::text: @@ -160,7 +160,7 @@ QString TextEdit::handleDCOP(int function, const QStringList& args) insert(args[0]); break; case DCOP::clear: - setWidgetText(QString()); + setWidgetText(TQString()); break; case DCOP::setEditable: setReadOnly(args[0] == "false" || args[0] == "0"); @@ -170,7 +170,7 @@ QString TextEdit::handleDCOP(int function, const QStringList& args) break; case DCOP::setBackgroundColor: { - QColor color; + TQColor color; color.setNamedColor(args[0]); this->setPaletteBackgroundColor(color); break; @@ -182,47 +182,47 @@ QString TextEdit::handleDCOP(int function, const QStringList& args) this->setModified(args[0].toInt()); break; case TE_selectText: - QTextEdit::setSelection(args[0].toInt(), args[1].toInt(), args[2].toInt(), args[3].toInt()); + TQTextEdit::setSelection(args[0].toInt(), args[1].toInt(), args[2].toInt(), args[3].toInt()); break; case TE_length: - return QString::number(QTextEdit::length() ); + return TQString::number(TQTextEdit::length() ); break; /*case TE_getCursorPosition: - return QString::number(QTextEdit::getCursorPosition() ); + return TQString::number(TQTextEdit::getCursorPosition() ); break;*/ case TE_paragraphLength: - return QString::number(QTextEdit::paragraphLength(args[0].toInt() ) ); + return TQString::number(TQTextEdit::paragraphLength(args[0].toInt() ) ); break; case TE_linesOfParagraph: - return QString::number(QTextEdit::linesOfParagraph(args[0].toInt() ) ); + return TQString::number(TQTextEdit::linesOfParagraph(args[0].toInt() ) ); break; case TE_findText: { // int para = args[3].toInt(); // int idx = args[4].toInt(); -// return QString::number(QTextEdit::find(args[0], args[1].toUInt(), false, args[2].toUInt(), para, idx )); - return QString::number(QTextEdit::find(args[0], args[1].toUInt(), false )); +// return TQString::number(TQTextEdit::find(args[0], args[1].toUInt(), false, args[2].toUInt(), para, idx )); + return TQString::number(TQTextEdit::find(args[0], args[1].toUInt(), false )); break; } case TE_VAsuperScript: break; - QTextEdit::setVerticalAlignment(AlignSuperScript); + TQTextEdit::setVerticalAlignment(AlignSuperScript); case TE_VAnormalScript: - QTextEdit::setVerticalAlignment(AlignNormal); + TQTextEdit::setVerticalAlignment(AlignNormal); break; case DCOP::geometry: { - QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; break; } case DCOP::hasFocus: - return QString::number(this->hasFocus()); + return TQString::number(this->hasFocus()); break; default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } diff --git a/kommander/widgets/textedit.h b/kommander/widgets/textedit.h index 7f842343..4f118ffd 100644 --- a/kommander/widgets/textedit.h +++ b/kommander/widgets/textedit.h @@ -21,8 +21,8 @@ #include <ktextedit.h> /* QT INCLUDES */ -#include <qstringlist.h> -#include <qstring.h> +#include <tqstringlist.h> +#include <tqstring.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -31,40 +31,40 @@ class QShowEvent; class KOMMANDER_EXPORT TextEdit: public KTextEdit, public KommanderWidget { - Q_OBJECT Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_OBJECT Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - TextEdit(QWidget *, const char *); + TextEdit(TQWidget *, const char *); virtual ~TextEdit(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList &); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString &); + virtual void setAssociatedText(const TQStringList &); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString &); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: virtual void setTextChanged(); - virtual void setWidgetText(const QString &); + virtual void setWidgetText(const TQString &); virtual void populate(); signals: void widgetOpened(); - void widgetTextChanged(const QString&); + void widgetTextChanged(const TQString&); void contextMenuRequested(int xpos, int ypos); void lostFocus(); void gotFocus(); protected: - void showEvent(QShowEvent* e); - void contextMenuEvent( QContextMenuEvent * e ); - void focusOutEvent( QFocusEvent* e); - void focusInEvent( QFocusEvent* e); + void showEvent(TQShowEvent* e); + void contextMenuEvent( TQContextMenuEvent * e ); + void focusOutEvent( TQFocusEvent* e); + void focusInEvent( TQFocusEvent* e); }; #endif diff --git a/kommander/widgets/timer.cpp b/kommander/widgets/timer.cpp index 9aff1560..5a7251f1 100644 --- a/kommander/widgets/timer.cpp +++ b/kommander/widgets/timer.cpp @@ -13,9 +13,9 @@ * * ***************************************************************************/ /* QT INCLUDES */ -#include <qstringlist.h> -#include <qtimer.h> -#include <qwidget.h> +#include <tqstringlist.h> +#include <tqtimer.h> +#include <tqwidget.h> /* KDE INCLUDES */ #include <kglobal.h> @@ -37,30 +37,30 @@ enum Functions { LastFunction }; -Timer::Timer(QWidget *a_parent, const char *a_name) - : QLabel(a_parent, a_name), KommanderWidget(this) +Timer::Timer(TQWidget *a_parent, const char *a_name) + : TQLabel(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); if (KommanderWidget::inEditor) { setPixmap(KGlobal::iconLoader()->loadIcon("kalarm", KIcon::NoGroup, KIcon::SizeMedium)); - setFrameStyle(QFrame::Box | QFrame::Plain); + setFrameStyle(TQFrame::Box | TQFrame::Plain); setLineWidth(1); setFixedSize(pixmap()->size()); } else setHidden(true); - mTimer = new QTimer(this); + mTimer = new TQTimer(this); setInterval(5000); setSingleShot(false); - connect(mTimer, SIGNAL(timeout()), SLOT(timeout())); + connect(mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout())); KommanderPlugin::setDefaultGroup(Group::DCOP); - KommanderPlugin::registerFunction(SetInterval, "setInterval(QString widget, int interval)", i18n("Set the timer timeout interval in ms."), 2); + KommanderPlugin::registerFunction(SetInterval, "setInterval(TQString widget, int interval)", i18n("Set the timer timeout interval in ms."), 2); } Timer::~Timer() @@ -91,9 +91,9 @@ void Timer::setSingleShot(bool a_shot) mSingleShot = a_shot; } -QString Timer::currentState() const +TQString Timer::currentState() const { - return QString("default"); + return TQString("default"); } bool Timer::isKommanderWidget() const @@ -101,27 +101,27 @@ bool Timer::isKommanderWidget() const return true; } -QStringList Timer::associatedText() const +TQStringList Timer::associatedText() const { return KommanderWidget::associatedText(); } -void Timer::setAssociatedText(const QStringList& a_at) +void Timer::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void Timer::setWidgetText(const QString& a_text) +void Timer::setWidgetText(const TQString& a_text) { KommanderWidget::setAssociatedText(a_text); } -void Timer::setPopulationText(const QString& a_text) +void Timer::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString Timer::populationText() const +TQString Timer::populationText() const { return KommanderWidget::populationText(); } @@ -148,7 +148,7 @@ void Timer::timeout() void Timer::execute() { if (mSingleShot) - QTimer::singleShot(mInterval, this, SLOT(timeout())); + TQTimer::singleShot(mInterval, this, TQT_SLOT(timeout())); else mTimer->start(mInterval); } @@ -165,7 +165,7 @@ bool Timer::isFunctionSupported(int f) return f == DCOP::setText || f == DCOP::execute || f == DCOP::cancel || (f > FirstFunction && f < LastFunction); } -QString Timer::handleDCOP(int function, const QStringList& args) +TQString Timer::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::setText: @@ -183,7 +183,7 @@ QString Timer::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } #include "timer.moc" diff --git a/kommander/widgets/timer.h b/kommander/widgets/timer.h index 856ceeb3..8d200f2f 100644 --- a/kommander/widgets/timer.h +++ b/kommander/widgets/timer.h @@ -18,40 +18,40 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qlabel.h> +#include <tqlabel.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> class QTimer; -class KOMMANDER_EXPORT Timer : public QLabel, public KommanderWidget +class KOMMANDER_EXPORT Timer : public TQLabel, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) Q_PROPERTY(int interval READ interval WRITE setInterval) Q_PROPERTY(bool singleShot READ singleShot WRITE setSingleShot) public: - Timer(QWidget *a_parent, const char *a_name); + Timer(TQWidget *a_parent, const char *a_name); ~Timer(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); virtual int interval() const; virtual void setInterval(int a_interval); virtual bool singleShot() const; virtual void setSingleShot(bool a_shot); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: - virtual void setWidgetText(const QString &); + virtual void setWidgetText(const TQString &); virtual void populate(); virtual void execute(); virtual void cancel(); @@ -62,7 +62,7 @@ class KOMMANDER_EXPORT Timer : public QLabel, public KommanderWidget protected: virtual void executeProcess(bool blocking); - QTimer* mTimer; + TQTimer* mTimer; int mInterval; bool mSingleShot; diff --git a/kommander/widgets/toolbox.cpp b/kommander/widgets/toolbox.cpp index 90a31e46..a6340098 100644 --- a/kommander/widgets/toolbox.cpp +++ b/kommander/widgets/toolbox.cpp @@ -27,27 +27,27 @@ #define FIRST_FUNCTION ADDWIDGET #define LAST_FUNCTION INDEXOF -ToolBox::ToolBox(QWidget *parent, const char *name) - : QToolBox(parent, name), KommanderWidget(this) +ToolBox::ToolBox(TQWidget *parent, const char *name) + : TQToolBox(parent, name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); KommanderPlugin::setDefaultGroup(Group::DCOP); - KommanderPlugin::registerFunction(ADDWIDGET, "addWidget(QString widget, QString widgetName, QString Label)", + KommanderPlugin::registerFunction(ADDWIDGET, "addWidget(TQString widget, TQString widgetName, TQString Label)", i18n("Adds a widget to the toolbox. Returns the index of the widget."), 3); - KommanderPlugin::registerFunction(CURRENTWIDGET, "currentWidget(QString widget)", + KommanderPlugin::registerFunction(CURRENTWIDGET, "currentWidget(TQString widget)", i18n("Returns the name of the active widget."), 1); - KommanderPlugin::registerFunction(REMOVEWIDGET, "removeWidget(QString widget, QString widgetName)", i18n("Remove the selected widget, returns the index of the removed widget or -1 if no such widget was found."), 2); - KommanderPlugin::registerFunction(REMOVEWIDGETAT, "removeWidgetAt(QString widget, int index)", i18n("Remove the widget from the index position, returns the index of the removed widget or -1 if no widget was found."), 2); - KommanderPlugin::registerFunction(SETCURRENTWIDGET, "setCurrentWidget(QString widget, QString widgetName)", + KommanderPlugin::registerFunction(REMOVEWIDGET, "removeWidget(TQString widget, TQString widgetName)", i18n("Remove the selected widget, returns the index of the removed widget or -1 if no such widget was found."), 2); + KommanderPlugin::registerFunction(REMOVEWIDGETAT, "removeWidgetAt(TQString widget, int index)", i18n("Remove the widget from the index position, returns the index of the removed widget or -1 if no widget was found."), 2); + KommanderPlugin::registerFunction(SETCURRENTWIDGET, "setCurrentWidget(TQString widget, TQString widgetName)", i18n("Activates the selected widget."), 2); - KommanderPlugin::registerFunction(CURRENTINDEX, "currentIndex(QString widget)", + KommanderPlugin::registerFunction(CURRENTINDEX, "currentIndex(TQString widget)", i18n("Returns the index of the active widget."), 1); - KommanderPlugin::registerFunction(WIDGETAT, "widgetAt(QString widget, int index)", + KommanderPlugin::registerFunction(WIDGETAT, "widgetAt(TQString widget, int index)", i18n("Returns the widget having the supplied index."), 2); - KommanderPlugin::registerFunction(INDEXOF, "indexOf(QString widget, QString widgetName)", + KommanderPlugin::registerFunction(INDEXOF, "indexOf(TQString widget, TQString widgetName)", i18n("Returns the index of the widget, -1 if the widget is not part of the toolbox."), 2); } @@ -57,9 +57,9 @@ ToolBox::~ToolBox() { } -QString ToolBox::currentState() const +TQString ToolBox::currentState() const { - return QString("default"); + return TQString("default"); } bool ToolBox::isKommanderWidget() const @@ -72,50 +72,50 @@ void ToolBox::populate() setAssociatedText(KommanderWidget::evalAssociatedText( populationText())); } -QStringList ToolBox::associatedText() const +TQStringList ToolBox::associatedText() const { return KommanderWidget::associatedText(); } -void ToolBox::setAssociatedText(const QStringList& a_at) +void ToolBox::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void ToolBox::setPopulationText(const QString& a_text) +void ToolBox::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString ToolBox::populationText() const +TQString ToolBox::populationText() const { return KommanderWidget::populationText(); } -QString ToolBox::addWidget(const QString& widgetName, const QString &label) +TQString ToolBox::addWidget(const TQString& widgetName, const TQString &label) { KommanderWidget *w = widgetByName(widgetName); if (w) { - int idx = addItem(dynamic_cast<QWidget*>(w), label); + int idx = addItem(dynamic_cast<TQWidget*>(w), label); adjustSize(); - return QString::number(idx); + return TQString::number(idx); } else - return QString("-1"); + return TQString("-1"); } -void ToolBox::showEvent(QShowEvent* e) +void ToolBox::showEvent(TQShowEvent* e) { - QToolBox::showEvent(e); + TQToolBox::showEvent(e); emit widgetOpened(); } -void ToolBox::contextMenuEvent( QContextMenuEvent * e ) +void ToolBox::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } @@ -124,7 +124,7 @@ bool ToolBox::isFunctionSupported(int f) return f == DCOP::count || f == DCOP::geometry || (f >= FIRST_FUNCTION && f <= LAST_FUNCTION) ; } -QString ToolBox::handleDCOP(int function, const QStringList& args) +TQString ToolBox::handleDCOP(int function, const TQStringList& args) { switch (function) { case ADDWIDGET: @@ -132,59 +132,59 @@ QString ToolBox::handleDCOP(int function, const QStringList& args) break; case CURRENTWIDGET: { - QWidget *w = currentItem(); + TQWidget *w = currentItem(); if (w) return w->name(); else - return QString(); + return TQString(); break; } case SETCURRENTWIDGET: { KommanderWidget *w = widgetByName(args[0]); - setCurrentItem(dynamic_cast<QWidget*>(w)); - return QString(); + setCurrentItem(dynamic_cast<TQWidget*>(w)); + return TQString(); } case REMOVEWIDGET: { KommanderWidget *w = widgetByName(args[0]); - return QString::number(removeItem(dynamic_cast<QWidget*>(w))); + return TQString::number(removeItem(dynamic_cast<TQWidget*>(w))); } case REMOVEWIDGETAT: { - QWidget *w = item(args[0].toInt()); - return QString::number(removeItem(w)); + TQWidget *w = item(args[0].toInt()); + return TQString::number(removeItem(w)); } case CURRENTINDEX: { - return QString::number(currentIndex()); + return TQString::number(currentIndex()); break; } case WIDGETAT: { - QWidget *w = item(args[0].toInt()); + TQWidget *w = item(args[0].toInt()); if (w) return w->name(); else - return QString(); + return TQString(); break; } case INDEXOF: { KommanderWidget *w = widgetByName(args[0]); - return QString::number(indexOf(dynamic_cast<QWidget*>(w))); + return TQString::number(indexOf(dynamic_cast<TQWidget*>(w))); } case DCOP::count: - return QString::number(count()); + return TQString::number(count()); case DCOP::geometry: { - QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; break; } default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } #include "toolbox.moc" diff --git a/kommander/widgets/toolbox.h b/kommander/widgets/toolbox.h index 9171aa32..12761df0 100644 --- a/kommander/widgets/toolbox.h +++ b/kommander/widgets/toolbox.h @@ -12,31 +12,31 @@ #ifndef TOOLBOX_H #define TOOLBOX_H -#include <qtoolbox.h> +#include <tqtoolbox.h> #include <kommanderwidget.h> /** @author Andras Mantia <amantia@kdewebdev.org> */ -class ToolBox : public QToolBox, public KommanderWidget +class ToolBox : public TQToolBox, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) public: - ToolBox(QWidget *parent = 0, const char *name = 0); + ToolBox(TQWidget *parent = 0, const char *name = 0); ~ToolBox(); virtual bool isKommanderWidget() const; - virtual QString currentState() const; + virtual TQString currentState() const; virtual bool isFunctionSupported(int function); - virtual QString handleDCOP(int function, const QStringList& args); - virtual QStringList associatedText() const; - virtual void setAssociatedText(const QStringList&); - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual TQString handleDCOP(int function, const TQStringList& args); + virtual TQStringList associatedText() const; + virtual void setAssociatedText(const TQStringList&); + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); public slots: virtual void populate(); @@ -45,9 +45,9 @@ signals: void widgetOpened(); void contextMenuRequested(int xpos, int ypos); protected: - void showEvent(QShowEvent *e); - void contextMenuEvent( QContextMenuEvent * e ); - QString addWidget(const QString& widgetName, const QString &label); + void showEvent(TQShowEvent *e); + void contextMenuEvent( TQContextMenuEvent * e ); + TQString addWidget(const TQString& widgetName, const TQString &label); }; diff --git a/kommander/widgets/treewidget.cpp b/kommander/widgets/treewidget.cpp index 578384c5..ef3b7e65 100644 --- a/kommander/widgets/treewidget.cpp +++ b/kommander/widgets/treewidget.cpp @@ -23,11 +23,11 @@ #include <klistview.h> /* QT INCLUDES */ -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qlistview.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> +#include <tqevent.h> +#include <tqlistview.h> /* OTHER INCLUDES */ #include <specials.h> @@ -54,52 +54,52 @@ enum Functions { LastFunction }; -TreeWidget::TreeWidget(QWidget *a_parent, const char *a_name) +TreeWidget::TreeWidget(TQWidget *a_parent, const char *a_name) : KListView(a_parent, a_name), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; setStates(states); setDisplayStates(states); setPathSeparator("/"); KommanderPlugin::setDefaultGroup(Group::DCOP); - KommanderPlugin::registerFunction(SelectedIndexes, "selectedIndexes(QString widget)", "", 1); - KommanderPlugin::registerFunction(addColumnTree, "addColumn(QString widget, const QString & label, int width = -1 )", i18n("Add column at end with column header"), 2, 3); - KommanderPlugin::registerFunction(setSortCol, "setSortColumn(QString widget, int column, bool ascending=true)", i18n("Set sorting for a column"), 2, 3); - //KommanderPlugin::registerFunction(setAltBackground, "setAltBackground(QString widget, const QColor & c)", i18n("Alternate colors in list view"), 2); -// KommanderPlugin::registerFunction(colCount, "colCount(QString widget)", i18n("Get the column count"), 1); - KommanderPlugin::registerFunction(colCaption, "columnCaption(QString widget, int column)", i18n("Get the column caption for column index"), 2); - KommanderPlugin::registerFunction(setColWidth, "setColWidth(QString widget, int column, int width)", i18n("Set the pixel width for column index - use 0 to hide"), 3); - KommanderPlugin::registerFunction(setColAlignment, "setColumnAlignment(QString widget, int column, QString Alignment)", i18n("Set to <i>left</i>, <i>right</i> or <i>center</i>, case insensitive "), 3); - KommanderPlugin::registerFunction(TW_childCount, "childCount(QString widget)", i18n("Get the count of top level items."), 1); - KommanderPlugin::registerFunction(TW_setOpen, "setOpen(QString widget, int Index, bool Open)", i18n("Expand or collapse a node."), 3); - KommanderPlugin::registerFunction(TW_isOpen, "isOpen(QString widget, int Index)", i18n("See if node is open or closed."), 2); + KommanderPlugin::registerFunction(SelectedIndexes, "selectedIndexes(TQString widget)", "", 1); + KommanderPlugin::registerFunction(addColumnTree, "addColumn(TQString widget, const TQString & label, int width = -1 )", i18n("Add column at end with column header"), 2, 3); + KommanderPlugin::registerFunction(setSortCol, "setSortColumn(TQString widget, int column, bool ascending=true)", i18n("Set sorting for a column"), 2, 3); + //KommanderPlugin::registerFunction(setAltBackground, "setAltBackground(TQString widget, const TQColor & c)", i18n("Alternate colors in list view"), 2); +// KommanderPlugin::registerFunction(colCount, "colCount(TQString widget)", i18n("Get the column count"), 1); + KommanderPlugin::registerFunction(colCaption, "columnCaption(TQString widget, int column)", i18n("Get the column caption for column index"), 2); + KommanderPlugin::registerFunction(setColWidth, "setColWidth(TQString widget, int column, int width)", i18n("Set the pixel width for column index - use 0 to hide"), 3); + KommanderPlugin::registerFunction(setColAlignment, "setColumnAlignment(TQString widget, int column, TQString Alignment)", i18n("Set to <i>left</i>, <i>right</i> or <i>center</i>, case insensitive "), 3); + KommanderPlugin::registerFunction(TW_childCount, "childCount(TQString widget)", i18n("Get the count of top level items."), 1); + KommanderPlugin::registerFunction(TW_setOpen, "setOpen(TQString widget, int Index, bool Open)", i18n("Expand or collapse a node."), 3); + KommanderPlugin::registerFunction(TW_isOpen, "isOpen(TQString widget, int Index)", i18n("See if node is open or closed."), 2); } TreeWidget::~TreeWidget() { } -QString TreeWidget::pathSeparator() const +TQString TreeWidget::pathSeparator() const { return m_pathSeparator; } -void TreeWidget::setPathSeparator(const QString& a_pathSep) +void TreeWidget::setPathSeparator(const TQString& a_pathSep) { m_pathSeparator = a_pathSep; } -void TreeWidget::addItemFromString(const QString& s) +void TreeWidget::addItemFromString(const TQString& s) { - QStringList elements = QStringList::split(m_pathSeparator, s, true); + TQStringList elements = TQStringList::split(m_pathSeparator, s, true); if (elements.count() > 1) setRootIsDecorated(true); - QListViewItem* parent = 0; + TQListViewItem* parent = 0; if (m_lastPath.size() < elements.count()) m_lastPath.resize(elements.count()); uint i = 0; - for (QStringList::ConstIterator it = elements.begin(); it != elements.end(); ++it) + for (TQStringList::ConstIterator it = elements.begin(); it != elements.end(); ++it) { if (m_lastPath[i] && m_lastPath[i]->text(0) == elements[i]) { @@ -109,7 +109,7 @@ void TreeWidget::addItemFromString(const QString& s) } else { - QListViewItem* item = (i>0) ? parent->firstChild() : firstChild(); + TQListViewItem* item = (i>0) ? parent->firstChild() : firstChild(); while (item) { if (item->text(0) == *it) @@ -126,32 +126,32 @@ void TreeWidget::addItemFromString(const QString& s) } } -QListViewItem* TreeWidget::itemFromString(QListViewItem* parent, const QString& s) +TQListViewItem* TreeWidget::itemFromString(TQListViewItem* parent, const TQString& s) { - QStringList elements; + TQStringList elements; if (s.contains("\t")) - elements = QStringList::split("\t", s, true); + elements = TQStringList::split("\t", s, true); else - elements = QStringList::split("\\t", s, true); + elements = TQStringList::split("\\t", s, true); int cols = elements.count(); if (cols >= columns()) cols = columns(); - QListViewItem* item; + TQListViewItem* item; if (parent) - item = new QListViewItem(parent); + item = new TQListViewItem(parent); else - item = new QListViewItem(this); + item = new TQListViewItem(this); int i = 0; - for (QStringList::ConstIterator it = elements.constBegin(); it != elements.constEnd(); ++it) + for (TQStringList::ConstIterator it = elements.constBegin(); it != elements.constEnd(); ++it) item->setText(i++, *it); return item; } -int TreeWidget::itemToIndex(QListViewItem* item) +int TreeWidget::itemToIndex(TQListViewItem* item) { // if (!item->isSelected()) // return -1; - QListViewItemIterator it(this); + TQListViewItemIterator it(this); int index = 0; while (it.current()) { if (it.current() == item) @@ -162,9 +162,9 @@ int TreeWidget::itemToIndex(QListViewItem* item) return -1; } -int TreeWidget::itemToIndexSafe(QListViewItem* item) +int TreeWidget::itemToIndexSafe(TQListViewItem* item) { - QListViewItemIterator it(this); + TQListViewItemIterator it(this); int index = 0; while (it.current()) { if (it.current() == item) @@ -175,9 +175,9 @@ int TreeWidget::itemToIndexSafe(QListViewItem* item) return -1; } -QListViewItem* TreeWidget::indexToItem(int item) +TQListViewItem* TreeWidget::indexToItem(int item) { - QListViewItemIterator it(this); + TQListViewItemIterator it(this); int index = 0; while (it.current()) { if (index == item) @@ -188,41 +188,41 @@ QListViewItem* TreeWidget::indexToItem(int item) return 0; } -QString TreeWidget::itemText(QListViewItem* item) const +TQString TreeWidget::itemText(TQListViewItem* item) const { if (!item) - return QString(); - QStringList items; + return TQString(); + TQStringList items; for (int i=0; i<columns(); i++) items.append(item->text(i)); return items.join("\t"); } -QString TreeWidget::itemsText() +TQString TreeWidget::itemsText() { - QStringList items; - QListViewItemIterator it(this); + TQStringList items; + TQListViewItemIterator it(this); while (it.current()) { - QString path = itemPath(it.current()); + TQString path = itemPath(it.current()); if (path.isEmpty()) items.append(itemText(it.current())); else - items.append(QString("%1%2%3").arg(path).arg(m_pathSeparator) + items.append(TQString("%1%2%3").arg(path).arg(m_pathSeparator) .arg(itemText(it.current()))); ++it; } return items.join("\n"); } -QString TreeWidget::itemPath(QListViewItem* item) const +TQString TreeWidget::itemPath(TQListViewItem* item) const { if (!item) - return QString(); + return TQString(); item = item->parent(); if (!item) - return QString(); - QStringList path; + return TQString(); + TQStringList path; while (item) { path.prepend(item->text(0)); @@ -231,9 +231,9 @@ QString TreeWidget::itemPath(QListViewItem* item) const return path.join(m_pathSeparator); } -QString TreeWidget::currentState() const +TQString TreeWidget::currentState() const { - return QString("default"); + return TQString("default"); } bool TreeWidget::isKommanderWidget() const @@ -241,29 +241,29 @@ bool TreeWidget::isKommanderWidget() const return true; } -void TreeWidget::setCurrentItem(QListViewItem* item) +void TreeWidget::setCurrentItem(TQListViewItem* item) { KListView::setCurrentItem(item); setSelected(item, true); ensureItemVisible(item); } -QStringList TreeWidget::associatedText() const +TQStringList TreeWidget::associatedText() const { return KommanderWidget::associatedText(); } -void TreeWidget::setAssociatedText(const QStringList& a_at) +void TreeWidget::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void TreeWidget::setPopulationText(const QString& a_text) +void TreeWidget::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText( a_text ); } -QString TreeWidget::populationText() const +TQString TreeWidget::populationText() const { return KommanderWidget::populationText(); } @@ -273,26 +273,26 @@ void TreeWidget::populate() setWidgetText(KommanderWidget::evalAssociatedText( populationText())); } -void TreeWidget::setWidgetText(const QString &a_text) +void TreeWidget::setWidgetText(const TQString &a_text) { handleDCOP(DCOP::setText, a_text); emit widgetTextChanged(a_text); } -void TreeWidget::showEvent(QShowEvent* e) +void TreeWidget::showEvent(TQShowEvent* e) { - QListView::showEvent( e ); + TQListView::showEvent( e ); emit widgetOpened(); } -void TreeWidget::contextMenuEvent( QContextMenuEvent * e ) +void TreeWidget::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } -void TreeWidget::setColAlign(int column, const QString& align) +void TreeWidget::setColAlign(int column, const TQString& align) { if (align.lower() == "left") setColumnAlignment (column, Qt::AlignLeft); @@ -310,7 +310,7 @@ bool TreeWidget::isFunctionSupported(int f) f == DCOP::itemPath || f == DCOP::itemDepth || f == DCOP::setPixmap || f == DCOP::setColumnCaption || f == DCOP::removeColumn || f == DCOP::columnCount || f == DCOP::geometry || f == DCOP::hasFocus || f == DCOP::getBackgroundColor || f == DCOP::setBackgroundColor || (f > FirstFunction && f < LastFunction) || (f >= TW_FUNCTION && f <= TW_LAST_FUNCTION); } -QString TreeWidget::handleDCOP(int function, const QStringList& args) +TQString TreeWidget::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::insertItem: @@ -323,8 +323,8 @@ QString TreeWidget::handleDCOP(int function, const QStringList& args) m_lastPath.clear(); case DCOP::insertItems: { - QStringList items(QStringList::split("\n", args[0], true)); - for (QStringList::ConstIterator it = items.constBegin(); it != items.constEnd(); ++it) + TQStringList items(TQStringList::split("\n", args[0], true)); + for (TQStringList::ConstIterator it = items.constBegin(); it != items.constEnd(); ++it) addItemFromString(*it); break; } @@ -332,17 +332,17 @@ QString TreeWidget::handleDCOP(int function, const QStringList& args) setOpen(indexToItem(args[0].toInt()), args[1].toInt()); break; case TW_isOpen: - return QString::number(isOpen(indexToItem(args[0].toInt()))); + return TQString::number(isOpen(indexToItem(args[0].toInt()))); break; case SelectedIndexes: { - QString selection = ""; - QListViewItemIterator it(this); + TQString selection = ""; + TQListViewItemIterator it(this); while (it.current()) { if (it.current()->isSelected()) { - selection.append(QString("%1\n").arg(itemToIndexSafe(it.current()))); + selection.append(TQString("%1\n").arg(itemToIndexSafe(it.current()))); } ++it; } @@ -353,8 +353,8 @@ QString TreeWidget::handleDCOP(int function, const QStringList& args) } case DCOP::selection: { - QString selection = ""; - QListViewItemIterator it(this); + TQString selection = ""; + TQListViewItemIterator it(this); while (it.current()) { if (it.current()->isSelected()) @@ -372,10 +372,10 @@ QString TreeWidget::handleDCOP(int function, const QStringList& args) else { clearSelection(); - QStringList items(QStringList::split("\n", args[0])); - for (QStringList::ConstIterator it = items.begin(); it != items.end(); ++it) + TQStringList items(TQStringList::split("\n", args[0])); + for (TQStringList::ConstIterator it = items.begin(); it != items.end(); ++it) { - QListViewItem* item = findItem(*it, 0); + TQListViewItem* item = findItem(*it, 0); if (item) { item->setSelected(true); @@ -398,24 +398,24 @@ QString TreeWidget::handleDCOP(int function, const QStringList& args) break; } case DCOP::currentItem: - return QString::number(itemToIndexSafe(currentItem())); + return TQString::number(itemToIndexSafe(currentItem())); break; case DCOP::setCurrentItem: setCurrentItem(indexToItem(args[0].toInt())); break; case DCOP::findItem: if (!args[1]) - return QString::number(itemToIndexSafe(findItem(args[0], 0))); + return TQString::number(itemToIndexSafe(findItem(args[0], 0))); else { if (args[2].toUInt() && args[3].toUInt()) - return QString::number(itemToIndexSafe(findItem(args[0], args[1].toInt()))); + return TQString::number(itemToIndexSafe(findItem(args[0], args[1].toInt()))); else if (args[2].toUInt()) - return QString::number(itemToIndexSafe(findItem(args[0], args[1].toInt(), Qt::CaseSensitive | Qt::Contains))); + return TQString::number(itemToIndexSafe(findItem(args[0], args[1].toInt(), Qt::CaseSensitive | Qt::Contains))); else if (args[3].toUInt()) - return QString::number(itemToIndexSafe(findItem(args[0], args[1].toInt(), Qt::ExactMatch))); + return TQString::number(itemToIndexSafe(findItem(args[0], args[1].toInt(), Qt::ExactMatch))); else - return QString::number(itemToIndexSafe(findItem(args[0], args[1].toInt(), Qt::Contains))); + return TQString::number(itemToIndexSafe(findItem(args[0], args[1].toInt(), Qt::Contains))); } break; case DCOP::item: @@ -426,18 +426,18 @@ QString TreeWidget::handleDCOP(int function, const QStringList& args) break; case DCOP::itemDepth: { - QListViewItem* item = indexToItem(args[0].toInt()); - return (item) ? QString::number(item->depth()) : QString::number(-1); + TQListViewItem* item = indexToItem(args[0].toInt()); + return (item) ? TQString::number(item->depth()) : TQString::number(-1); } case DCOP::setPixmap: { - QPixmap pixmap = KGlobal::iconLoader()->loadIcon(args[0], KIcon::Small); + TQPixmap pixmap = KGlobal::iconLoader()->loadIcon(args[0], KIcon::Small); if (args[1].toInt() == -1) - for (QListViewItemIterator it(this); it.current(); ++it) + for (TQListViewItemIterator it(this); it.current(); ++it) it.current()->setPixmap(0, pixmap); else { - QListViewItem* item = indexToItem(args[1].toInt()); + TQListViewItem* item = indexToItem(args[1].toInt()); if (item) item->setPixmap(0, pixmap); } @@ -452,31 +452,31 @@ QString TreeWidget::handleDCOP(int function, const QStringList& args) break; case DCOP::setBackgroundColor: { - QColor color; + TQColor color; color.setNamedColor(args[0]); this->setPaletteBackgroundColor(color); break; } case addColumnTree: - return QString::number(KListView::addColumn(args[0], args[1].toInt())); + return TQString::number(KListView::addColumn(args[0], args[1].toInt())); break; case setSortCol: KListView::setSorting(args[0].toInt(), args[1].toInt()); break; case DCOP::columnCount: - return QString::number(QListView::columns() ); + return TQString::number(TQListView::columns() ); break; case colCaption: - return QListView::columnText(args[0].toInt()) ; + return TQListView::columnText(args[0].toInt()) ; break; case setColWidth: - QListView::setColumnWidth(args[0].toInt(), args[1].toInt()); + TQListView::setColumnWidth(args[0].toInt(), args[1].toInt()); break; case setColAlignment: setColAlign(args[0].toInt(), args[1]); break; case setAltBackground: - KListView::setAlternateBackground(QColor(args[0])); + KListView::setAlternateBackground(TQColor(args[0])); break; case DCOP::removeColumn: { @@ -492,21 +492,21 @@ QString TreeWidget::handleDCOP(int function, const QStringList& args) break; } case TW_childCount: - return QString::number(childCount()); + return TQString::number(childCount()); break; case DCOP::geometry: { - QString geo = QString::number(this->x())+" "+QString::number(this->y())+" "+QString::number(this->width())+" "+QString::number(this->height()); + TQString geo = TQString::number(this->x())+" "+TQString::number(this->y())+" "+TQString::number(this->width())+" "+TQString::number(this->height()); return geo; break; } case DCOP::hasFocus: - return QString::number(this->hasFocus()); + return TQString::number(this->hasFocus()); break; default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } #include "treewidget.moc" diff --git a/kommander/widgets/treewidget.h b/kommander/widgets/treewidget.h index 29d0a747..28da108e 100644 --- a/kommander/widgets/treewidget.h +++ b/kommander/widgets/treewidget.h @@ -21,9 +21,9 @@ #include <klistview.h> /* QT INCLUDES */ -#include <qstring.h> -#include <qstringlist.h> -#include <qptrvector.h> +#include <tqstring.h> +#include <tqstringlist.h> +#include <tqptrvector.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -36,52 +36,52 @@ class KOMMANDER_EXPORT TreeWidget : public KListView, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) - Q_PROPERTY(QString pathSeparator READ pathSeparator WRITE setPathSeparator) + Q_PROPERTY(TQString pathSeparator READ pathSeparator WRITE setPathSeparator) public: - TreeWidget(QWidget *a_parent, const char *a_name); + TreeWidget(TQWidget *a_parent, const char *a_name); ~TreeWidget(); - virtual void setCurrentItem(QListViewItem* item); - QString pathSeparator() const; - void setPathSeparator(const QString& a_pathSep); + virtual void setCurrentItem(TQListViewItem* item); + TQString pathSeparator() const; + void setPathSeparator(const TQString& a_pathSep); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); virtual bool isFunctionSupported(int function); public slots: - virtual void setWidgetText(const QString&); + virtual void setWidgetText(const TQString&); virtual void populate(); signals: void widgetOpened(); - void widgetTextChanged(const QString&); + void widgetTextChanged(const TQString&); void contextMenuRequested(int xpos, int ypos); protected: - void showEvent(QShowEvent *e); - void contextMenuEvent( QContextMenuEvent * e ); - int itemToIndex(QListViewItem* item); - int itemToIndexSafe(QListViewItem* item); - QString itemText(QListViewItem* item) const; - QString itemsText(); - QListViewItem* indexToItem(int index); - QString itemPath(QListViewItem* item) const; + void showEvent(TQShowEvent *e); + void contextMenuEvent( TQContextMenuEvent * e ); + int itemToIndex(TQListViewItem* item); + int itemToIndexSafe(TQListViewItem* item); + TQString itemText(TQListViewItem* item) const; + TQString itemsText(); + TQListViewItem* indexToItem(int index); + TQString itemPath(TQListViewItem* item) const; private: - void addItemFromString(const QString& s); - QListViewItem* itemFromString(QListViewItem* parent, const QString& s); - QPtrVector<QListViewItem> m_lastPath; - QString m_pathSeparator; - int addColumnTree(const QString & label, int width = -1 ); + void addItemFromString(const TQString& s); + TQListViewItem* itemFromString(TQListViewItem* parent, const TQString& s); + TQPtrVector<TQListViewItem> m_lastPath; + TQString m_pathSeparator; + int addColumnTree(const TQString & label, int width = -1 ); void setSortCol(int column, bool ascending=true); - void setAltBackground(const QColor & c); - void setColAlign(int column, const QString& align); + void setAltBackground(const TQColor & c); + void setColAlign(int column, const TQString& align); }; #endif diff --git a/kommander/widgets/wizard.cpp b/kommander/widgets/wizard.cpp index 7e6a07b4..8cc16933 100644 --- a/kommander/widgets/wizard.cpp +++ b/kommander/widgets/wizard.cpp @@ -17,12 +17,12 @@ #include <kprocess.h> /* QT INCLUDES */ -#include <qstring.h> -#include <qwidget.h> -#include <qstringlist.h> -#include <qevent.h> -#include <qwizard.h> -#include <qdialog.h> +#include <tqstring.h> +#include <tqwidget.h> +#include <tqstringlist.h> +#include <tqevent.h> +#include <tqwizard.h> +#include <tqdialog.h> /* OTHER INCLUDES */ #include <myprocess.h> @@ -31,17 +31,17 @@ #include "wizard.h" -Wizard::Wizard(QWidget *a_parent, const char *a_name, bool a_modal, int a_flags) - : QWizard(a_parent, a_name, a_modal, a_flags), KommanderWidget(this) +Wizard::Wizard(TQWidget *a_parent, const char *a_name, bool a_modal, int a_flags) + : TQWizard(a_parent, a_name, a_modal, a_flags), KommanderWidget(this) { - QStringList states; + TQStringList states; states << "default"; states << "initialization"; states << "destroy"; setStates(states); setDisplayStates(states); - connect(this, SIGNAL(helpClicked()), SLOT(runHelp())); + connect(this, TQT_SIGNAL(helpClicked()), TQT_SLOT(runHelp())); } Wizard::~Wizard() @@ -50,9 +50,9 @@ Wizard::~Wizard() destroy(); } -QString Wizard::currentState() const +TQString Wizard::currentState() const { - return QString("default"); + return TQString("default"); } bool Wizard::isKommanderWidget() const @@ -60,33 +60,33 @@ bool Wizard::isKommanderWidget() const return true; } -QStringList Wizard::associatedText() const +TQStringList Wizard::associatedText() const { return KommanderWidget::associatedText(); } -void Wizard::setAssociatedText(const QStringList& a_at) +void Wizard::setAssociatedText(const TQStringList& a_at) { KommanderWidget::setAssociatedText(a_at); } -void Wizard::setPopulationText(const QString& a_text) +void Wizard::setPopulationText(const TQString& a_text) { KommanderWidget::setPopulationText(a_text); } -QString Wizard::populationText() const +TQString Wizard::populationText() const { return KommanderWidget::populationText(); } void Wizard::populate() { - QString txt = KommanderWidget::evalAssociatedText(populationText()); + TQString txt = KommanderWidget::evalAssociatedText(populationText()); //FIXME: implement me } -void Wizard::setWidgetText(const QString &a_text) +void Wizard::setWidgetText(const TQString &a_text) { setCaption(a_text); emit widgetTextChanged(a_text); @@ -95,7 +95,7 @@ void Wizard::setWidgetText(const QString &a_text) void Wizard::initialize() { setFinishEnabled(page(pageCount() - 1), true); - const QStringList assoc = associatedText(); + const TQStringList assoc = associatedText(); if (assoc.count() > 1 && !assoc[1].isEmpty()) { MyProcess proc(this); @@ -105,7 +105,7 @@ void Wizard::initialize() void Wizard::destroy() { - const QStringList assoc = associatedText(); + const TQStringList assoc = associatedText(); if (assoc.count() > 2 && !assoc[2].isEmpty()) { MyProcess proc(this); @@ -115,13 +115,13 @@ void Wizard::destroy() void Wizard::exec() { - QWizard::exec(); + TQWizard::exec(); emit finished(); } void Wizard::show() { - QWizard::show(); + TQWizard::show(); if (!inEditor) initialize(); } @@ -137,7 +137,7 @@ void Wizard::runHelp() else if (helpAction() == Dialog) { KommanderFactory::loadPlugins(); - QDialog *dialog = (QDialog *)KommanderFactory::create(helpActionText()); + TQDialog *dialog = (TQDialog *)KommanderFactory::create(helpActionText()); dialog->exec(); delete dialog; } @@ -153,31 +153,31 @@ void Wizard::setHelpAction(HelpAction a_helpAction) m_helpAction = a_helpAction; } -QString Wizard::helpActionText() const +TQString Wizard::helpActionText() const { return m_helpActionText; } -void Wizard::setHelpActionText(const QString& a_helpActionText) +void Wizard::setHelpActionText(const TQString& a_helpActionText) { m_helpActionText = a_helpActionText; } -void Wizard::showEvent(QShowEvent *e) +void Wizard::showEvent(TQShowEvent *e) { - QWizard::showEvent(e); + TQWizard::showEvent(e); emit widgetOpened(); } -void Wizard::contextMenuEvent( QContextMenuEvent * e ) +void Wizard::contextMenuEvent( TQContextMenuEvent * e ) { e->accept(); - QPoint p = e->globalPos(); + TQPoint p = e->globalPos(); emit contextMenuRequested(p.x(), p.y()); } -QString Wizard::handleDCOP(int function, const QStringList& args) +TQString Wizard::handleDCOP(int function, const TQStringList& args) { switch (function) { case DCOP::setEnabled: @@ -186,7 +186,7 @@ QString Wizard::handleDCOP(int function, const QStringList& args) default: return KommanderWidget::handleDCOP(function, args); } - return QString(); + return TQString(); } diff --git a/kommander/widgets/wizard.h b/kommander/widgets/wizard.h index 868a14bc..131c6dd6 100644 --- a/kommander/widgets/wizard.h +++ b/kommander/widgets/wizard.h @@ -19,7 +19,7 @@ /* KDE INCLUDES */ /* QT INCLUDES */ -#include <qwizard.h> +#include <tqwizard.h> /* OTHER INCLUDES */ #include <kommanderwidget.h> @@ -27,37 +27,37 @@ #include <myprocess.h> class QShowEvent; -class KOMMANDER_EXPORT Wizard : public QWizard, public KommanderWidget +class KOMMANDER_EXPORT Wizard : public TQWizard, public KommanderWidget { Q_OBJECT - Q_PROPERTY(QString populationText READ populationText WRITE setPopulationText DESIGNABLE false) - Q_PROPERTY(QStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) + Q_PROPERTY(TQString populationText READ populationText WRITE setPopulationText DESIGNABLE false) + Q_PROPERTY(TQStringList associations READ associatedText WRITE setAssociatedText DESIGNABLE false) Q_PROPERTY(bool KommanderWidget READ isKommanderWidget) Q_PROPERTY(HelpAction helpAction READ helpAction WRITE setHelpAction) Q_ENUMS(HelpAction) - Q_PROPERTY(QString helpActionText READ helpActionText WRITE setHelpActionText) + Q_PROPERTY(TQString helpActionText READ helpActionText WRITE setHelpActionText) public: - Wizard(QWidget *, const char *, bool = true, int = 0); + Wizard(TQWidget *, const char *, bool = true, int = 0); ~Wizard(); virtual bool isKommanderWidget() const; - virtual void setAssociatedText(const QStringList&); - virtual QStringList associatedText() const; - virtual QString currentState() const; - virtual QString populationText() const; - virtual void setPopulationText(const QString&); + virtual void setAssociatedText(const TQStringList&); + virtual TQStringList associatedText() const; + virtual TQString currentState() const; + virtual TQString populationText() const; + virtual void setPopulationText(const TQString&); - virtual QString handleDCOP(int function, const QStringList& args); + virtual TQString handleDCOP(int function, const TQStringList& args); enum HelpAction { None, Command, Dialog }; HelpAction helpAction() const; void setHelpAction(HelpAction); - QString helpActionText() const; - void setHelpActionText(const QString&); + TQString helpActionText() const; + void setHelpActionText(const TQString&); public slots: - virtual void setWidgetText(const QString &); + virtual void setWidgetText(const TQString &); virtual void exec(); virtual void show(); virtual void runHelp(); @@ -68,15 +68,15 @@ protected slots: signals: void widgetOpened(); - void widgetTextChanged(const QString &); + void widgetTextChanged(const TQString &); void finished(); void contextMenuRequested(int xpos, int ypos); protected: - void showEvent( QShowEvent *e ); - void contextMenuEvent( QContextMenuEvent * e ); + void showEvent( TQShowEvent *e ); + void contextMenuEvent( TQContextMenuEvent * e ); HelpAction m_helpAction; - QString m_helpActionText; + TQString m_helpActionText; }; #endif |