Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

17 files changed, 39 insertions, 39 deletions

diff --git a/src/translators/alexandriaimporter.cpp b/src/translators/alexandriaimporter.cpp
index 5a2d25b..3d5215f 100644
--- a/src/translators/alexandriaimporter.cpp
+++ b/src/translators/alexandriaimporter.cpp
@@ -65,7 +65,7 @@ Tellico::Data::CollPtr AlexandriaImporter::collection() {
 
   ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true);
   item.setTotalSteps(numFiles);
-  connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel()));
+  connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel()));
   ProgressItem::Done done(this);
 
   TQStringList covers;
diff --git a/src/translators/amcimporter.cpp b/src/translators/amcimporter.cpp
index fb03b64..215bc0e 100644
--- a/src/translators/amcimporter.cpp
+++ b/src/translators/amcimporter.cpp
@@ -72,7 +72,7 @@ Tellico::Data::CollPtr AMCImporter::collection() {
 
   ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true);
   item.setTotalSteps(f->size());
-  connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel()));
+  connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel()));
   ProgressItem::Done done(this);
 
   m_coll = new Data::VideoCollection(true);
diff --git a/src/translators/audiofileimporter.cpp b/src/translators/audiofileimporter.cpp
index a30c6c4..81efa53 100644
--- a/src/translators/audiofileimporter.cpp
+++ b/src/translators/audiofileimporter.cpp
@@ -70,7 +70,7 @@ Tellico::Data::CollPtr AudioFileImporter::collection() {
 
   ProgressItem& item = ProgressManager::self()->newProgressItem(this, i18n("Scanning audio files..."), true);
   item.setTotalSteps(100);
-  connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel()));
+  connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel()));
   ProgressItem::Done done(this);
 
   // TODO: allow remote audio file importing
@@ -350,7 +350,7 @@ TQWidget* AudioFileImporter::widget(TQWidget* parent_, const char* name_) {
   m_addFilePath = new TQCheckBox(i18n("Include file &location"), box);
   TQWhatsThis::add(m_addFilePath, i18n("If checked, the file names for each track are added to the entries."));
   m_addFilePath->setChecked(false);
-  connect(m_addFilePath, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotAddFileToggled(bool)));
+  connect(m_addFilePath, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotAddFileToggled(bool)));
 
   m_addBitrate = new TQCheckBox(i18n("Include &bitrate"), box);
   TQWhatsThis::add(m_addBitrate, i18n("If checked, the bitrate for each track is added to the entries."));
diff --git a/src/translators/bibteximporter.cpp b/src/translators/bibteximporter.cpp
index d3668d4..e8c9709 100644
--- a/src/translators/bibteximporter.cpp
+++ b/src/translators/bibteximporter.cpp
@@ -62,7 +62,7 @@ Tellico::Data::CollPtr BibtexImporter::collection() {
 
   ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true);
   item.setTotalSteps(urls().count() * 100);
-  connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel()));
+  connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel()));
   ProgressItem::Done done(this);
 
   bool useUTF8 = m_widget && m_readUTF8->isChecked();
diff --git a/src/translators/bibtexmlimporter.cpp b/src/translators/bibtexmlimporter.cpp
index ce50ee1..e95b910 100644
--- a/src/translators/bibtexmlimporter.cpp
+++ b/src/translators/bibtexmlimporter.cpp
@@ -56,7 +56,7 @@ void BibtexmlImporter::loadDomDocument() {
 
   ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true);
   item.setTotalSteps(count);
-  connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel()));
+  connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel()));
   ProgressItem::Done done(this);
 
   for(uint j = 0; !m_cancelled && j < entryelems.count(); ++j) {
diff --git a/src/translators/csvexporter.cpp b/src/translators/csvexporter.cpp
index 301f0e5..b89c220 100644
--- a/src/translators/csvexporter.cpp
+++ b/src/translators/csvexporter.cpp
@@ -145,8 +145,8 @@ TQWidget* CSVExporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
   m_editOther->setEnabled(m_radioOther->isChecked());
   TQWhatsThis::add(m_editOther, i18n("A custom string, such as a colon, may be used as a delimiter."));
   m_delimiterGroupLayout->addWidget(m_editOther, 1, 2);
-  TQObject::connect(m_radioOther, TQT_SIGNAL(toggled(bool)),
-                   m_editOther, TQT_SLOT(setEnabled(bool)));
+  TQObject::connect(m_radioOther, TQ_SIGNAL(toggled(bool)),
+                   m_editOther, TQ_SLOT(setEnabled(bool)));
 
   if(m_delimiter == TQChar(',')) {
     m_radioComma->setChecked(true);
diff --git a/src/translators/csvimporter.cpp b/src/translators/csvimporter.cpp
index 57067e5..adc1b88 100644
--- a/src/translators/csvimporter.cpp
+++ b/src/translators/csvimporter.cpp
@@ -189,7 +189,7 @@ Tellico::Data::CollPtr CSVImporter::collection() {
 
   ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true);
   item.setTotalSteps(numLines);
-  connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel()));
+  connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel()));
   ProgressItem::Done done(this);
 
   uint j = 0;
@@ -253,14 +253,14 @@ TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) {
   m_comboColl = new GUI::CollectionTypeCombo(box);
   lab->setBuddy(m_comboColl);
   TQWhatsThis::add(m_comboColl, i18n("Select the type of collection being imported."));
-  connect(m_comboColl, TQT_SIGNAL(activated(int)), TQT_SLOT(slotTypeChanged()));
+  connect(m_comboColl, TQ_SIGNAL(activated(int)), TQ_SLOT(slotTypeChanged()));
   // need a spacer
   TQWidget* w = new TQWidget(box);
   box->setStretchFactor(w, 1);
 
   m_checkFirstRowHeader = new TQCheckBox(i18n("&First row contains field titles"), group);
   TQWhatsThis::add(m_checkFirstRowHeader, i18n("If checked, the first row is used as field titles."));
-  connect(m_checkFirstRowHeader, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotFirstRowHeader(bool)));
+  connect(m_checkFirstRowHeader, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotFirstRowHeader(bool)));
 
   TQHBox* hbox2 = new TQHBox(group);
   m_delimiterGroup = new TQButtonGroup(0, TQt::Vertical, i18n("Delimiter"), hbox2);
@@ -268,7 +268,7 @@ TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) {
   m_delimiterGroupLayout->setAlignment(TQt::AlignTop);
   TQWhatsThis::add(m_delimiterGroup, i18n("In addition to a comma, other characters may be used as "
                                          "a delimiter, separating each value in the file."));
-  connect(m_delimiterGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotDelimiter()));
+  connect(m_delimiterGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotDelimiter()));
 
   m_radioComma = new TQRadioButton(m_delimiterGroup);
   m_radioComma->setText(i18n("&Comma"));
@@ -297,9 +297,9 @@ TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) {
   m_editOther->setMaxLength(1);
   TQWhatsThis::add(m_editOther, i18n("A custom string, such as a colon, may be used as a delimiter."));
   m_delimiterGroupLayout->addWidget(m_editOther, 2, 2);
-  connect(m_radioOther, TQT_SIGNAL(toggled(bool)),
-          m_editOther, TQT_SLOT(setEnabled(bool)));
-  connect(m_editOther, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(slotDelimiter()));
+  connect(m_radioOther, TQ_SIGNAL(toggled(bool)),
+          m_editOther, TQ_SLOT(setEnabled(bool)));
+  connect(m_editOther, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(slotDelimiter()));
 
   w = new TQWidget(hbox2);
   hbox2->setStretchFactor(w, 1);
@@ -313,8 +313,8 @@ TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) {
   m_table->setReadOnly(true);
   m_table->setMinimumHeight(m_widget->fontMetrics().lineSpacing() * 8);
   TQWhatsThis::add(m_table, i18n("The table shows up to the first five lines of the CSV file."));
-  connect(m_table, TQT_SIGNAL(currentChanged(int, int)), TQT_SLOT(slotCurrentChanged(int, int)));
-  connect(m_table->horizontalHeader(), TQT_SIGNAL(clicked(int)), TQT_SLOT(slotHeaderClicked(int)));
+  connect(m_table, TQ_SIGNAL(currentChanged(int, int)), TQ_SLOT(slotCurrentChanged(int, int)));
+  connect(m_table->horizontalHeader(), TQ_SIGNAL(clicked(int)), TQ_SLOT(slotHeaderClicked(int)));
 
   TQWidget* hbox = new TQWidget(group);
   TQHBoxLayout* hlay = new TQHBoxLayout(hbox, 5);
@@ -326,7 +326,7 @@ TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) {
   m_colSpinBox = new KIntSpinBox(hbox);
   hlay->addWidget(m_colSpinBox);
   m_colSpinBox->setMinValue(1);
-  connect(m_colSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotSelectColumn(int)));
+  connect(m_colSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotSelectColumn(int)));
   lab->setBuddy(m_colSpinBox);
   hlay->addSpacing(10);
 
@@ -334,14 +334,14 @@ TQWidget* CSVImporter::widget(TQWidget* parent_, const char* name_) {
   hlay->addWidget(lab);
   m_comboField = new KComboBox(hbox);
   hlay->addWidget(m_comboField);
-  connect(m_comboField, TQT_SIGNAL(activated(int)), TQT_SLOT(slotFieldChanged(int)));
+  connect(m_comboField, TQ_SIGNAL(activated(int)), TQ_SLOT(slotFieldChanged(int)));
   lab->setBuddy(m_comboField);
   hlay->addSpacing(10);
 
   m_setColumnBtn = new KPushButton(i18n("&Assign Field"), hbox);
   hlay->addWidget(m_setColumnBtn);
   m_setColumnBtn->setIconSet(SmallIconSet(TQString::fromLatin1("apply")));
-  connect(m_setColumnBtn, TQT_SIGNAL(clicked()), TQT_SLOT(slotSetColumnTitle()));
+  connect(m_setColumnBtn, TQ_SIGNAL(clicked()), TQ_SLOT(slotSetColumnTitle()));
   hlay->addStretch(10);
 
   l->addStretch(1);
diff --git a/src/translators/filelistingimporter.cpp b/src/translators/filelistingimporter.cpp
index e0a6c46..48d9d99 100644
--- a/src/translators/filelistingimporter.cpp
+++ b/src/translators/filelistingimporter.cpp
@@ -62,7 +62,7 @@ Tellico::Data::CollPtr FileListingImporter::collection() {
 
   ProgressItem& item = ProgressManager::self()->newProgressItem(this, i18n("Scanning files..."), true);
   item.setTotalSteps(100);
-  connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel()));
+  connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel()));
   ProgressItem::Done done(this);
 
   // going to assume only one volume will ever be imported
@@ -71,8 +71,8 @@ Tellico::Data::CollPtr FileListingImporter::collection() {
   m_job = m_recursive->isChecked()
           ? TDEIO::listRecursive(url(), true, false)
           : TDEIO::listDir(url(), true, false);
-  connect(m_job, TQT_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)),
-          TQT_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&)));
+  connect(m_job, TQ_SIGNAL(entries(TDEIO::Job*, const TDEIO::UDSEntryList&)),
+          TQ_SLOT(slotEntries(TDEIO::Job*, const TDEIO::UDSEntryList&)));
 
   if(!TDEIO::NetAccess::synchronousRun(m_job, Kernel::self()->widget()) || m_cancelled) {
     return 0;
diff --git a/src/translators/freedbimporter.cpp b/src/translators/freedbimporter.cpp
index f5e65bc..0765433 100644
--- a/src/translators/freedbimporter.cpp
+++ b/src/translators/freedbimporter.cpp
@@ -340,7 +340,7 @@ void FreeDBImporter::readCache() {
 
   ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true);
   item.setTotalSteps(numFiles);
-  connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel()));
+  connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel()));
   ProgressItem::Done done(this);
 
   uint step = 1;
@@ -509,7 +509,7 @@ TQWidget* FreeDBImporter::widget(TQWidget* parent_, const char* name_/*=0*/) {
   m_buttonGroup->setExclusive(true);
   m_buttonGroup->insert(m_radioCDROM);
   m_buttonGroup->insert(m_radioCache);
-  connect(m_buttonGroup, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotClicked(int)));
+  connect(m_buttonGroup, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotClicked(int)));
 
   l->addWidget(bigbox);
   l->addStretch(1);
diff --git a/src/translators/gcfilmsimporter.cpp b/src/translators/gcfilmsimporter.cpp
index b1ad0c3..8949133 100644
--- a/src/translators/gcfilmsimporter.cpp
+++ b/src/translators/gcfilmsimporter.cpp
@@ -49,7 +49,7 @@ Tellico::Data::CollPtr GCfilmsImporter::collection() {
 
   ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true);
   item.setTotalSteps(100);
-  connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel()));
+  connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel()));
   ProgressItem::Done done(this);
 
   TQString str = text();
diff --git a/src/translators/griffithimporter.cpp b/src/translators/griffithimporter.cpp
index 7bf3b08..64b5558 100644
--- a/src/translators/griffithimporter.cpp
+++ b/src/translators/griffithimporter.cpp
@@ -53,9 +53,9 @@ Tellico::Data::CollPtr GriffithImporter::collection() {
   }
 
   m_process = new TDEProcess();
-  connect(m_process, TQT_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQT_SLOT(slotData(TDEProcess*, char*, int)));
-  connect(m_process, TQT_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQT_SLOT(slotError(TDEProcess*, char*, int)));
-  connect(m_process, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SLOT(slotProcessExited(TDEProcess*)));
+  connect(m_process, TQ_SIGNAL(receivedStdout(TDEProcess*, char*, int)), TQ_SLOT(slotData(TDEProcess*, char*, int)));
+  connect(m_process, TQ_SIGNAL(receivedStderr(TDEProcess*, char*, int)), TQ_SLOT(slotError(TDEProcess*, char*, int)));
+  connect(m_process, TQ_SIGNAL(processExited(TDEProcess*)), TQ_SLOT(slotProcessExited(TDEProcess*)));
   *m_process << python << griffith;
   if(!m_process->start(TDEProcess::Block, TDEProcess::AllOutput)) {
     myDebug() << "ExecExternalFetcher::startSearch() - process failed to start" << endl;
diff --git a/src/translators/htmlexporter.cpp b/src/translators/htmlexporter.cpp
index c6aee74..4fc30a4 100644
--- a/src/translators/htmlexporter.cpp
+++ b/src/translators/htmlexporter.cpp
@@ -121,7 +121,7 @@ bool HTMLExporter::exec() {
   if(options() & ExportProgress) {
     ProgressItem& item = ProgressManager::self()->newProgressItem(this, TQString(), true);
     item.setTotalSteps(100);
-    connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel()));
+    connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel()));
   }
   // ok if not ExportProgress, no worries
   ProgressItem::Done done(this);
diff --git a/src/translators/pdfimporter.cpp b/src/translators/pdfimporter.cpp
index e2b4c8e..e8a45be 100644
--- a/src/translators/pdfimporter.cpp
+++ b/src/translators/pdfimporter.cpp
@@ -56,7 +56,7 @@ Tellico::Data::CollPtr PDFImporter::collection() {
 
   ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true);
   item.setTotalSteps(urls().count());
-  connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel()));
+  connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel()));
   ProgressItem::Done done(this);
   const bool showProgress = options() & ImportProgress;
 
diff --git a/src/translators/risimporter.cpp b/src/translators/risimporter.cpp
index 0158708..f2bda6f 100644
--- a/src/translators/risimporter.cpp
+++ b/src/translators/risimporter.cpp
@@ -150,7 +150,7 @@ Tellico::Data::CollPtr RISImporter::collection() {
 
   ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true);
   item.setTotalSteps(urls().count() * 100);
-  connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel()));
+  connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel()));
   ProgressItem::Done done(this);
 
   int count = 0;
diff --git a/src/translators/tellicoimporter.cpp b/src/translators/tellicoimporter.cpp
index 35a9482..632f11a 100644
--- a/src/translators/tellicoimporter.cpp
+++ b/src/translators/tellicoimporter.cpp
@@ -97,7 +97,7 @@ Tellico::Data::CollPtr TellicoImporter::collection() {
 void TellicoImporter::loadXMLData(const TQByteArray& data_, bool loadImages_) {
   ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true);
   item.setTotalSteps(100);
-  connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel()));
+  connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel()));
   ProgressItem::Done done(this);
 
   TQDomDocument dom;
@@ -872,7 +872,7 @@ void TellicoImporter::loadZipData() {
 
   if(m_images.isEmpty()) {
     // give it some time
-    TQTimer::singleShot(3000, this, TQT_SLOT(deleteLater()));
+    TQTimer::singleShot(3000, this, TQ_SLOT(deleteLater()));
   }
 }
 
@@ -890,7 +890,7 @@ bool TellicoImporter::loadImage(const TQString& id_) {
   m_images.remove(id_);
   if(m_images.isEmpty()) {
     // give it some time
-    TQTimer::singleShot(3000, this, TQT_SLOT(deleteLater()));
+    TQTimer::singleShot(3000, this, TQ_SLOT(deleteLater()));
   }
   return !newID.isEmpty();
 }
diff --git a/src/translators/tellicosaximporter.cpp b/src/translators/tellicosaximporter.cpp
index 4adc6f2..fe9a070 100644
--- a/src/translators/tellicosaximporter.cpp
+++ b/src/translators/tellicosaximporter.cpp
@@ -98,7 +98,7 @@ Tellico::Data::CollPtr TellicoSaxImporter::collection() {
 void TellicoSaxImporter::loadXMLData(const TQByteArray& data_, bool loadImages_) {
   ProgressItem& item = ProgressManager::self()->newProgressItem(this, progressLabel(), true);
   item.setTotalSteps(data_.size());
-  connect(&item, SIGNAL(signalCancelled(ProgressItem*)), SLOT(slotCancel()));
+  connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel()));
   ProgressItem::Done done(this);
 
   const bool showProgress = options() & ImportProgress;
@@ -258,7 +258,7 @@ void TellicoSaxImporter::loadZipData() {
 
   if(m_images.isEmpty()) {
     // give it some time
-    TQTimer::singleShot(3000, this, SLOT(deleteLater()));
+    TQTimer::singleShot(3000, this, TQ_SLOT(deleteLater()));
   }
 }
 
@@ -280,7 +280,7 @@ bool TellicoSaxImporter::loadImage(const TQString& id_) {
   m_images.remove(id_);
   if(m_images.isEmpty()) {
     // give it some time
-    TQTimer::singleShot(3000, this, SLOT(deleteLater()));
+    TQTimer::singleShot(3000, this, TQ_SLOT(deleteLater()));
   }
   return !newID.isEmpty();
 }
diff --git a/src/translators/tellicozipexporter.cpp b/src/translators/tellicozipexporter.cpp
index 863d78e..c546769 100644
--- a/src/translators/tellicozipexporter.cpp
+++ b/src/translators/tellicozipexporter.cpp
@@ -49,7 +49,7 @@ bool TellicoZipExporter::exec() {
   // TODO: maybe need label?
   ProgressItem& item = ProgressManager::self()->newProgressItem(this, TQString(), true);
   item.setTotalSteps(100);
-  connect(&item, TQT_SIGNAL(signalCancelled(ProgressItem*)), TQT_SLOT(slotCancel()));
+  connect(&item, TQ_SIGNAL(signalCancelled(ProgressItem*)), TQ_SLOT(slotCancel()));
   ProgressItem::Done done(this);
 
   TellicoXMLExporter exp;