Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 21 insertions, 21 deletions

diff --git a/tdenewstuff/downloaddialog.cpp b/tdenewstuff/downloaddialog.cpp
index 45e3c1ebb..9a1cb2ee2 100644
--- a/tdenewstuff/downloaddialog.cpp
+++ b/tdenewstuff/downloaddialog.cpp
@@ -156,12 +156,12 @@ void DownloadDialog::init(Engine *engine)
   box->add(d->m_loadingLabel);
   box->addItem(new TQSpacerItem(0, 0, TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
 
-  connect(this, TQT_SIGNAL(aboutToShowPage(TQWidget*)), TQT_SLOT(slotPage(TQWidget*)));
+  connect(this, TQ_SIGNAL(aboutToShowPage(TQWidget*)), TQ_SLOT(slotPage(TQWidget*)));
 
   if(!engine)
   {
     m_loader = new ProviderLoader(this);
-    connect(m_loader, TQT_SIGNAL(providersLoaded(Provider::List*)), TQT_SLOT(slotProviders(Provider::List*)));
+    connect(m_loader, TQ_SIGNAL(providersLoaded(Provider::List*)), TQ_SLOT(slotProviders(Provider::List*)));
   }
 
   m_entries.setAutoDelete(true);
@@ -273,7 +273,7 @@ void DownloadDialog::addProvider(Provider *p)
   ctl->addTab(w_l, i18n("Latest"));
 
   m_curtab = 0;
-  connect(ctl, TQT_SIGNAL(currentChanged(TQWidget *)), TQT_SLOT(slotTab()));
+  connect(ctl, TQ_SIGNAL(currentChanged(TQWidget *)), TQ_SLOT(slotTab()));
 
   TQHBoxLayout *box = new TQHBoxLayout(frame);
   box->add(ctl);
@@ -296,9 +296,9 @@ void DownloadDialog::addProvider(Provider *p)
   d->m_lvtmp_l->addColumn(i18n("Release Date"));
   d->m_lvtmp_l->setSorting(2, false);
 
-  connect(d->m_lvtmp_r, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotSelected()));
-  connect(d->m_lvtmp_d, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotSelected()));
-  connect(d->m_lvtmp_l, TQT_SIGNAL(clicked(TQListViewItem*)), TQT_SLOT(slotSelected()));
+  connect(d->m_lvtmp_r, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotSelected()));
+  connect(d->m_lvtmp_d, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotSelected()));
+  connect(d->m_lvtmp_l, TQ_SIGNAL(clicked(TQListViewItem*)), TQ_SLOT(slotSelected()));
 
   rt = new TQTextBrowser(frame);
   rt->setMinimumWidth(150);
@@ -315,10 +315,10 @@ void DownloadDialog::addProvider(Provider *p)
   vbox->add(de);
   vbox->add(in);
 
-  connect(rt, TQT_SIGNAL(linkClicked(const TQString&)), TQT_SLOT(slotEmail(const TQString&)));
+  connect(rt, TQ_SIGNAL(linkClicked(const TQString&)), TQ_SLOT(slotEmail(const TQString&)));
 
-  connect(in, TQT_SIGNAL(clicked()), TQT_SLOT(slotInstall()));
-  connect(de, TQT_SIGNAL(clicked()), TQT_SLOT(slotDetails()));
+  connect(in, TQ_SIGNAL(clicked()), TQ_SLOT(slotInstall()));
+  connect(de, TQ_SIGNAL(clicked()), TQ_SLOT(slotDetails()));
 
   TQVBoxLayout *box2 = new TQVBoxLayout(w_r);
   box2->add(d->m_lvtmp_r);
@@ -340,7 +340,7 @@ void DownloadDialog::addProvider(Provider *p)
 
   if(m_engine) slotPage(frame);
 
-  TQTimer::singleShot(100, this, TQT_SLOT(slotFinish()));
+  TQTimer::singleShot(100, this, TQ_SLOT(slotFinish()));
 }
 
 void DownloadDialog::slotResult(TDEIO::Job *job)
@@ -583,10 +583,10 @@ void DownloadDialog::slotInstall()
   // in the direct download ability for this to even be considered.
   if (e->payload().url().contains(OPENDESKTOP_REDIRECT_URL)) {
     TDEIO::TransferJob *job = TDEIO::get( KURL( e->payload() ), false, false );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-             TQT_SLOT( slotJobResult( TDEIO::Job * ) ) );
-    connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
-             TQT_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+             TQ_SLOT( slotJobResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+             TQ_SLOT( slotJobData( TDEIO::Job *, const TQByteArray & ) ) );
   }
   else {
     slotInstallPhase2();
@@ -616,7 +616,7 @@ void DownloadDialog::slotInstallPhase2()
     KURL dest = KURL(m_s->downloadDestination(e));
 
     TDEIO::FileCopyJob *job = TDEIO::file_copy(source, dest, -1, true);
-    connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotInstalled(TDEIO::Job*)));
+    connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotInstalled(TDEIO::Job*)));
   }
 }
 
@@ -944,9 +944,9 @@ void DownloadDialog::loadProvider(Provider *p)
     d->m_variants[variantjob] = urlvariants;
     m_data[variantjob] = "";
 
-    connect(variantjob, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
-    connect(variantjob, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
-      TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&)));
+    connect(variantjob, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)));
+    connect(variantjob, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+      TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&)));
   }
 
   if(variants.count() == 0) return;
@@ -963,9 +963,9 @@ void DownloadDialog::loadProvider(Provider *p)
   //m_jobs[job] = p; // not used anymore due to variants
   m_data[job] = "";
 
-  connect(job, TQT_SIGNAL(result(TDEIO::Job*)), TQT_SLOT(slotResult(TDEIO::Job*)));
-  connect(job, TQT_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
-    TQT_SLOT(slotData(TDEIO::Job*, const TQByteArray&)));
+  connect(job, TQ_SIGNAL(result(TDEIO::Job*)), TQ_SLOT(slotResult(TDEIO::Job*)));
+  connect(job, TQ_SIGNAL(data(TDEIO::Job*, const TQByteArray&)),
+    TQ_SLOT(slotData(TDEIO::Job*, const TQByteArray&)));
 }
 
 void DownloadDialog::setType(TQString type)