diff options
Diffstat (limited to 'src/tools/gui')
-rw-r--r-- | src/tools/gui/tool_config_widget.cpp | 54 | ||||
-rw-r--r-- | src/tools/gui/tool_config_widget.h | 17 | ||||
-rw-r--r-- | src/tools/gui/tool_group_ui.cpp | 4 | ||||
-rw-r--r-- | src/tools/gui/tool_group_ui.h | 2 | ||||
-rw-r--r-- | src/tools/gui/toolchain_config_center.cpp | 32 | ||||
-rw-r--r-- | src/tools/gui/toolchain_config_center.h | 15 | ||||
-rw-r--r-- | src/tools/gui/toolchain_config_widget.cpp | 100 | ||||
-rw-r--r-- | src/tools/gui/toolchain_config_widget.h | 29 |
8 files changed, 128 insertions, 125 deletions
diff --git a/src/tools/gui/tool_config_widget.cpp b/src/tools/gui/tool_config_widget.cpp index 308e61b..ea2fd80 100644 --- a/src/tools/gui/tool_config_widget.cpp +++ b/src/tools/gui/tool_config_widget.cpp @@ -9,9 +9,9 @@ ***************************************************************************/ #include "tool_config_widget.h" -#include <qtooltip.h> -#include <qwidgetstack.h> -#include <qvgroupbox.h> +#include <tqtooltip.h> +#include <tqwidgetstack.h> +#include <tqvgroupbox.h> #include <klocale.h> #include "devices/base/hex_buffer.h" @@ -33,32 +33,32 @@ ToolConfigWidget::ToolConfigWidget(Project *project) Container *container = new Container(this); container->setColStretch(2, 1); addWidget(container, 0,0, 0,0); - QLabel *label = new QLabel(i18n("Configuration:"), container); + TQLabel *label = new TQLabel(i18n("Configuration:"), container); container->addWidget(label, 0,0, 0,0); _argumentsType = new KComboBox(container); for (uint i=0; i<Nb_ArgumentsTypes; i++) _argumentsType->insertItem(i18n(ARGUMENTS_TYPE_LABELS[i]), i); - connect(_argumentsType, SIGNAL(activated(int)), SLOT(updateArguments())); + connect(_argumentsType, TQT_SIGNAL(activated(int)), TQT_SLOT(updateArguments())); container->addWidget(_argumentsType, 0,0, 1,1); - label = new QLabel(i18n("Arguments:"), container); + label = new TQLabel(i18n("Arguments:"), container); container->addWidget(label, 1,1, 0,0); _arguments = new KLineEdit(container); _arguments->setReadOnly(true); container->addWidget(_arguments, 1,1, 1,2); - KPushButton *button = new KPushButton(KGuiItem(QString::null, "help"), container); - connect(button, SIGNAL(clicked()), SIGNAL(displayHelp())); + KPushButton *button = new KPushButton(KGuiItem(TQString(), "help"), container); + connect(button, TQT_SIGNAL(clicked()), TQT_SIGNAL(displayHelp())); container->addWidget(button, 1,1, 3,3); _argumentsEditor = new EditListBox(1, container, "arguments_editor", EditListBox::DuplicatesAllowed, EditListBox::Add | EditListBox::Remove | EditListBox::UpDown | EditListBox::RemoveAll | EditListBox::Reset); - connect(_argumentsEditor, SIGNAL(changed()), SLOT(updateArguments())); - connect(_argumentsEditor, SIGNAL(reset()), SLOT(resetCustomArguments())); + connect(_argumentsEditor, TQT_SIGNAL(changed()), TQT_SLOT(updateArguments())); + connect(_argumentsEditor, TQT_SIGNAL(reset()), TQT_SLOT(resetCustomArguments())); container->addWidget(_argumentsEditor, 2,2, 0,3); _container = new Container(container); _container->setColStretch(2, 1); container->addWidget(_container, 3,3, 0,3); - connect(this, SIGNAL(changed()), SLOT(updateArguments())); + connect(this, TQT_SIGNAL(changed()), TQT_SLOT(updateArguments())); } void ToolConfigWidget::init(Tool::Category category, const Tool::Group &group) @@ -68,7 +68,7 @@ void ToolConfigWidget::init(Tool::Category category, const Tool::Group &group) _config = _group->createConfig(_project); _tmpProject = new Project(PURL::Url()); _tmpConfig = _group->createConfig(_tmpProject); - Compile::Data data(_category, QValueList<Compile::TodoItem>(), QString::null, _project, Compile::NormalLinking); + Compile::Data data(_category, TQValueList<Compile::TodoItem>(), TQString(), _project, Compile::NormalLinking); _process = _group->createCompileProcess(data, 0); initEntries(); @@ -83,11 +83,11 @@ ToolConfigWidget::~ToolConfigWidget() delete _config; } -PURL::DirectoriesWidget *ToolConfigWidget::createDirectoriesEntry(const QString &text) +PURL::DirectoriesWidget *ToolConfigWidget::createDirectoriesEntry(const TQString &text) { uint row = container()->numRows(); - PURL::DirectoriesWidget *sdw = new PURL::DirectoriesWidget(text, _project ? _project->directory().path() : QString::null, container()); - connect(sdw, SIGNAL(changed()), SIGNAL(changed())); + PURL::DirectoriesWidget *sdw = new PURL::DirectoriesWidget(text, _project ? _project->directory().path() : TQString(), container()); + connect(sdw, TQT_SIGNAL(changed()), TQT_SIGNAL(changed())); container()->addWidget(sdw, row,row, 0,2); return sdw; } @@ -95,31 +95,31 @@ PURL::DirectoriesWidget *ToolConfigWidget::createDirectoriesEntry(const QString void ToolConfigWidget::createCustomOptionsEntry() { uint row = container()->numRows(); - QLabel *label = new QLabel(i18n("Custom options:"), container()); + TQLabel *label = new TQLabel(i18n("Custom options:"), container()); container()->addWidget(label, row,row, 0,0); - _customOptions = new QLineEdit(container()); - connect(_customOptions, SIGNAL(textChanged(const QString &)), SIGNAL(changed())); + _customOptions = new TQLineEdit(container()); + connect(_customOptions, TQT_SIGNAL(textChanged(const TQString &)), TQT_SIGNAL(changed())); container()->addWidget(_customOptions, row,row, 1,2); } void ToolConfigWidget::createCustomLibrariesEntry() { uint row = container()->numRows(); - QLabel *label = new QLabel(i18n("Custom libraries:"), container()); + TQLabel *label = new TQLabel(i18n("Custom libraries:"), container()); container()->addWidget(label, row,row, 0,0); - _customLibraries = new QLineEdit(container()); - connect(_customLibraries, SIGNAL(textChanged(const QString &)), SIGNAL(changed())); - QToolTip::add(_customLibraries, i18n("<qt>This values will be placed after the linked objects.</qt>")) ; + _customLibraries = new TQLineEdit(container()); + connect(_customLibraries, TQT_SIGNAL(textChanged(const TQString &)), TQT_SIGNAL(changed())); + TQToolTip::add(_customLibraries, i18n("<qt>This values will be placed after the linked objects.</qt>")) ; container()->addWidget(_customLibraries, row,row, 1,2); } void ToolConfigWidget::createHexFormatEntry() { uint row = container()->numRows(); - QLabel *label = new QLabel(i18n("Hex file format:"), container()); + TQLabel *label = new TQLabel(i18n("Hex file format:"), container()); container()->addWidget(label, row,row, 0,0); - _hexFormat = new QComboBox(container()); - connect(_hexFormat, SIGNAL(activated(int)), SIGNAL(changed())); + _hexFormat = new TQComboBox(container()); + connect(_hexFormat, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed())); for (uint i=0; i<HexBuffer::Nb_Formats; i++) _hexFormat->insertItem(HexBuffer::FORMATS[i]); _hexFormat->insertItem(i18n("as in LIST directive")); @@ -159,9 +159,9 @@ void ToolConfigWidget::saveConfig(Compile::Config &config) const if (_hexFormat) config.setHexFormat(HexBuffer::Format(_hexFormat->currentItem())); } -QStringList ToolConfigWidget::arguments(ArgumentsType type) const +TQStringList ToolConfigWidget::arguments(ArgumentsType type) const { - if ( _tmpConfig==0 ) return QStringList(); + if ( _tmpConfig==0 ) return TQStringList(); saveConfig(*_tmpConfig); if ( type==AutomaticArguments ) return _process->genericArguments(*_tmpConfig); return _argumentsEditor->texts(); diff --git a/src/tools/gui/tool_config_widget.h b/src/tools/gui/tool_config_widget.h index 5b38753..f9239b3 100644 --- a/src/tools/gui/tool_config_widget.h +++ b/src/tools/gui/tool_config_widget.h @@ -10,10 +10,10 @@ #ifndef TOOL_CONFIG_WIDGET_H #define TOOL_CONFIG_WIDGET_H -#include <qcombobox.h> -#include <qlayout.h> -#include <qtabwidget.h> -#include <qvaluevector.h> +#include <tqcombobox.h> +#include <tqlayout.h> +#include <tqtabwidget.h> +#include <tqvaluevector.h> #include <kcombobox.h> #include <klineedit.h> @@ -27,6 +27,7 @@ namespace PURL { class DirectoriesWidget; } class ToolConfigWidget : public ::ConfigWidget { Q_OBJECT + TQ_OBJECT public: ToolConfigWidget(Project *project); void init(Tool::Category category, const Tool::Group &group); @@ -48,12 +49,12 @@ protected: const Tool::Group *_group; Tool::Category _category; Project *_project; - QLineEdit *_customOptions, *_customLibraries; + TQLineEdit *_customOptions, *_customLibraries; PURL::DirectoriesWidget *_includeDirs; - QComboBox *_hexFormat; + TQComboBox *_hexFormat; Container *container() { return _container; } - PURL::DirectoriesWidget * createDirectoriesEntry(const QString &label); + PURL::DirectoriesWidget * createDirectoriesEntry(const TQString &label); void createIncludeDirectoriesEntry() { _includeDirs = createDirectoriesEntry(i18n("Include directories:")); } void createCustomOptionsEntry(); void createCustomLibrariesEntry(); @@ -73,7 +74,7 @@ private: EditListBox *_argumentsEditor; Container *_container; - QStringList arguments(ArgumentsType type) const; + TQStringList arguments(ArgumentsType type) const; }; #endif diff --git a/src/tools/gui/tool_group_ui.cpp b/src/tools/gui/tool_group_ui.cpp index 9bb02dd..118b8c7 100644 --- a/src/tools/gui/tool_group_ui.cpp +++ b/src/tools/gui/tool_group_ui.cpp @@ -11,9 +11,9 @@ #include "tool_config_widget.h" #include "toolchain_config_widget.h" -ToolchainConfigWidget *Tool::GroupUI::toolchainConfigWidgetFactory(QWidget *parent) const +ToolchainConfigWidget *Tool::GroupUI::toolchainConfigWidgetFactory(TQWidget *tqparent) const { - return new ToolchainConfigWidget(static_cast<const Group &>(group()), parent); + return new ToolchainConfigWidget(static_cast<const Group &>(group()), tqparent); } ToolConfigWidget *Tool::GroupUI::createConfigWidget(Category category, ::Project *project) const diff --git a/src/tools/gui/tool_group_ui.h b/src/tools/gui/tool_group_ui.h index 4d1f42c..f03d633 100644 --- a/src/tools/gui/tool_group_ui.h +++ b/src/tools/gui/tool_group_ui.h @@ -22,7 +22,7 @@ class GroupUI : public ::Group::BaseGui public: ToolConfigWidget *createConfigWidget(Category category, ::Project *project) const; virtual ToolConfigWidget *configWidgetFactory(Category category, ::Project *project) const = 0; - virtual ToolchainConfigWidget *toolchainConfigWidgetFactory(QWidget *parent) const; + virtual ToolchainConfigWidget *toolchainConfigWidgetFactory(TQWidget *tqparent) const; }; inline const GroupUI &groupui(const Base &base) { return static_cast<const GroupUI &>(*base.group().gui()); } diff --git a/src/tools/gui/toolchain_config_center.cpp b/src/tools/gui/toolchain_config_center.cpp index c8b889d..60df0f8 100644 --- a/src/tools/gui/toolchain_config_center.cpp +++ b/src/tools/gui/toolchain_config_center.cpp @@ -9,8 +9,8 @@ ***************************************************************************/ #include "toolchain_config_center.h" -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <kiconloader.h> #include "tools/list/tools_config_widget.h" @@ -19,29 +19,29 @@ #include "toolchain_config_widget.h" #include "tool_group_ui.h" -ToolchainsConfigCenter::ToolchainsConfigCenter(const Tool::Group &sgroup, QWidget *parent) - : TreeListDialog(parent, "configure_toolchains_dialog", true, +ToolchainsConfigCenter::ToolchainsConfigCenter(const Tool::Group &sgroup, TQWidget *tqparent) + : TreeListDialog(tqparent, "configure_toolchains_dialog", true, i18n("Configure Toolchains"), Ok|User1|User2|Cancel, Cancel, false) { setButtonGuiItem(User1, KStdGuiItem::reset()); setButtonGuiItem(User2, KGuiItem(i18n("Update"), "reload")); _titleBox->addStretch(1); - _infoButton = new KPushButton(KGuiItem(QString::null, "viewmag"), _frame); - connect(_infoButton, SIGNAL(clicked()), SLOT(showInformationDialog())); + _infoButton = new KPushButton(KGuiItem(TQString(), "viewmag"), _frame); + connect(_infoButton, TQT_SIGNAL(clicked()), TQT_SLOT(showInformationDialog())); _titleBox->addWidget(_infoButton); - QWidget *current = 0; + TQWidget *current = 0; FOR_EACH(PURL::SourceFamily, family) { Tool::Lister::ConstIterator it; for (it=Tool::lister().begin(); it!=Tool::lister().end(); ++it) { PURL::FileType type = it.data()->implementationType(family.data().toolType); if ( type==PURL::Nb_FileTypes || type.data().sourceFamily!=family ) continue; if ( family==PURL::SourceFamily::Asm && it.data()->implementationType(PURL::ToolType::Compiler)!=PURL::Nb_FileTypes ) continue; - QStringList names = family.label(); + TQStringList names = family.label(); names += it.data()->label(); - QWidget *page = addPage(names); - QVBoxLayout *vbox = new QVBoxLayout(page); + TQWidget *page = addPage(names); + TQVBoxLayout *vbox = new TQVBoxLayout(page); ToolchainConfigWidget *tcw = static_cast<const ::Tool::GroupUI *>(it.data()->gui())->toolchainConfigWidgetFactory(page); tcw->init(); tcw->loadConfig(); @@ -52,21 +52,21 @@ ToolchainsConfigCenter::ToolchainsConfigCenter(const Tool::Group &sgroup, QWidge } showPage(current); aboutToShowPageSlot(current); - connect(this, SIGNAL(aboutToShowPage(QWidget *)), SLOT(aboutToShowPageSlot(QWidget *))); + connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget *)), TQT_SLOT(aboutToShowPageSlot(TQWidget *))); } -void ToolchainsConfigCenter::aboutToShowPageSlot(QWidget *page) +void ToolchainsConfigCenter::aboutToShowPageSlot(TQWidget *page) { - if ( !_pages.contains(page) ) _infoButton->hide(); + if ( !_pages.tqcontains(page) ) _infoButton->hide(); else { _infoButton->show(); - QTimer::singleShot(0, _pages[page], SLOT(detect())); + TQTimer::singleShot(0, _pages[page], TQT_SLOT(detect())); } } void ToolchainsConfigCenter::slotApply() { - QMap<QWidget *, ToolchainConfigWidget *>::iterator it; + TQMap<TQWidget *, ToolchainConfigWidget *>::iterator it; for (it=_pages.begin(); it!=_pages.end(); ++it) it.data()->saveConfig(); } @@ -80,7 +80,7 @@ ToolchainConfigWidget *ToolchainsConfigCenter::current() const { int i = activePageIndex(); if ( i==-1 ) return 0; - QMap<QWidget *, ToolchainConfigWidget *>::const_iterator it; + TQMap<TQWidget *, ToolchainConfigWidget *>::const_iterator it; for (it=_pages.begin(); it!=_pages.end(); ++it) if ( pageIndex(it.key())==i ) return it.data(); Q_ASSERT(false); diff --git a/src/tools/gui/toolchain_config_center.h b/src/tools/gui/toolchain_config_center.h index 4b2110b..6b02f91 100644 --- a/src/tools/gui/toolchain_config_center.h +++ b/src/tools/gui/toolchain_config_center.h @@ -10,10 +10,10 @@ #ifndef TOOLCHAIN_CONFIG_CENTER_H #define TOOLCHAIN_CONFIG_CENTER_H -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qlineedit.h> -#include <qwidgetstack.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqlineedit.h> +#include <tqwidgetstack.h> #include "tools/gui/tool_config_widget.h" #include "common/gui/dialog.h" @@ -22,8 +22,9 @@ class ToolchainConfigWidget; class ToolchainsConfigCenter : public TreeListDialog { Q_OBJECT + TQ_OBJECT public: - ToolchainsConfigCenter(const Tool::Group &group, QWidget *parent); + ToolchainsConfigCenter(const Tool::Group &group, TQWidget *tqparent); public slots: virtual void slotOk(); @@ -32,12 +33,12 @@ public slots: virtual void slotUser2(); private slots: - void aboutToShowPageSlot(QWidget *page); + void aboutToShowPageSlot(TQWidget *page); void showInformationDialog(); private: KPushButton *_infoButton; - QMap<QWidget *, ToolchainConfigWidget *> _pages; + TQMap<TQWidget *, ToolchainConfigWidget *> _pages; ToolchainConfigWidget *current() const; }; diff --git a/src/tools/gui/toolchain_config_widget.cpp b/src/tools/gui/toolchain_config_widget.cpp index aede699..d735f09 100644 --- a/src/tools/gui/toolchain_config_widget.cpp +++ b/src/tools/gui/toolchain_config_widget.cpp @@ -8,11 +8,11 @@ ***************************************************************************/ #include "toolchain_config_widget.h" -#include <qlabel.h> -#include <qlayout.h> -#include <qtooltip.h> -#include <qgroupbox.h> -#include <qtabwidget.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqtooltip.h> +#include <tqgroupbox.h> +#include <tqtabwidget.h> #include <kiconloader.h> #include <ktextedit.h> @@ -22,8 +22,8 @@ #include "common/gui/container.h" //---------------------------------------------------------------------------- -ToolchainConfigWidget::ToolchainConfigWidget(const Tool::Group &group, QWidget *parent) - : ::ConfigWidget(parent), +ToolchainConfigWidget::ToolchainConfigWidget(const Tool::Group &group, TQWidget *tqparent) + : ::ConfigWidget(tqparent), _group(group), _dirty(false), _outputType(0), _devicesData(group.nbCheckDevices()) { _config = group.createConfig(0); @@ -41,18 +41,18 @@ void ToolchainConfigWidget::init() container->setColStretch(3, 1); uint row = 0; - QLabel *label = new QLabel(Compile::DirectoryType(Compile::DirectoryType::Executable).label() + ":", container); + TQLabel *label = new TQLabel(Compile::DirectoryType(Compile::DirectoryType::Executable).label() + ":", container); container->addWidget(label, row,row, 0,0); _dirs[Compile::DirectoryType::Executable] = new PURL::DirectoryWidget(container); - connect(_dirs[Compile::DirectoryType::Executable], SIGNAL(changed()), SLOT(forceDetect())); + connect(_dirs[Compile::DirectoryType::Executable], TQT_SIGNAL(changed()), TQT_SLOT(forceDetect())); container->addWidget(_dirs[Compile::DirectoryType::Executable], row,row, 1,3); row++; - label = new QLabel(i18n("Executable Type:"), container); + label = new TQLabel(i18n("Executable Type:"), container); container->addWidget(label, row,row, 0,0); - _execType = new QComboBox(container); + _execType = new TQComboBox(container); FOR_EACH(Tool::ExecutableType, type) _execType->insertItem(type.label()); - connect(_execType, SIGNAL(activated(int)), SLOT(forceDetect())); + connect(_execType, TQT_SIGNAL(activated(int)), TQT_SLOT(forceDetect())); container->addWidget(_execType, row,row, 1,2); row++; @@ -60,12 +60,12 @@ void ToolchainConfigWidget::init() FOR_EACH(Tool::OutputExecutableType, type) if ( _group.hasOutputExecutableType(type) ) nbOutputTypes++; if ( nbOutputTypes>1 ) { - label = new QLabel(i18n("Output Executable Type:"), container); + label = new TQLabel(i18n("Output Executable Type:"), container); container->addWidget(label, row,row, 0,0); _outputType = new KeyComboBox<Tool::OutputExecutableType>(container); FOR_EACH(Tool::OutputExecutableType, type) if ( _group.hasOutputExecutableType(type) ) _outputType->appendItem(type, type.label()); - connect(_outputType->widget(), SIGNAL(activated(int)), SLOT(forceDetect())); + connect(_outputType->widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(forceDetect())); container->addWidget(_outputType->widget(), row,row, 1,1); row++; } @@ -75,22 +75,22 @@ void ToolchainConfigWidget::init() FOR_EACH(Tool::Category, k) { const Tool::Base *base = _group.base(k); if ( base==0 ) continue; - label = new QLabel(k.label(), container); + label = new TQLabel(k.label(), container); container->addWidget(label, row,row, 0,0); - _data[k].label = new QLabel(container); + _data[k].label = new TQLabel(container); container->addWidget(_data[k].label, row,row, 1,1); - _data[k].button = new KPushButton(KGuiItem(QString::null, "viewmag"), container); - connect(_data[k].button, SIGNAL(clicked()), SLOT(showDetails())); + _data[k].button = new KPushButton(KGuiItem(TQString(), "viewmag"), container); + connect(_data[k].button, TQT_SIGNAL(clicked()), TQT_SLOT(showDetails())); container->addWidget(_data[k].button, row,row, 2,2); row++; } - label = new QLabel(i18n("Device detection:"), container); + label = new TQLabel(i18n("Device detection:"), container); container->addWidget(label, row,row, 0,0); - _devicesLabel = new QLabel(container); + _devicesLabel = new TQLabel(container); container->addWidget(_devicesLabel, row,row, 1,1); - KPushButton *button = new KPushButton(KGuiItem(QString::null, "viewmag"), container); - connect(button, SIGNAL(clicked()), SLOT(showDeviceDetails())); + KPushButton *button = new KPushButton(KGuiItem(TQString(), "viewmag"), container); + connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(showDeviceDetails())); container->addWidget(button, row,row, 2,2); row++; @@ -99,7 +99,7 @@ void ToolchainConfigWidget::init() if ( type==Compile::DirectoryType::Executable ) continue; if ( !_group.hasDirectory(type) ) _dirs[type] = 0; else { - label = new QLabel(type.label() + ":", this); + label = new TQLabel(type.label() + ":", this); addWidget(label, row,row, 0,0); _dirs[type] = new PURL::DirectoryWidget(this); addWidget(_dirs[type], row,row, 1,3); @@ -108,9 +108,9 @@ void ToolchainConfigWidget::init() } if ( !_group.comment().isEmpty() ) { - KTextEdit *w = new KTextEdit(_group.comment(), QString::null, this); + KTextEdit *w = new KTextEdit(_group.comment(), TQString(), this); w->setReadOnly(true); - w->setWordWrap(QTextEdit::WidgetWidth); + w->setWordWrap(TQTextEdit::WidgetWidth); addWidget(w, row,row, 0,3); row++; } @@ -161,9 +161,9 @@ void ToolchainConfigWidget::checkExecutableDone() } _data[i].checkLines = _data[i].process->sout() + _data[i].process->serr(); const Tool::Base *base = _group.base(i); - QString exec = base->baseExecutable(withWine(), outputType()); - if ( base->checkExecutableResult(withWine(), _data[i].checkLines) ) _data[i].label->setText(i18n("\"%1\" found").arg(exec)); - else _data[i].label->setText(i18n("\"%1\" not recognized").arg(exec)); + TQString exec = base->baseExecutable(withWine(), outputType()); + if ( base->checkExecutableResult(withWine(), _data[i].checkLines) ) _data[i].label->setText(i18n("\"%1\" found").tqarg(exec)); + else _data[i].label->setText(i18n("\"%1\" not recognized").tqarg(exec)); break; } } @@ -180,12 +180,12 @@ void ToolchainConfigWidget::checkDevicesDone() _devicesData[i].done = true; break; } - QValueList<const Device::Data *> list; + TQValueList<const Device::Data *> list; for(uint i=0; i<_devicesData.count(); i++) { if ( !_devicesData[i].done ) return; list += _group.getSupportedDevices(_devicesData[i].checkLines.join("\n")); } - _devicesLabel->setText(i18n("Detected (%1)").arg(list.count())); + _devicesLabel->setText(i18n("Detected (%1)").tqarg(list.count())); } bool ToolchainConfigWidget::withWine() const @@ -198,7 +198,7 @@ Tool::OutputExecutableType ToolchainConfigWidget::outputType() const return (_outputType==0 ? Compile::Config::outputExecutableType(_group) : _outputType->currentItem()); } -QString ToolchainConfigWidget::baseExecutable(Tool::Category category) const +TQString ToolchainConfigWidget::baseExecutable(Tool::Category category) const { return _group.base(category)->baseExecutable(withWine(), outputType()); } @@ -226,23 +226,23 @@ void ToolchainConfigWidget::detect() _data[k].checkLines.clear(); _data[k].process = checkExecutableProcess(k); _data[k].command = _data[k].process->prettyCommand(); - connect(_data[k].process, SIGNAL(done(int)), SLOT(checkExecutableDone())); - connect(_data[k].process, SIGNAL(timeout()), SLOT(checkExecutableDone())); - QString exec = baseExecutable(k); - if ( !_data[k].process->start(10000) ) _data[k].label->setText(i18n("\"%1\" not found").arg(exec)); - else _data[k].label->setText(i18n("Detecting \"%1\"...").arg(exec)); + connect(_data[k].process, TQT_SIGNAL(done(int)), TQT_SLOT(checkExecutableDone())); + connect(_data[k].process, TQT_SIGNAL(timeout()), TQT_SLOT(checkExecutableDone())); + TQString exec = baseExecutable(k); + if ( !_data[k].process->start(10000) ) _data[k].label->setText(i18n("\"%1\" not found").tqarg(exec)); + else _data[k].label->setText(i18n("Detecting \"%1\"...").tqarg(exec)); } } if ( _group.checkDevicesCategory()==Tool::Category::Nb_Types ) { - QValueVector<QString> supported = _group.supportedDevices(); - _devicesLabel->setText(i18n("Hardcoded (%1)").arg(supported.count())); + TQValueVector<TQString> supported = _group.supportedDevices(); + _devicesLabel->setText(i18n("Hardcoded (%1)").tqarg(supported.count())); } else { for (uint i=0; i<_devicesData.count(); i++) { delete _devicesData[i].process; _devicesData[i].process = checkDevicesProcess(i); _devicesData[i].command = _devicesData[i].process->prettyCommand(); - connect(_devicesData[i].process, SIGNAL(done(int)), SLOT(checkDevicesDone())); - connect(_devicesData[i].process, SIGNAL(timeout()), SLOT(checkDevicesDone())); + connect(_devicesData[i].process, TQT_SIGNAL(done(int)), TQT_SLOT(checkDevicesDone())); + connect(_devicesData[i].process, TQT_SIGNAL(timeout()), TQT_SLOT(checkDevicesDone())); _devicesData[i].done = false; _devicesData[i].checkLines.clear(); if ( !_devicesData[i].process->start(10000) ) _devicesLabel->setText(i18n("Failed")); @@ -262,11 +262,11 @@ void ToolchainConfigWidget::showDetails() { FOR_EACH(Tool::Category, k) { if ( sender()!=_data[k].button ) continue; - QString s; + TQString s; const Tool::Base *base = _group.base(k); if ( base->checkExecutable() ) { - s += i18n("<qt><b>Command for executable detection:</b><br>%1<br>").arg(_data[k].command); - s += i18n("<b>Version string:</b><br>%1<br></qt>").arg(_data[k].checkLines.join("<br>")); + s += i18n("<qt><b>Command for executable detection:</b><br>%1<br>").tqarg(_data[k].command); + s += i18n("<b>Version string:</b><br>%1<br></qt>").tqarg(_data[k].checkLines.join("<br>")); } else s += i18n("This tool cannot be automatically detected."); MessageBox::text(s, Log::Show); break; @@ -275,10 +275,10 @@ void ToolchainConfigWidget::showDetails() void ToolchainConfigWidget::showDeviceDetails() { - QString s; + TQString s; if ( _group.checkDevicesCategory()==Tool::Category::Nb_Types ) { s += "<qt>"; - QValueVector<QString> supported = _group.supportedDevices(); + TQValueVector<TQString> supported = _group.supportedDevices(); for (uint i=0; i<supported.count(); i++) { if ( i!=0 ) { if ( (i%10)==0 ) s += "<br>"; @@ -290,11 +290,11 @@ void ToolchainConfigWidget::showDeviceDetails() } else { uint nb = _group.nbCheckDevices(); for (uint i=0; i<nb; i++) { - if ( nb==1 ) s += i18n("<qt><b>Command for devices detection:</b><br>%1<br>").arg(_devicesData[i].command); - else s += i18n("<qt><b>Command #%1 for devices detection:</b><br>%2<br>").arg(i+1).arg(_devicesData[i].command); - QString ss = _devicesData[i].checkLines.join("<br>"); - if ( nb==1 ) s += i18n("<b>Device string:</b><br>%1<br>").arg(ss); - else s += i18n("<b>Device string #%1:</b><br>%2<br>").arg(i+1).arg(ss); + if ( nb==1 ) s += i18n("<qt><b>Command for devices detection:</b><br>%1<br>").tqarg(_devicesData[i].command); + else s += i18n("<qt><b>Command #%1 for devices detection:</b><br>%2<br>").tqarg(i+1).tqarg(_devicesData[i].command); + TQString ss = _devicesData[i].checkLines.join("<br>"); + if ( nb==1 ) s += i18n("<b>Device string:</b><br>%1<br>").tqarg(ss); + else s += i18n("<b>Device string #%1:</b><br>%2<br>").tqarg(i+1).tqarg(ss); } } MessageBox::text(s, Log::Show); diff --git a/src/tools/gui/toolchain_config_widget.h b/src/tools/gui/toolchain_config_widget.h index ad7978a..b1e795d 100644 --- a/src/tools/gui/toolchain_config_widget.h +++ b/src/tools/gui/toolchain_config_widget.h @@ -9,8 +9,8 @@ #ifndef TOOLCHAIN_CONFIG_WIDGET_H #define TOOLCHAIN_CONFIG_WIDGET_H -#include <qwidgetstack.h> -#include <qlabel.h> +#include <tqwidgetstack.h> +#include <tqlabel.h> #include <klocale.h> #include <kpushbutton.h> @@ -26,8 +26,9 @@ namespace Tool { class Group; } class ToolchainConfigWidget : public ::ConfigWidget { Q_OBJECT + TQ_OBJECT public: - ToolchainConfigWidget(const Tool::Group &group, QWidget *parent); + ToolchainConfigWidget(const Tool::Group &group, TQWidget *tqparent); virtual ~ToolchainConfigWidget(); const Tool::Group &group() const { return _group; } void init(); @@ -42,7 +43,7 @@ protected: bool withWine() const; Tool::OutputExecutableType outputType() const; virtual void addCustomExecutableOptions(Container *) {} - virtual QString baseExecutable(Tool::Category category) const; + virtual TQString baseExecutable(Tool::Category category) const; virtual ::Process::LineOutput *checkExecutableProcess(Tool::Category category) const; virtual ::Process::LineOutput *checkDevicesProcess(uint i) const; @@ -56,30 +57,30 @@ protected: const Tool::Group &_group; Compile::Config *_config; bool _dirty; - QComboBox *_execType; + TQComboBox *_execType; KeyComboBox<Tool::OutputExecutableType> *_outputType; - QLabel *_devicesLabel; - QMap<Compile::DirectoryType, PURL::DirectoryWidget *> _dirs; + TQLabel *_devicesLabel; + TQMap<Compile::DirectoryType, PURL::DirectoryWidget *> _dirs; class ExecData { public: ExecData() : label(0), button(0), process(0) {} ~ExecData() { delete process; } - QLabel *label; - QString command; - QStringList checkLines; + TQLabel *label; + TQString command; + TQStringList checkLines; KPushButton *button; ::Process::LineOutput *process; }; - QMap<Tool::Category, ExecData> _data; + TQMap<Tool::Category, ExecData> _data; class DevicesData { public: DevicesData() : process(0) {} bool done; - QString command; - QStringList checkLines; + TQString command; + TQStringList checkLines; ::Process::LineOutput *process; }; - QValueVector<DevicesData> _devicesData; + TQValueVector<DevicesData> _devicesData; }; #endif |