Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit c679361a50aee162491e7195f2bcfdbbf341dde5)

8 files changed, 34 insertions, 34 deletions

diff --git a/src/tools/c18/gui/c18_ui.cpp b/src/tools/c18/gui/c18_ui.cpp
index 5d0c167..4b38611 100644
--- a/src/tools/c18/gui/c18_ui.cpp
+++ b/src/tools/c18/gui/c18_ui.cpp
@@ -23,7 +23,7 @@ void C18::ConfigWidget::initEntries()
     TQLabel *label = new TQLabel(i18n("Warning level:"), container());
     container()->addWidget(label, row,row, 0,0);
     _warningLevel = new TQComboBox(container());
-    connect(_warningLevel, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
+    connect(_warningLevel, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed()));
     for (uint i=0; i<Config::Nb_WarningLevels; i++)
       _warningLevel->insertItem(i18n(Config::WARNING_LEVEL_LABELS[i]));
     container()->addWidget(_warningLevel, row,row, 1,1);
diff --git a/src/tools/gputils/gui/gputils_ui.cpp b/src/tools/gputils/gui/gputils_ui.cpp
index bab898e..2a912f7 100644
--- a/src/tools/gputils/gui/gputils_ui.cpp
+++ b/src/tools/gputils/gui/gputils_ui.cpp
@@ -24,7 +24,7 @@ void GPUtils::ConfigWidget::initEntries()
     TQLabel *label = new TQLabel(i18n("Warning level:"), container());
     container()->addWidget(label, row,row, 0,0);
     _gpasmWarning = new TQComboBox(container());
-    connect(_gpasmWarning, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
+    connect(_gpasmWarning, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed()));
     for (uint i=0; i<GPUtils::Config::Nb_WarningLevels; i++)
       _gpasmWarning->insertItem(i18n(GPUtils::Config::WARNING_LEVEL_LABELS[i]));
     _gpasmWarning->insertItem(i18n("as in LIST directive"));
diff --git a/src/tools/gui/tool_config_widget.cpp b/src/tools/gui/tool_config_widget.cpp
index b964431..d121bf3 100644
--- a/src/tools/gui/tool_config_widget.cpp
+++ b/src/tools/gui/tool_config_widget.cpp
@@ -38,7 +38,7 @@ ToolConfigWidget::ToolConfigWidget(Project *project)
   _argumentsType = new KComboBox(container);
   for (uint i=0; i<Nb_ArgumentsTypes; i++)
     _argumentsType->insertItem(i18n(ARGUMENTS_TYPE_LABELS[i]), i);
-  connect(_argumentsType, TQT_SIGNAL(activated(int)), TQT_SLOT(updateArguments()));
+  connect(_argumentsType, TQ_SIGNAL(activated(int)), TQ_SLOT(updateArguments()));
   container->addWidget(_argumentsType, 0,0, 1,1);
   label = new TQLabel(i18n("Arguments:"), container);
   container->addWidget(label, 1,1, 0,0);
@@ -46,19 +46,19 @@ ToolConfigWidget::ToolConfigWidget(Project *project)
   _arguments->setReadOnly(true);
   container->addWidget(_arguments, 1,1, 1,2);
   KPushButton *button = new KPushButton(KGuiItem(TQString(), "help"), container);
-  connect(button, TQT_SIGNAL(clicked()), TQT_SIGNAL(displayHelp()));
+  connect(button, TQ_SIGNAL(clicked()), TQ_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, TQT_SIGNAL(changed()), TQT_SLOT(updateArguments()));
-  connect(_argumentsEditor, TQT_SIGNAL(reset()), TQT_SLOT(resetCustomArguments()));
+  connect(_argumentsEditor, TQ_SIGNAL(changed()), TQ_SLOT(updateArguments()));
+  connect(_argumentsEditor, TQ_SIGNAL(reset()), TQ_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, TQT_SIGNAL(changed()), TQT_SLOT(updateArguments()));
+  connect(this, TQ_SIGNAL(changed()), TQ_SLOT(updateArguments()));
 }
 
 void ToolConfigWidget::init(Tool::Category category, const Tool::Group &group)
@@ -87,7 +87,7 @@ PURL::DirectoriesWidget *ToolConfigWidget::createDirectoriesEntry(const TQString
 {
   uint row = container()->numRows();
   PURL::DirectoriesWidget *sdw = new PURL::DirectoriesWidget(text, _project ? _project->directory().path() : TQString(), container());
-  connect(sdw, TQT_SIGNAL(changed()), TQT_SIGNAL(changed()));
+  connect(sdw, TQ_SIGNAL(changed()), TQ_SIGNAL(changed()));
   container()->addWidget(sdw, row,row, 0,2);
   return sdw;
 }
@@ -98,7 +98,7 @@ void ToolConfigWidget::createCustomOptionsEntry()
   TQLabel *label = new TQLabel(i18n("Custom options:"), container());
   container()->addWidget(label, row,row, 0,0);
   _customOptions = new TQLineEdit(container());
-  connect(_customOptions, TQT_SIGNAL(textChanged(const TQString &)), TQT_SIGNAL(changed()));
+  connect(_customOptions, TQ_SIGNAL(textChanged(const TQString &)), TQ_SIGNAL(changed()));
   container()->addWidget(_customOptions, row,row, 1,2);
 }
 
@@ -108,7 +108,7 @@ void ToolConfigWidget::createCustomLibrariesEntry()
   TQLabel *label = new TQLabel(i18n("Custom libraries:"), container());
   container()->addWidget(label, row,row, 0,0);
   _customLibraries = new TQLineEdit(container());
-  connect(_customLibraries, TQT_SIGNAL(textChanged(const TQString &)), TQT_SIGNAL(changed()));
+  connect(_customLibraries, TQ_SIGNAL(textChanged(const TQString &)), TQ_SIGNAL(changed()));
   TQToolTip::add(_customLibraries, i18n("<qt>This values will be placed after the linked objects.</qt>")) ;
   container()->addWidget(_customLibraries, row,row, 1,2);
 }
@@ -119,7 +119,7 @@ void ToolConfigWidget::createHexFormatEntry()
   TQLabel *label = new TQLabel(i18n("Hex file format:"), container());
   container()->addWidget(label, row,row, 0,0);
   _hexFormat = new TQComboBox(container());
-  connect(_hexFormat, TQT_SIGNAL(activated(int)), TQT_SIGNAL(changed()));
+  connect(_hexFormat, TQ_SIGNAL(activated(int)), TQ_SIGNAL(changed()));
   for (uint i=0; i<HexBuffer::Nb_Formats; i++)
     _hexFormat->insertItem(HexBuffer::FORMATS[i]);
   _hexFormat->insertItem(i18n("as in LIST directive"));
diff --git a/src/tools/gui/toolchain_config_center.cpp b/src/tools/gui/toolchain_config_center.cpp
index 6948c3a..3685997 100644
--- a/src/tools/gui/toolchain_config_center.cpp
+++ b/src/tools/gui/toolchain_config_center.cpp
@@ -28,7 +28,7 @@ ToolchainsConfigCenter::ToolchainsConfigCenter(const Tool::Group &sgroup, TQWidg
 
   _titleBox->addStretch(1);
   _infoButton = new KPushButton(KGuiItem(TQString(), "viewmag"), _frame);
-  connect(_infoButton, TQT_SIGNAL(clicked()), TQT_SLOT(showInformationDialog()));
+  connect(_infoButton, TQ_SIGNAL(clicked()), TQ_SLOT(showInformationDialog()));
   _titleBox->addWidget(_infoButton);
 
   TQWidget *current = 0;
@@ -52,7 +52,7 @@ ToolchainsConfigCenter::ToolchainsConfigCenter(const Tool::Group &sgroup, TQWidg
   }
   showPage(current);
   aboutToShowPageSlot(current);
-  connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget *)), TQT_SLOT(aboutToShowPageSlot(TQWidget *)));
+  connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget *)), TQ_SLOT(aboutToShowPageSlot(TQWidget *)));
 }
 
 void ToolchainsConfigCenter::aboutToShowPageSlot(TQWidget *page)
@@ -60,7 +60,7 @@ void ToolchainsConfigCenter::aboutToShowPageSlot(TQWidget *page)
   if ( !_pages.contains(page) ) _infoButton->hide();
   else {
     _infoButton->show();
-    TQTimer::singleShot(0, _pages[page], TQT_SLOT(detect()));
+    TQTimer::singleShot(0, _pages[page], TQ_SLOT(detect()));
   }
 }
 
diff --git a/src/tools/gui/toolchain_config_widget.cpp b/src/tools/gui/toolchain_config_widget.cpp
index 291952f..27302fd 100644
--- a/src/tools/gui/toolchain_config_widget.cpp
+++ b/src/tools/gui/toolchain_config_widget.cpp
@@ -44,7 +44,7 @@ void ToolchainConfigWidget::init()
   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], TQT_SIGNAL(changed()), TQT_SLOT(forceDetect()));
+  connect(_dirs[Compile::DirectoryType::Executable], TQ_SIGNAL(changed()), TQ_SLOT(forceDetect()));
   container->addWidget(_dirs[Compile::DirectoryType::Executable], row,row, 1,3);
   row++;
 
@@ -52,7 +52,7 @@ void ToolchainConfigWidget::init()
   container->addWidget(label, row,row, 0,0);
   _execType = new TQComboBox(container);
   FOR_EACH(Tool::ExecutableType, type) _execType->insertItem(type.label());
-  connect(_execType, TQT_SIGNAL(activated(int)), TQT_SLOT(forceDetect()));
+  connect(_execType, TQ_SIGNAL(activated(int)), TQ_SLOT(forceDetect()));
   container->addWidget(_execType, row,row, 1,2);
   row++;
 
@@ -65,7 +65,7 @@ void ToolchainConfigWidget::init()
     _outputType = new KeyComboBox<Tool::OutputExecutableType>(container);
     FOR_EACH(Tool::OutputExecutableType, type)
       if ( _group.hasOutputExecutableType(type) ) _outputType->appendItem(type, type.label());
-    connect(_outputType->widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(forceDetect()));
+    connect(_outputType->widget(), TQ_SIGNAL(activated(int)), TQ_SLOT(forceDetect()));
     container->addWidget(_outputType->widget(), row,row, 1,1);
     row++;
   }
@@ -80,7 +80,7 @@ void ToolchainConfigWidget::init()
     _data[k].label = new TQLabel(container);
     container->addWidget(_data[k].label, row,row, 1,1);
     _data[k].button = new KPushButton(KGuiItem(TQString(), "viewmag"), container);
-    connect(_data[k].button, TQT_SIGNAL(clicked()), TQT_SLOT(showDetails()));
+    connect(_data[k].button, TQ_SIGNAL(clicked()), TQ_SLOT(showDetails()));
     container->addWidget(_data[k].button, row,row, 2,2);
     row++;
   }
@@ -90,7 +90,7 @@ void ToolchainConfigWidget::init()
   _devicesLabel = new TQLabel(container);
   container->addWidget(_devicesLabel, row,row, 1,1);
   KPushButton *button = new KPushButton(KGuiItem(TQString(), "viewmag"), container);
-  connect(button, TQT_SIGNAL(clicked()), TQT_SLOT(showDeviceDetails()));
+  connect(button, TQ_SIGNAL(clicked()), TQ_SLOT(showDeviceDetails()));
   container->addWidget(button, row,row, 2,2);
   row++;
 
@@ -226,8 +226,8 @@ void ToolchainConfigWidget::detect()
       _data[k].checkLines.clear();
       _data[k].process = checkExecutableProcess(k);
       _data[k].command = _data[k].process->prettyCommand();
-      connect(_data[k].process, TQT_SIGNAL(done(int)), TQT_SLOT(checkExecutableDone()));
-      connect(_data[k].process, TQT_SIGNAL(timeout()), TQT_SLOT(checkExecutableDone()));
+      connect(_data[k].process, TQ_SIGNAL(done(int)), TQ_SLOT(checkExecutableDone()));
+      connect(_data[k].process, TQ_SIGNAL(timeout()), TQ_SLOT(checkExecutableDone()));
       TQString 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));
@@ -241,8 +241,8 @@ void ToolchainConfigWidget::detect()
       delete _devicesData[i].process;
       _devicesData[i].process = checkDevicesProcess(i);
       _devicesData[i].command = _devicesData[i].process->prettyCommand();
-      connect(_devicesData[i].process, TQT_SIGNAL(done(int)), TQT_SLOT(checkDevicesDone()));
-      connect(_devicesData[i].process, TQT_SIGNAL(timeout()), TQT_SLOT(checkDevicesDone()));
+      connect(_devicesData[i].process, TQ_SIGNAL(done(int)), TQ_SLOT(checkDevicesDone()));
+      connect(_devicesData[i].process, TQ_SIGNAL(timeout()), TQ_SLOT(checkDevicesDone()));
       _devicesData[i].done = false;
       _devicesData[i].checkLines.clear();
       if ( !_devicesData[i].process->start(10000) ) _devicesLabel->setText(i18n("Failed"));
diff --git a/src/tools/list/compile_manager.cpp b/src/tools/list/compile_manager.cpp
index 28f7aa6..edf999c 100644
--- a/src/tools/list/compile_manager.cpp
+++ b/src/tools/list/compile_manager.cpp
@@ -39,7 +39,7 @@ bool Compile::Manager::setupFile(Operations op, const TodoItem &item)
   _todo.append(item);
   _action = Compiling;
   _wholeProject = false;
-  TQTimer::singleShot(0, this, TQT_SLOT(start()));
+  TQTimer::singleShot(0, this, TQ_SLOT(start()));
   return true;
 }
 
@@ -74,7 +74,7 @@ bool Compile::Manager::setupProject(Operations op, LinkType type)
   }
   _action = Compiling;
   _wholeProject = true;
-  TQTimer::singleShot(0, this, TQT_SLOT(start()));
+  TQTimer::singleShot(0, this, TQ_SLOT(start()));
   return true;
 }
 
@@ -216,7 +216,7 @@ void Compile::Manager::start()
   }
   if ( _operations & Clean ) {
     _base->files(0).onlyExistingFiles().cleanGenerated();
-    TQTimer::singleShot(0, this, TQT_SLOT(start()));
+    TQTimer::singleShot(0, this, TQ_SLOT(start()));
     return;
   }
   if ( !_base->start() ) {
@@ -249,7 +249,7 @@ void Compile::Manager::processDone()
     FileData::List list = _base->files(0).onlyExistingFiles();
     FileData::List::iterator it;
     for (it=list.begin(); it!=list.end(); ++it) emit updateFile(*it);
-    TQTimer::singleShot(0, this, TQT_SLOT(start()));
+    TQTimer::singleShot(0, this, TQ_SLOT(start()));
   }
 }
 
diff --git a/src/tools/list/compile_process.cpp b/src/tools/list/compile_process.cpp
index b19bc54..aff7c7c 100644
--- a/src/tools/list/compile_process.cpp
+++ b/src/tools/list/compile_process.cpp
@@ -70,7 +70,7 @@ void Compile::FileData::List::cleanGenerated() const
 Compile::LogWidget::LogWidget(TQWidget *parent)
   : Log::Widget(parent, "compile_log")
 {
-  connect(this, TQT_SIGNAL(clicked(int, int)), TQT_SLOT(lineClicked(int)));
+  connect(this, TQ_SIGNAL(clicked(int, int)), TQ_SLOT(lineClicked(int)));
 }
 
 void Compile::LogWidget::clear()
@@ -124,10 +124,10 @@ bool Compile::BaseProcess::start()
   _stderr = TQString();
   delete _process;
   _process = new ::Process::LineSignal;
-  connect(_process, TQT_SIGNAL(done(int)), TQT_SLOT(done(int)));
-  connect(_process, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()));
-  connect(_process, TQT_SIGNAL(logStdoutLine(const TQString &)), TQT_SLOT(logStdoutLine(const TQString &)));
-  connect(_process, TQT_SIGNAL(logStderrLine(const TQString &)), TQT_SLOT(logStderrLine(const TQString &)));
+  connect(_process, TQ_SIGNAL(done(int)), TQ_SLOT(done(int)));
+  connect(_process, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()));
+  connect(_process, TQ_SIGNAL(logStdoutLine(const TQString &)), TQ_SLOT(logStdoutLine(const TQString &)));
+  connect(_process, TQ_SIGNAL(logStderrLine(const TQString &)), TQ_SLOT(logStderrLine(const TQString &)));
   _process->setWorkingDirectory(directory().path());
   setupProcess();
   _manager->log(Log::LineType::Command, _process->arguments().join(" "));
diff --git a/src/tools/list/tools_config_widget.cpp b/src/tools/list/tools_config_widget.cpp
index 1ced475..a6b853a 100644
--- a/src/tools/list/tools_config_widget.cpp
+++ b/src/tools/list/tools_config_widget.cpp
@@ -47,7 +47,7 @@ ToolsConfigWidget::ToolsConfigWidget(Project *project, TQWidget *parent)
   Tool::Lister::ConstIterator it;
   for (it=Tool::lister().begin(); it!=Tool::lister().end(); ++it)
     _tool->appendItem(it.key(), it.data()->label());
-  connect(_tool->widget(), TQT_SIGNAL(activated(int)), TQT_SLOT(toolChanged()));
+  connect(_tool->widget(), TQ_SIGNAL(activated(int)), TQ_SLOT(toolChanged()));
   addWidget(_tool->widget(), row,row, 1,1);
   label = new TQLabel(i18n("Output type:"), this);
   addWidget(label, row,row, 2,2);
@@ -71,7 +71,7 @@ ToolsConfigWidget::ToolsConfigWidget(Project *project, TQWidget *parent)
       ToolConfigWidget *cw = static_cast<const Tool::GroupUI *>(it.data()->gui())->createConfigWidget(category, project);
       Q_ASSERT(cw);
       _stacks[category]->appendItem(it.key(), cw);
-      connect(cw, TQT_SIGNAL(displayHelp()), TQT_SLOT(displayHelp()));
+      connect(cw, TQ_SIGNAL(displayHelp()), TQ_SLOT(displayHelp()));
     }
   }
   _customWidget = new TQWidget(_mainStack);