From d6f8bbb45b267065a6907e71ff9c98bb6d161241 Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 31 Jul 2010 19:56:07 +0000 Subject: Trinity Qt initial conversion git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdevelop@1157658 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- buildtools/lib/widgets/addenvvardlg.cpp | 34 +++++++++--------- buildtools/lib/widgets/addenvvardlg.h | 14 ++++---- buildtools/lib/widgets/addfilesdialog.cpp | 16 ++++----- buildtools/lib/widgets/addfilesdialog.h | 10 +++--- .../lib/widgets/environmentdisplaydialog.cpp | 12 +++---- buildtools/lib/widgets/environmentdisplaydialog.h | 2 +- .../lib/widgets/environmentvariableswidget.cpp | 30 ++++++++-------- .../lib/widgets/environmentvariableswidget.h | 14 ++++---- buildtools/lib/widgets/envvartools.cpp | 8 ++--- buildtools/lib/widgets/envvartools.h | 4 +-- buildtools/lib/widgets/makeoptionswidget.cpp | 12 +++---- buildtools/lib/widgets/makeoptionswidget.h | 10 +++--- buildtools/lib/widgets/removesubprojectdialog.cpp | 10 +++--- buildtools/lib/widgets/removesubprojectdialog.h | 2 +- buildtools/lib/widgets/runoptionswidget.cpp | 40 +++++++++++----------- buildtools/lib/widgets/runoptionswidget.h | 14 ++++---- buildtools/lib/widgets/subclassesdlg.cpp | 12 +++---- buildtools/lib/widgets/subclassesdlg.h | 10 +++--- 18 files changed, 127 insertions(+), 127 deletions(-) (limited to 'buildtools/lib/widgets') diff --git a/buildtools/lib/widgets/addenvvardlg.cpp b/buildtools/lib/widgets/addenvvardlg.cpp index 2264d5f2..89d7f655 100644 --- a/buildtools/lib/widgets/addenvvardlg.cpp +++ b/buildtools/lib/widgets/addenvvardlg.cpp @@ -17,9 +17,9 @@ Boston, MA 02110-1301, USA. */ -#include -#include -#include +#include +#include +#include #include #include #include @@ -28,45 +28,45 @@ #include "addenvvardlg.h" -AddEnvvarDialog::AddEnvvarDialog(QWidget *parent, const char *name) - : QDialog(parent, name, true) +AddEnvvarDialog::AddEnvvarDialog(TQWidget *parent, const char *name) + : TQDialog(parent, name, true) { setCaption(i18n("Add Environment Variable")); - QLabel *varname_label = new QLabel(i18n("&Name:"), this); + TQLabel *varname_label = new TQLabel(i18n("&Name:"), this); varname_edit = new KLineEdit(this); varname_edit->setFocus(); varname_label->setBuddy(varname_edit); - connect( varname_edit, SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotTextChanged() ) ); - QLabel *value_label = new QLabel(i18n("&Value:"), this); + connect( varname_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); + TQLabel *value_label = new TQLabel(i18n("&Value:"), this); value_edit = new KLineEdit(this); value_label->setBuddy(value_edit); - QFontMetrics fm(value_edit->fontMetrics()); + TQFontMetrics fm(value_edit->fontMetrics()); value_edit->setMinimumWidth(fm.width('X')*35); - connect( value_edit, SIGNAL( textChanged ( const QString & ) ), this, SLOT( slotTextChanged() ) ); + connect( value_edit, TQT_SIGNAL( textChanged ( const TQString & ) ), this, TQT_SLOT( slotTextChanged() ) ); - QVBoxLayout *layout = new QVBoxLayout(this, 10); + TQVBoxLayout *layout = new TQVBoxLayout(this, 10); - QGridLayout *grid = new QGridLayout(2, 2); + TQGridLayout *grid = new TQGridLayout(2, 2); layout->addLayout(grid); grid->addWidget(varname_label, 0, 0); grid->addWidget(varname_edit, 0, 1); grid->addWidget(value_label, 1, 0); grid->addWidget(value_edit, 1, 1); - QFrame *frame = new QFrame(this); - frame->setFrameStyle(QFrame::HLine | QFrame::Sunken); + TQFrame *frame = new TQFrame(this); + frame->setFrameStyle(TQFrame::HLine | TQFrame::Sunken); layout->addWidget(frame, 0); KButtonBox *buttonbox = new KButtonBox(this); buttonbox->addStretch(); m_pOk = buttonbox->addButton( KStdGuiItem::ok()); - QPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); + TQPushButton *cancel = buttonbox->addButton(KStdGuiItem::cancel()); m_pOk->setDefault(true); - connect( m_pOk, SIGNAL(clicked()), this, SLOT(accept()) ); - connect( cancel, SIGNAL(clicked()), this, SLOT(reject()) ); + connect( m_pOk, TQT_SIGNAL(clicked()), this, TQT_SLOT(accept()) ); + connect( cancel, TQT_SIGNAL(clicked()), this, TQT_SLOT(reject()) ); buttonbox->layout(); layout->addWidget(buttonbox, 0); slotTextChanged(); diff --git a/buildtools/lib/widgets/addenvvardlg.h b/buildtools/lib/widgets/addenvvardlg.h index 06daa33b..5f2a5ea6 100644 --- a/buildtools/lib/widgets/addenvvardlg.h +++ b/buildtools/lib/widgets/addenvvardlg.h @@ -20,7 +20,7 @@ #ifndef _ADDENVVARDLG_H_ #define _ADDENVVARDLG_H_ -#include +#include #include class QPushButton; @@ -32,23 +32,23 @@ class AddEnvvarDialog : public QDialog Q_OBJECT public: - AddEnvvarDialog( QWidget *parent=0, const char *name=0 ); + AddEnvvarDialog( TQWidget *parent=0, const char *name=0 ); ~AddEnvvarDialog(); - QString varname() const + TQString varname() const { return varname_edit->text(); } - QString value() const + TQString value() const { return value_edit->text(); } - void setvarname(const QString name) const + void setvarname(const TQString name) const { varname_edit->setText(name); } - void setvalue(const QString value) const + void setvalue(const TQString value) const { value_edit->setText(value); } private slots: void slotTextChanged(); private: KLineEdit *varname_edit; KLineEdit *value_edit; - QPushButton *m_pOk; + TQPushButton *m_pOk; }; #endif diff --git a/buildtools/lib/widgets/addfilesdialog.cpp b/buildtools/lib/widgets/addfilesdialog.cpp index 569b822f..f5a1fa92 100644 --- a/buildtools/lib/widgets/addfilesdialog.cpp +++ b/buildtools/lib/widgets/addfilesdialog.cpp @@ -19,24 +19,24 @@ #include #include -#include +#include #include "addfilesdialog.h" #include "addfilesdialog.moc" -AddFilesDialog::AddFilesDialog(const QString& startDir, const QString& filter, - QWidget *parent, const char *name, bool modal): +AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, + TQWidget *parent, const char *name, bool modal): KFileDialog(startDir, filter, parent, name, modal) { KConfig *config = kapp->config(); config->setGroup("Add Files Dialog"); - m_extraWidget = new QComboBox(false, this); + m_extraWidget = new TQComboBox(false, this); m_extraWidget->insertItem(i18n("Copy File(s)"), 0); m_extraWidget->insertItem(i18n("Create Symbolic Link(s)"), 1); m_extraWidget->insertItem(i18n("Add Relative Path(s)"), 2); m_extraWidget->setCurrentItem(config->readNumEntry("Mode")); - connect(m_extraWidget, SIGNAL(activated(int)), this, SLOT(storePreferred(int))); + connect(m_extraWidget, TQT_SIGNAL(activated(int)), this, TQT_SLOT(storePreferred(int))); setPreviewWidget(m_extraWidget); @@ -44,8 +44,8 @@ AddFilesDialog::AddFilesDialog(const QString& startDir, const QString& filter, } -AddFilesDialog::AddFilesDialog(const QString& startDir, const QString& filter, - QWidget *parent, const char *name, bool modal, QComboBox *extraWidget): +AddFilesDialog::AddFilesDialog(const TQString& startDir, const TQString& filter, + TQWidget *parent, const char *name, bool modal, TQComboBox *extraWidget): KFileDialog(startDir, filter, parent, name, modal, extraWidget), m_extraWidget(extraWidget) { KConfig *config = kapp->config(); @@ -55,7 +55,7 @@ AddFilesDialog::AddFilesDialog(const QString& startDir, const QString& filter, m_extraWidget->insertItem(i18n("Create Symbolic Link(s)"), 1); m_extraWidget->insertItem(i18n("Add Relative Path(s)"), 2); m_extraWidget->setCurrentItem(config->readNumEntry("Mode")); - connect(m_extraWidget, SIGNAL(activated(int)), this, SLOT(storePreferred(int))); + connect(m_extraWidget, TQT_SIGNAL(activated(int)), this, TQT_SLOT(storePreferred(int))); setOperationMode(Opening); } diff --git a/buildtools/lib/widgets/addfilesdialog.h b/buildtools/lib/widgets/addfilesdialog.h index ddc6dd60..51415cc6 100644 --- a/buildtools/lib/widgets/addfilesdialog.h +++ b/buildtools/lib/widgets/addfilesdialog.h @@ -37,18 +37,18 @@ class AddFilesDialog : public KFileDialog public: enum Mode { Copy, Link, Relative }; - AddFilesDialog(const QString& startDir, const QString& filter, - QWidget *parent, const char *name, bool modal); + AddFilesDialog(const TQString& startDir, const TQString& filter, + TQWidget *parent, const char *name, bool modal); - AddFilesDialog(const QString& startDir, const QString& filter, - QWidget *parent, const char *name, bool modal, QComboBox *extraWidget); + AddFilesDialog(const TQString& startDir, const TQString& filter, + TQWidget *parent, const char *name, bool modal, TQComboBox *extraWidget); virtual ~AddFilesDialog(); virtual AddFilesDialog::Mode mode(); private: - QComboBox * m_extraWidget; + TQComboBox * m_extraWidget; private slots: void storePreferred(int index); diff --git a/buildtools/lib/widgets/environmentdisplaydialog.cpp b/buildtools/lib/widgets/environmentdisplaydialog.cpp index dcec00d7..1a809459 100644 --- a/buildtools/lib/widgets/environmentdisplaydialog.cpp +++ b/buildtools/lib/widgets/environmentdisplaydialog.cpp @@ -19,16 +19,16 @@ #include #include -#include +#include #include "environmentdisplaydialog.h" extern char **environ; -EnvironmentDisplayDialog::EnvironmentDisplayDialog(QWidget* parent, const char* name, bool modal, WFlags fl) +EnvironmentDisplayDialog::EnvironmentDisplayDialog(TQWidget* parent, const char* name, bool modal, WFlags fl) : EnvironmentDisplayDialogBase(parent,name, modal,fl) { - QStringList environment; + TQStringList environment; char ** e = ::environ; while ( *e ) @@ -37,13 +37,13 @@ EnvironmentDisplayDialog::EnvironmentDisplayDialog(QWidget* parent, const char* e++; } - QStringList::ConstIterator it = environment.begin(); + TQStringList::ConstIterator it = environment.begin(); while( it !=environment.end() ) { - QStringList pair = QStringList::split( QChar('='), *it ); + TQStringList pair = TQStringList::split( TQChar('='), *it ); if ( pair.count() == 2 ) { - new QListViewItem( environmentListView, pair.first(), pair.last() ); + new TQListViewItem( environmentListView, pair.first(), pair.last() ); } ++it; } diff --git a/buildtools/lib/widgets/environmentdisplaydialog.h b/buildtools/lib/widgets/environmentdisplaydialog.h index 277919c2..3458ba78 100644 --- a/buildtools/lib/widgets/environmentdisplaydialog.h +++ b/buildtools/lib/widgets/environmentdisplaydialog.h @@ -28,7 +28,7 @@ class EnvironmentDisplayDialog : public EnvironmentDisplayDialogBase Q_OBJECT public: - EnvironmentDisplayDialog(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + EnvironmentDisplayDialog(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); }; #endif diff --git a/buildtools/lib/widgets/environmentvariableswidget.cpp b/buildtools/lib/widgets/environmentvariableswidget.cpp index e47142f5..3c3e448f 100644 --- a/buildtools/lib/widgets/environmentvariableswidget.cpp +++ b/buildtools/lib/widgets/environmentvariableswidget.cpp @@ -21,10 +21,10 @@ #include "environmentvariableswidget.h" #include "environmentdisplaydialog.h" -#include -#include -#include -#include +#include +#include +#include +#include #include "domutil.h" #include "addenvvardlg.h" @@ -32,7 +32,7 @@ void EnvironmentVariablesWidget::addVarClicked() { AddEnvvarDialog dlg( this, "add env dialog" ) ; - if (QListViewItem *Item = listview->selectedItem()) + if (TQListViewItem *Item = listview->selectedItem()) { dlg.setvarname(Item->text(0)); dlg.setvalue(Item->text(1)); @@ -40,14 +40,14 @@ void EnvironmentVariablesWidget::addVarClicked() if (!dlg.exec()) return; - (void) new QListViewItem(listview, dlg.varname(), dlg.value()); + (void) new TQListViewItem(listview, dlg.varname(), dlg.value()); } void EnvironmentVariablesWidget::editVarClicked() { AddEnvvarDialog dlg( this, "edit env dialog" ); - QListViewItem *item = listview->selectedItem(); + TQListViewItem *item = listview->selectedItem(); if ( !item ) return; dlg.setvarname(item->text(0)); @@ -66,20 +66,20 @@ void EnvironmentVariablesWidget::removeVarClicked() } -EnvironmentVariablesWidget::EnvironmentVariablesWidget(QDomDocument &dom, const QString &configGroup, - QWidget *parent, const char *name) +EnvironmentVariablesWidget::EnvironmentVariablesWidget(TQDomDocument &dom, const TQString &configGroup, + TQWidget *parent, const char *name) : EnvironmentVariablesWidgetBase(parent, name), m_dom(dom), m_configGroup(configGroup) { readEnvironment(dom, configGroup); - connect( listview, SIGNAL( doubleClicked ( QListViewItem *, const QPoint &, int ) ), this, SLOT( editVarClicked() ) ); + connect( listview, TQT_SIGNAL( doubleClicked ( TQListViewItem *, const TQPoint &, int ) ), this, TQT_SLOT( editVarClicked() ) ); } EnvironmentVariablesWidget::~EnvironmentVariablesWidget() {} -void EnvironmentVariablesWidget::readEnvironment(QDomDocument &dom, const QString &configGroup) +void EnvironmentVariablesWidget::readEnvironment(TQDomDocument &dom, const TQString &configGroup) { m_dom = dom; m_configGroup = configGroup; @@ -89,18 +89,18 @@ void EnvironmentVariablesWidget::readEnvironment(QDomDocument &dom, const QStrin DomUtil::PairList list = DomUtil::readPairListEntry(dom, m_configGroup, "envvar", "name", "value"); - QListViewItem *lastItem = 0; + TQListViewItem *lastItem = 0; DomUtil::PairList::ConstIterator it; for (it = list.begin(); it != list.end(); ++it) { - QListViewItem *newItem = new QListViewItem(listview, (*it).first, (*it).second); + TQListViewItem *newItem = new TQListViewItem(listview, (*it).first, (*it).second); if (lastItem) newItem->moveItem(lastItem); lastItem = newItem; } } -void EnvironmentVariablesWidget::changeConfigGroup( const QString &configGroup) +void EnvironmentVariablesWidget::changeConfigGroup( const TQString &configGroup) { m_configGroup = configGroup; } @@ -108,7 +108,7 @@ void EnvironmentVariablesWidget::changeConfigGroup( const QString &configGroup) void EnvironmentVariablesWidget::accept() { DomUtil::PairList list; - QListViewItem *item = listview->firstChild(); + TQListViewItem *item = listview->firstChild(); while (item) { list << DomUtil::Pair(item->text(0), item->text(1)); item = item->nextSibling(); diff --git a/buildtools/lib/widgets/environmentvariableswidget.h b/buildtools/lib/widgets/environmentvariableswidget.h index c42076a8..f2c00b52 100644 --- a/buildtools/lib/widgets/environmentvariableswidget.h +++ b/buildtools/lib/widgets/environmentvariableswidget.h @@ -23,7 +23,7 @@ #include "environmentvariableswidgetbase.h" -#include +#include /** Environment variables widget. @@ -33,15 +33,15 @@ class EnvironmentVariablesWidget : public EnvironmentVariablesWidgetBase Q_OBJECT public: - EnvironmentVariablesWidget( QDomDocument &dom, const QString &configGroup, - QWidget *parent=0, const char *name=0 ); + EnvironmentVariablesWidget( TQDomDocument &dom, const TQString &configGroup, + TQWidget *parent=0, const char *name=0 ); ~EnvironmentVariablesWidget(); /// read in a set of environment variables from the DOM document - void readEnvironment(QDomDocument &dom, const QString &configGroup); + void readEnvironment(TQDomDocument &dom, const TQString &configGroup); /// changes the path in the DOM structure where the environment variables are stored - void changeConfigGroup( const QString &configGroup); + void changeConfigGroup( const TQString &configGroup); public slots: void accept(); @@ -52,8 +52,8 @@ private: virtual void editVarClicked(); virtual void environmentClicked(); - QDomDocument &m_dom; - QString m_configGroup; + TQDomDocument &m_dom; + TQString m_configGroup; }; #endif diff --git a/buildtools/lib/widgets/envvartools.cpp b/buildtools/lib/widgets/envvartools.cpp index 8f69e93c..71c44377 100644 --- a/buildtools/lib/widgets/envvartools.cpp +++ b/buildtools/lib/widgets/envvartools.cpp @@ -18,12 +18,12 @@ */ #include "envvartools.h" -#include +#include -QString EnvVarTools::quote( const QString & arg ) +TQString EnvVarTools::quote( const TQString & arg ) { - QString res = arg; - res.replace(QRegExp(QString::fromLatin1("'")), QString::fromLatin1("'\\''")); + TQString res = arg; + res.replace(TQRegExp(TQString::fromLatin1("'")), TQString::fromLatin1("'\\''")); res.prepend("\""); res.append("\""); return res; diff --git a/buildtools/lib/widgets/envvartools.h b/buildtools/lib/widgets/envvartools.h index 042fe326..3a4802c6 100644 --- a/buildtools/lib/widgets/envvartools.h +++ b/buildtools/lib/widgets/envvartools.h @@ -16,13 +16,13 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include /**Environment support functions.*/ namespace EnvVarTools{ /**Quotes the argument using double quotes ("). Created as a replacement for KShellProcess::quote.*/ - QString quote(const QString &arg); + TQString quote(const TQString &arg); } diff --git a/buildtools/lib/widgets/makeoptionswidget.cpp b/buildtools/lib/widgets/makeoptionswidget.cpp index 834e275c..ef901cc8 100644 --- a/buildtools/lib/widgets/makeoptionswidget.cpp +++ b/buildtools/lib/widgets/makeoptionswidget.cpp @@ -19,17 +19,17 @@ #include "makeoptionswidget.h" -#include +#include #include -#include -#include -#include +#include +#include +#include #include "domutil.h" #include "environmentvariableswidget.h" -MakeOptionsWidget::MakeOptionsWidget(QDomDocument &dom, const QString &configGroup, - QWidget *parent, const char *name) +MakeOptionsWidget::MakeOptionsWidget(TQDomDocument &dom, const TQString &configGroup, + TQWidget *parent, const char *name) : MakeOptionsWidgetBase(parent, name), m_dom(dom), m_configGroup(configGroup) { diff --git a/buildtools/lib/widgets/makeoptionswidget.h b/buildtools/lib/widgets/makeoptionswidget.h index 1754cd91..0cd962c3 100644 --- a/buildtools/lib/widgets/makeoptionswidget.h +++ b/buildtools/lib/widgets/makeoptionswidget.h @@ -22,7 +22,7 @@ #include "makeoptionswidgetbase.h" -#include +#include class EnvironmentVariablesWidget; @@ -34,16 +34,16 @@ class MakeOptionsWidget : public MakeOptionsWidgetBase Q_OBJECT public: - MakeOptionsWidget( QDomDocument &dom, const QString &configGroup, - QWidget *parent=0, const char *name=0 ); + MakeOptionsWidget( TQDomDocument &dom, const TQString &configGroup, + TQWidget *parent=0, const char *name=0 ); ~MakeOptionsWidget(); public slots: void accept(); private: - QDomDocument &m_dom; - QString m_configGroup; + TQDomDocument &m_dom; + TQString m_configGroup; EnvironmentVariablesWidget* m_environmentVariablesWidget; }; diff --git a/buildtools/lib/widgets/removesubprojectdialog.cpp b/buildtools/lib/widgets/removesubprojectdialog.cpp index aef16a0c..4a41ff88 100644 --- a/buildtools/lib/widgets/removesubprojectdialog.cpp +++ b/buildtools/lib/widgets/removesubprojectdialog.cpp @@ -16,11 +16,11 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include -#include +#include +#include #include "removesubprojectdialog.h" -RemoveSubprojectDialog::RemoveSubprojectDialog(QString caption, QString question, QWidget* parent, const char* name, bool modal, WFlags fl) +RemoveSubprojectDialog::RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* parent, const char* name, bool modal, WFlags fl) : RemoveSubprojectDlgBase(parent,name, modal,fl) { setCaption(caption); @@ -34,12 +34,12 @@ RemoveSubprojectDialog::~RemoveSubprojectDialog() /*$SPECIALIZATION$*/ void RemoveSubprojectDialog::reject() { - QDialog::reject(); + TQDialog::reject(); } void RemoveSubprojectDialog::accept() { - QDialog::accept(); + TQDialog::accept(); } bool RemoveSubprojectDialog::removeFromDisk( ) diff --git a/buildtools/lib/widgets/removesubprojectdialog.h b/buildtools/lib/widgets/removesubprojectdialog.h index 0a20b4ad..593309fe 100644 --- a/buildtools/lib/widgets/removesubprojectdialog.h +++ b/buildtools/lib/widgets/removesubprojectdialog.h @@ -30,7 +30,7 @@ class RemoveSubprojectDialog : public RemoveSubprojectDlgBase Q_OBJECT public: - RemoveSubprojectDialog(QString caption, QString question, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + RemoveSubprojectDialog(TQString caption, TQString question, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~RemoveSubprojectDialog(); /*$PUBLIC_FUNCTIONS$*/ bool removeFromDisk(); diff --git a/buildtools/lib/widgets/runoptionswidget.cpp b/buildtools/lib/widgets/runoptionswidget.cpp index f0cb94b4..9aecbe17 100644 --- a/buildtools/lib/widgets/runoptionswidget.cpp +++ b/buildtools/lib/widgets/runoptionswidget.cpp @@ -26,20 +26,20 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include "domutil.h" #include "environmentvariableswidget.h" -RunOptionsWidget::RunOptionsWidget(QDomDocument &dom, const QString &configGroup, - const QString &buildDirectory, QWidget *parent, const char *name) +RunOptionsWidget::RunOptionsWidget(TQDomDocument &dom, const TQString &configGroup, + const TQString &buildDirectory, TQWidget *parent, const char *name) : RunOptionsWidgetBase(parent, name), m_dom(dom), m_configGroup(configGroup) { @@ -49,37 +49,37 @@ RunOptionsWidget::RunOptionsWidget(QDomDocument &dom, const QString &configGroup mainprogram_edit->completionObject()->setMode(KURLCompletion::FileCompletion); mainprogram_edit->setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOnly ); - if( DomUtil::readEntry(dom, configGroup + "/run/mainprogram").isEmpty() && QFileInfo( buildDirectory ).exists() ) + if( DomUtil::readEntry(dom, configGroup + "/run/mainprogram").isEmpty() && TQFileInfo( buildDirectory ).exists() ) { mainprogram_edit->setURL( buildDirectory ); mainprogram_edit->fileDialog()->setURL( KURL::fromPathOrURL(buildDirectory) ); - }else if ( QFileInfo( DomUtil::readEntry(dom, configGroup + "/run/mainprogram") ).exists() ) + }else if ( TQFileInfo( DomUtil::readEntry(dom, configGroup + "/run/mainprogram") ).exists() ) { - QString program = DomUtil::readEntry(dom, configGroup + "/run/mainprogram"); - if( QDir::isRelativePath(program) ) + TQString program = DomUtil::readEntry(dom, configGroup + "/run/mainprogram"); + if( TQDir::isRelativePath(program) ) program = buildDirectory + "/" + program; mainprogram_edit->setURL(program); mainprogram_edit->fileDialog()->setURL( program ); }else { - mainprogram_edit->setURL(QString()); - mainprogram_edit->fileDialog()->setURL(QString()); + mainprogram_edit->setURL(TQString()); + mainprogram_edit->fileDialog()->setURL(TQString()); } cwd_edit->completionObject()->setMode(KURLCompletion::DirCompletion); cwd_edit->setMode( KFile::Directory | KFile::ExistingOnly | KFile::LocalOnly ); - if( DomUtil::readEntry(dom, configGroup + "/run/globalcwd").isEmpty() && QFileInfo( buildDirectory ).exists() ) + if( DomUtil::readEntry(dom, configGroup + "/run/globalcwd").isEmpty() && TQFileInfo( buildDirectory ).exists() ) { cwd_edit->setURL( buildDirectory ); cwd_edit->fileDialog()->setURL( KURL::fromPathOrURL(buildDirectory) ); - }else if( QFileInfo( DomUtil::readEntry(dom, configGroup + "/run/globalcwd") ).exists() ) + }else if( TQFileInfo( DomUtil::readEntry(dom, configGroup + "/run/globalcwd") ).exists() ) { cwd_edit->setURL(DomUtil::readEntry(dom, configGroup + "/run/globalcwd")); cwd_edit->fileDialog()->setURL( KURL::fromPathOrURL( DomUtil::readEntry(dom, configGroup + "/run/globalcwd") ) ); }else { - cwd_edit->setURL(QString()); - cwd_edit->fileDialog()->setURL(QString()); + cwd_edit->setURL(TQString()); + cwd_edit->fileDialog()->setURL(TQString()); } if( configGroup == "/kdevautoproject" || configGroup == "/kdevtrollproject" ) @@ -127,7 +127,7 @@ void RunOptionsWidget::mainProgramChanged( ) if( mainProgramGroupBox->isChecked() && mainprogram_edit->url().isEmpty() ) { - mainprogram_label->setPaletteForegroundColor(QColor("#ff0000")); + mainprogram_label->setPaletteForegroundColor(TQColor("#ff0000")); } else { diff --git a/buildtools/lib/widgets/runoptionswidget.h b/buildtools/lib/widgets/runoptionswidget.h index df27079d..02c38f35 100644 --- a/buildtools/lib/widgets/runoptionswidget.h +++ b/buildtools/lib/widgets/runoptionswidget.h @@ -22,7 +22,7 @@ #include "runoptionswidgetbase.h" -#include +#include #include class EnvironmentVariablesWidget; @@ -35,10 +35,10 @@ class RunOptionsWidget : public RunOptionsWidgetBase Q_OBJECT public: - RunOptionsWidget( QDomDocument &dom, //!< document DOM - const QString &configGroup, //!< configuration group - const QString &buildDirectory, //!< project build directory - QWidget *parent=0, //!< parent widget + RunOptionsWidget( TQDomDocument &dom, //!< document DOM + const TQString &configGroup, //!< configuration group + const TQString &buildDirectory, //!< project build directory + TQWidget *parent=0, //!< parent widget const char *name=0 //!< widget's name ); ~RunOptionsWidget(); @@ -49,8 +49,8 @@ public slots: private: virtual void mainProgramChanged( ); - QDomDocument &m_dom; - QString m_configGroup; + TQDomDocument &m_dom; + TQString m_configGroup; EnvironmentVariablesWidget* m_environmentVariablesWidget; }; diff --git a/buildtools/lib/widgets/subclassesdlg.cpp b/buildtools/lib/widgets/subclassesdlg.cpp index 2ec12f48..4dde898b 100644 --- a/buildtools/lib/widgets/subclassesdlg.cpp +++ b/buildtools/lib/widgets/subclassesdlg.cpp @@ -16,12 +16,12 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include "subclassesdlg.h" #include "subclassesdlg.moc" -SubclassesDlg::SubclassesDlg(QString form, DomUtil::PairList &config, QString projectDir, QWidget* parent, const char* name, bool modal, WFlags fl) +SubclassesDlg::SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* parent, const char* name, bool modal, WFlags fl) : SubclassesDlgBase(parent,name, modal,fl), m_form(form), m_config(config), m_projectDir(projectDir) { subclass_url->setEnabled(false); @@ -41,7 +41,7 @@ SubclassesDlg::~SubclassesDlg() /*$SPECIALIZATION$*/ void SubclassesDlg::accept() { - QPtrList pairsToRemove; + TQPtrList pairsToRemove; DomUtil::PairList::iterator it; for ( it = m_config.begin(); it != m_config.end(); ++it ) @@ -81,7 +81,7 @@ void SubclassesDlg::removeRelation() { if (subclasses_box->currentItem() > -1) { - QListBoxItem *item = subclasses_box->item(subclasses_box->currentItem()); + TQListBoxItem *item = subclasses_box->item(subclasses_box->currentItem()); int itemIdx = subclasses_box->currentItem(); if (item->prev()) @@ -103,7 +103,7 @@ void SubclassesDlg::removeRelation() } } -void SubclassesDlg::changeCurrentURL(const QString &str) +void SubclassesDlg::changeCurrentURL(const TQString &str) { if ( subclasses_box->currentItem() > -1 ) { @@ -111,7 +111,7 @@ void SubclassesDlg::changeCurrentURL(const QString &str) } } -void SubclassesDlg::currentRelationChanged( QListBoxItem * item ) +void SubclassesDlg::currentRelationChanged( TQListBoxItem * item ) { if (item) { diff --git a/buildtools/lib/widgets/subclassesdlg.h b/buildtools/lib/widgets/subclassesdlg.h index ed799b85..adfdc7d4 100644 --- a/buildtools/lib/widgets/subclassesdlg.h +++ b/buildtools/lib/widgets/subclassesdlg.h @@ -30,7 +30,7 @@ class SubclassesDlg : public SubclassesDlgBase Q_OBJECT public: - SubclassesDlg(QString form, DomUtil::PairList &config, QString projectDir, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + SubclassesDlg(TQString form, DomUtil::PairList &config, TQString projectDir, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~SubclassesDlg(); /*$PUBLIC_FUNCTIONS$*/ @@ -45,13 +45,13 @@ protected slots: /*$PROTECTED_SLOTS$*/ virtual void newRelation(); virtual void removeRelation(); - virtual void changeCurrentURL(const QString &str); - virtual void currentRelationChanged(QListBoxItem *item); + virtual void changeCurrentURL(const TQString &str); + virtual void currentRelationChanged(TQListBoxItem *item); private: - QString m_form; + TQString m_form; DomUtil::PairList &m_config; - QString m_projectDir; + TQString m_projectDir; }; #endif -- cgit v1.2.3