From 0aaa8e3fc8f8a1481333b564f0922277c8d8ad59 Mon Sep 17 00:00:00 2001 From: tpearson Date: Thu, 30 Jun 2011 00:15:53 +0000 Subject: TQt4 port piklab This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/piklab@1238822 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/libgui/config_gen.cpp | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'src/libgui/config_gen.cpp') diff --git a/src/libgui/config_gen.cpp b/src/libgui/config_gen.cpp index 036e62e..8ef334d 100644 --- a/src/libgui/config_gen.cpp +++ b/src/libgui/config_gen.cpp @@ -8,8 +8,8 @@ ***************************************************************************/ #include "config_gen.h" -#include -#include +#include +#include #include #include "device_gui.h" @@ -23,44 +23,44 @@ #include "tools/list/tool_list.h" //----------------------------------------------------------------------------- -GeneratorDialog::GeneratorDialog(const QString &title, QWidget *parent, const char *name) - : Dialog(parent, name, true, title, Close|User1, Close, false, QSize(400, 300)) +GeneratorDialog::GeneratorDialog(const TQString &title, TQWidget *tqparent, const char *name) + : Dialog(tqparent, name, true, title, Close|User1, Close, false, TQSize(400, 300)) { - QVBoxLayout *top = new QVBoxLayout(mainWidget(), 10, 10); + TQVBoxLayout *top = new TQVBoxLayout(mainWidget(), 10, 10); - QHBoxLayout *hbox = new QHBoxLayout(top); - QLabel *label = new QLabel(i18n("Device:"), mainWidget()); + TQHBoxLayout *hbox = new TQHBoxLayout(top); + TQLabel *label = new TQLabel(i18n("Device:"), mainWidget()); hbox->addWidget(label); _deviceChooser = new DeviceChooser::Button(false, mainWidget()); - connect(_deviceChooser, SIGNAL(changed()), SLOT(reset())); + connect(_deviceChooser, TQT_SIGNAL(changed()), TQT_SLOT(reset())); hbox->addWidget(_deviceChooser); hbox->addSpacing(20); - label = new QLabel(i18n("Toolchain:"), mainWidget()); + label = new TQLabel(i18n("Toolchain:"), mainWidget()); hbox->addWidget(label); - _configType = new KeyComboBox(mainWidget()); + _configType = new KeyComboBox(mainWidget()); Tool::Lister::ConstIterator it; for (it=Tool::lister().begin(); it!=Tool::lister().end(); ++it) _configType->appendItem(it.key(), it.data()->label()); - connect(_configType->widget(), SIGNAL(activated(int)), SLOT(typeChanged())); + connect(_configType->widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(typeChanged())); hbox->addWidget(_configType->widget()); - label = new QLabel(i18n("Tool Type:"), mainWidget()); + label = new TQLabel(i18n("Tool Type:"), mainWidget()); hbox->addWidget(label); _toolType = new KeyComboBox(mainWidget()); FOR_EACH(PURL::ToolType, type) _toolType->appendItem(type, type.label()); _toolType->fixMinimumWidth(); - connect(_toolType->widget(), SIGNAL(activated(int)), SLOT(compute())); + connect(_toolType->widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(compute())); hbox->addWidget(_toolType->widget()); hbox->addStretch(1); - _hbox = new QHBoxLayout(top); + _hbox = new TQHBoxLayout(top); _text = new SimpleTextEditor(false, PURL::Nb_FileTypes, mainWidget()); _text->setReadOnly(true); top->addWidget(_text); - _warning = new QLabel(mainWidget()); + _warning = new TQLabel(mainWidget()); top->addWidget(_warning); setButtonText(User1, i18n("Copy to clipboard")); @@ -68,9 +68,9 @@ GeneratorDialog::GeneratorDialog(const QString &title, QWidget *parent, const ch void GeneratorDialog::set(const Device::Data *data, const Tool::Group &group, PURL::ToolType stype) { - QString device; + TQString device; if ( data==0 ) { - QValueVector devices = group.supportedDevices(); + TQValueVector devices = group.supportedDevices(); if ( devices.isEmpty() ) return; device = devices[0]; } else device = data->name(); @@ -141,8 +141,8 @@ void GeneratorDialog::slotUser1() } //----------------------------------------------------------------------------- -ConfigGenerator::ConfigGenerator(QWidget *parent) - : GeneratorDialog(i18n("Config Generator"), parent, "config_generator"), _memory(0), _configEditor(0) +ConfigGenerator::ConfigGenerator(TQWidget *tqparent) + : GeneratorDialog(i18n("Config Generator"), tqparent, "config_generator"), _memory(0), _configEditor(0) {} ConfigGenerator::~ConfigGenerator() @@ -159,7 +159,7 @@ void ConfigGenerator::reset() _configEditor = Device::groupui(*data).createConfigEditor(*_memory, mainWidget()); if (_configEditor) { _configEditor->show(); - connect(_configEditor, SIGNAL(modified()), SLOT(compute())); + connect(_configEditor, TQT_SIGNAL(modified()), TQT_SLOT(compute())); _configEditor->updateDisplay(); _hbox->addWidget(_configEditor); } @@ -175,8 +175,8 @@ SourceLine::List ConfigGenerator::generateLines(bool &ok) const } //----------------------------------------------------------------------------- -TemplateGenerator::TemplateGenerator(QWidget *parent) - : GeneratorDialog(i18n("Template Generator"), parent, "template_generator") +TemplateGenerator::TemplateGenerator(TQWidget *tqparent) + : GeneratorDialog(i18n("Template Generator"), tqparent, "template_generator") {} SourceLine::List TemplateGenerator::generateLines(bool &ok) const -- cgit v1.2.3