Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

8 files changed, 72 insertions, 72 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)
diff --git a/tdenewstuff/engine.cpp b/tdenewstuff/engine.cpp
index 1427f7eb7..5d843afeb 100644
--- a/tdenewstuff/engine.cpp
+++ b/tdenewstuff/engine.cpp
@@ -84,8 +84,8 @@ void Engine::download()
   kdDebug() << "Engine::download()" << endl;
 
   connect( mProviderLoader,
-           TQT_SIGNAL( providersLoaded( Provider::List * ) ),
-           TQT_SLOT( getMetaInformation( Provider::List * ) ) );
+           TQ_SIGNAL( providersLoaded( Provider::List * ) ),
+           TQ_SLOT( getMetaInformation( Provider::List * ) ) );
   mProviderLoader->load( mType, mProviderList );
 }
 
@@ -106,10 +106,10 @@ void Engine::getMetaInformation( Provider::List *providers )
     if ( p->downloadUrl().isEmpty() ) continue;
 
     TDEIO::TransferJob *job = TDEIO::get( p->downloadUrl(), false, false );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-             TQT_SLOT( slotNewStuffJobResult( TDEIO::Job * ) ) );
-    connect( job, TQT_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
-             TQT_SLOT( slotNewStuffJobData( TDEIO::Job *, const TQByteArray & ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+             TQ_SLOT( slotNewStuffJobResult( TDEIO::Job * ) ) );
+    connect( job, TQ_SIGNAL( data( TDEIO::Job *, const TQByteArray & ) ),
+             TQ_SLOT( slotNewStuffJobData( TDEIO::Job *, const TQByteArray & ) ) );
 
     mNewStuffJobData.insert( job, "" );
     mProviderJobs[ job ] = p;
@@ -218,8 +218,8 @@ void Engine::download( Entry *entry )
   kdDebug() << "  DESTINATION: " << destination.url() << endl;
 
   TDEIO::FileCopyJob *job = TDEIO::file_copy( source, destination, -1, true );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotDownloadJobResult( TDEIO::Job * ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotDownloadJobResult( TDEIO::Job * ) ) );
 }
 
 void Engine::slotDownloadJobResult( TDEIO::Job *job )
@@ -248,8 +248,8 @@ void Engine::upload(const TQString &fileName, const TQString &previewName )
   mPreviewFile = previewName;
 
   connect( mProviderLoader,
-           TQT_SIGNAL( providersLoaded( Provider::List * ) ),
-           TQT_SLOT( selectUploadProvider( Provider::List * ) ) );
+           TQ_SIGNAL( providersLoaded( Provider::List * ) ),
+           TQ_SLOT( selectUploadProvider( Provider::List * ) ) );
   mProviderLoader->load( mType );
 }
 
@@ -340,8 +340,8 @@ void Engine::upload( Entry *entry )
       destination.setFileName( fi.fileName() );
 
       TDEIO::FileCopyJob *job = TDEIO::file_copy( KURL::fromPathOrURL( mUploadFile ), destination );
-      connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ),
-               TQT_SLOT( slotUploadPayloadJobResult( TDEIO::Job * ) ) );
+      connect( job, TQ_SIGNAL( result( TDEIO::Job * ) ),
+               TQ_SLOT( slotUploadPayloadJobResult( TDEIO::Job * ) ) );
     } else {
       emit uploadFinished( false );
     }
@@ -402,8 +402,8 @@ void Engine::slotUploadPayloadJobResult( TDEIO::Job *job )
   previewDestination.setFileName( fi.fileName() );
 
   TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mPreviewFile ), previewDestination );
-  connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotUploadPreviewJobResult( TDEIO::Job * ) ) );
+  connect( newJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotUploadPreviewJobResult( TDEIO::Job * ) ) );
 }
 
 void Engine::slotUploadPreviewJobResult( TDEIO::Job *job )
@@ -421,8 +421,8 @@ void Engine::slotUploadPreviewJobResult( TDEIO::Job *job )
   metaDestination.setFileName( fi.fileName() );
 
   TDEIO::FileCopyJob *newJob = TDEIO::file_copy( KURL::fromPathOrURL( mUploadMetaFile ), metaDestination );
-  connect( newJob, TQT_SIGNAL( result( TDEIO::Job * ) ),
-           TQT_SLOT( slotUploadMetaJobResult( TDEIO::Job * ) ) );
+  connect( newJob, TQ_SIGNAL( result( TDEIO::Job * ) ),
+           TQ_SLOT( slotUploadMetaJobResult( TDEIO::Job * ) ) );
 }
 
 void Engine::slotUploadMetaJobResult( TDEIO::Job *job )
diff --git a/tdenewstuff/ghns.cpp b/tdenewstuff/ghns.cpp
index 3217de80e..7a42ce098 100644
--- a/tdenewstuff/ghns.cpp
+++ b/tdenewstuff/ghns.cpp
@@ -51,7 +51,7 @@ GhnsWidget::GhnsWidget()
 
   TQPushButton *button = new TQPushButton( "Wallpapers", this );
   topLayout->addWidget( button );
-  connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( downloadWallpapers() ) );
+  connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( downloadWallpapers() ) );
 
   topLayout->addSpacing( 5 );
 
@@ -61,7 +61,7 @@ GhnsWidget::GhnsWidget()
 
   TQPushButton *closeButton = new TQPushButton( "Close", this );
   buttonLayout->addWidget( closeButton );
-  connect( closeButton, TQT_SIGNAL( clicked() ), kapp, TQT_SLOT( quit() ) );
+  connect( closeButton, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) );
 }
 
 GhnsWidget::~GhnsWidget()
diff --git a/tdenewstuff/knewstuffbutton.cpp b/tdenewstuff/knewstuffbutton.cpp
index 3baa83397..529573547 100644
--- a/tdenewstuff/knewstuffbutton.cpp
+++ b/tdenewstuff/knewstuffbutton.cpp
@@ -53,7 +53,7 @@ Button::Button(TQWidget* parent, const char* name)
 void Button::init()
 {
     setIconSet(SmallIconSet("knewstuff"));
-    connect(this, TQT_SIGNAL(clicked()), TQT_SLOT(showDialog()));
+    connect(this, TQ_SIGNAL(clicked()), TQ_SLOT(showDialog()));
 }
 
 void Button::setButtonText(const TQString& what)
diff --git a/tdenewstuff/knewstuffsecure.cpp b/tdenewstuff/knewstuffsecure.cpp
index 0f95c8c0c..d2c81ae35 100644
--- a/tdenewstuff/knewstuffsecure.cpp
+++ b/tdenewstuff/knewstuffsecure.cpp
@@ -37,7 +37,7 @@ TDENewStuffSecure::TDENewStuffSecure(const TQString &type,  TQWidget *parentWidg
  : TDENewStuff(type, parentWidget)
 {
   m_tempDir = 0L;
-  connect(engine(), TQT_SIGNAL(uploadFinished(bool)), TQT_SLOT(slotUploadFinished(bool)));
+  connect(engine(), TQ_SIGNAL(uploadFinished(bool)), TQ_SLOT(slotUploadFinished(bool)));
 }
 
 
@@ -74,7 +74,7 @@ bool TDENewStuffSecure::install(const TQString &fileName)
       else
       {
          m_tarName.prepend(m_tempDir->name());
-         connect(Security::ref(), TQT_SIGNAL(validityResult(int)), this, TQT_SLOT(slotValidated(int)));
+         connect(Security::ref(), TQ_SIGNAL(validityResult(int)), this, TQ_SLOT(slotValidated(int)));
          Security::ref()->checkValidity(m_tarName);
       }
   } else
@@ -154,7 +154,7 @@ void TDENewStuffSecure::slotValidated(int result)
     cfg->sync();
   }
   removeTempDirectory();
-  disconnect(Security::ref(), TQT_SIGNAL(validityResult(int)), this, TQT_SLOT(slotValidated(int)));
+  disconnect(Security::ref(), TQ_SIGNAL(validityResult(int)), this, TQ_SLOT(slotValidated(int)));
 }
 
 void TDENewStuffSecure::downloadResource()
@@ -173,7 +173,7 @@ bool TDENewStuffSecure::createUploadFile(const TQString &fileName)
 
 void TDENewStuffSecure::uploadResource(const TQString& fileName)
 {
-  connect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int)));
+  connect(Security::ref(), TQ_SIGNAL(fileSigned(int)), this, TQ_SLOT(slotFileSigned(int)));
   removeTempDirectory();
   m_tempDir = new KTempDir();
   m_tempDir->setAutoDelete(true);
@@ -194,7 +194,7 @@ void TDENewStuffSecure::slotFileSigned(int result)
     {
       if (KMessageBox::warningContinueCancel(parentWidget(), i18n("There are no keys usable for signing or you did not entered the correct passphrase.\nProceed without signing the resource?")) == KMessageBox::Cancel)
       {
-        disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int)));
+        disconnect(Security::ref(), TQ_SIGNAL(fileSigned(int)), this, TQ_SLOT(slotFileSigned(int)));
         removeTempDirectory();
         return;    
       }
@@ -217,7 +217,7 @@ void TDENewStuffSecure::slotFileSigned(int result)
     tar.close();
     TDEIO::NetAccess::file_move(KURL::fromPathOrURL(m_signedFileName + ".signed"), KURL::fromPathOrURL(m_signedFileName), -1, true);
     TDENewStuff::upload(m_signedFileName, TQString::null);
-    disconnect(Security::ref(), TQT_SIGNAL(fileSigned(int)), this, TQT_SLOT(slotFileSigned(int)));
+    disconnect(Security::ref(), TQ_SIGNAL(fileSigned(int)), this, TQ_SLOT(slotFileSigned(int)));
   }
 }
 
diff --git a/tdenewstuff/provider.cpp b/tdenewstuff/provider.cpp
index 862f31ef0..8247aa40f 100644
--- a/tdenewstuff/provider.cpp
+++ b/tdenewstuff/provider.cpp
@@ -213,10 +213,10 @@ void Provider::parseDomElement( const TQDomElement &element )
     kdDebug() << "Provider::parseDomElement(): contentTypeUrl: " << contentTypeUrl << endl;
 
     TDEIO::TransferJob *job = TDEIO::get( KURL( contentTypeUrl ), 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 & ) ) );
   }
 }
 
@@ -365,12 +365,12 @@ void ProviderLoader::load( const TQString &type, const TQString &providersList )
   kdDebug() << "ProviderLoader::load(): providersUrl: " << providersUrl << endl;
 
   TDEIO::TransferJob *job = TDEIO::get( KURL( providersUrl ), 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, TQT_SIGNAL( percent (TDEIO::Job *, unsigned long) ),
-           TQT_SIGNAL( percent (TDEIO::Job *, unsigned long) ) );
+  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 & ) ) );
+  connect( job, TQ_SIGNAL( percent (TDEIO::Job *, unsigned long) ),
+           TQ_SIGNAL( percent (TDEIO::Job *, unsigned long) ) );
 
 //  job->dumpObjectInfo();
 }
@@ -419,7 +419,7 @@ void ProviderLoader::slotJobResult( TDEIO::Job *job )
     if ( p.tagName() == "provider" ) {
       Provider* prov = new Provider( p, mContentType, static_cast<TQWidget*>(parent()) );
       mProviders.append( prov );
-      connect( prov, TQT_SIGNAL( providerLoaded() ), this, TQT_SLOT( providerLoaded() ) );
+      connect( prov, TQ_SIGNAL( providerLoaded() ), this, TQ_SLOT( providerLoaded() ) );
     }
   }
 }
diff --git a/tdenewstuff/security.cpp b/tdenewstuff/security.cpp
index c6f8a4c3b..6952f1ec6 100644
--- a/tdenewstuff/security.cpp
+++ b/tdenewstuff/security.cpp
@@ -50,15 +50,15 @@ void Security::readKeys()
 {
   if (m_gpgRunning)
   {
-    TQTimer::singleShot(5, this, TQT_SLOT(readKeys()));
+    TQTimer::singleShot(5, this, TQ_SLOT(readKeys()));
     return;
   }
   m_runMode = List;
   m_keys.clear();
   KProcIO *readProcess=new KProcIO();
   *readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-keys";
-  connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *)));
-  connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *)));
+  connect(readProcess, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotProcessExited(TDEProcess *)));
+  connect(readProcess, TQ_SIGNAL(readReady(KProcIO *)) ,this, TQ_SLOT(slotDataArrived(KProcIO *)));
   if (!readProcess->start(TDEProcess::NotifyOnExit, true))
     KMessageBox::error(0L, i18n("<qt>Cannot start <i>gpg</i> and retrieve the available keys. Make sure that <i>gpg</i> is installed, otherwise verification of downloaded resources will not be possible.</qt>"));
   else
@@ -69,14 +69,14 @@ void Security::readSecretKeys()
 {
   if (m_gpgRunning)
   {
-    TQTimer::singleShot(5, this, TQT_SLOT(readSecretKeys()));
+    TQTimer::singleShot(5, this, TQ_SLOT(readSecretKeys()));
     return;
   }
   m_runMode = ListSecret;
   KProcIO *readProcess=new KProcIO();
   *readProcess << "gpg"<<"--no-secmem-warning"<<"--no-tty"<<"--with-colon"<<"--list-secret-keys";
-  connect(readProcess, TQT_SIGNAL(processExited(TDEProcess *)), this, TQT_SLOT(slotProcessExited(TDEProcess *)));
-  connect(readProcess, TQT_SIGNAL(readReady(KProcIO *)) ,this, TQT_SLOT(slotDataArrived(KProcIO *)));
+  connect(readProcess, TQ_SIGNAL(processExited(TDEProcess *)), this, TQ_SLOT(slotProcessExited(TDEProcess *)));
+  connect(readProcess, TQ_SIGNAL(readReady(KProcIO *)) ,this, TQ_SLOT(slotDataArrived(KProcIO *)));
   if (readProcess->start(TDEProcess::NotifyOnExit, true))
     m_gpgRunning = true;  
 }
@@ -206,7 +206,7 @@ void Security::slotCheckValidity()
 {  
   if (!m_keysRead || m_gpgRunning)
   {
-    TQTimer::singleShot(5, this, TQT_SLOT(slotCheckValidity()));
+    TQTimer::singleShot(5, this, TQ_SLOT(slotCheckValidity()));
     return;
   }
   if (m_keys.count() == 0)
@@ -248,8 +248,8 @@ void Security::slotCheckValidity()
   //verify the signature
   KProcIO *verifyProcess=new KProcIO();
   *verifyProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--verify" << f.dirPath() + "/signature"<< m_fileName;
-  connect(verifyProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *)));
-  connect(verifyProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *)));
+  connect(verifyProcess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotProcessExited(TDEProcess *)));
+  connect(verifyProcess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotDataArrived(KProcIO *)));
   if (verifyProcess->start(TDEProcess::NotifyOnExit,true))
       m_gpgRunning = true;
   else
@@ -270,7 +270,7 @@ void Security::slotSignFile()
 {
   if (!m_keysRead || m_gpgRunning)
   {
-    TQTimer::singleShot(5, this, TQT_SLOT(slotSignFile()));
+    TQTimer::singleShot(5, this, TQ_SLOT(slotSignFile()));
     return;
   }
   
@@ -328,8 +328,8 @@ void Security::slotSignFile()
   //verify the signature
   KProcIO *signProcess=new KProcIO();
   *signProcess<<"gpg"<<"--no-secmem-warning"<<"--status-fd=2"<<"--command-fd=0"<<"--no-tty"<<"--detach-sign" << "-u" << m_secretKey << "-o" << f.dirPath() + "/signature" << m_fileName;
-  connect(signProcess, TQT_SIGNAL(processExited(TDEProcess *)),this, TQT_SLOT(slotProcessExited(TDEProcess *)));
-  connect(signProcess, TQT_SIGNAL(readReady(KProcIO *)),this, TQT_SLOT(slotDataArrived(KProcIO *)));
+  connect(signProcess, TQ_SIGNAL(processExited(TDEProcess *)),this, TQ_SLOT(slotProcessExited(TDEProcess *)));
+  connect(signProcess, TQ_SIGNAL(readReady(KProcIO *)),this, TQ_SLOT(slotDataArrived(KProcIO *)));
   m_runMode = Sign;
   if (signProcess->start(TDEProcess::NotifyOnExit,true))
     m_gpgRunning = true;
diff --git a/tdenewstuff/testnewstuff.cpp b/tdenewstuff/testnewstuff.cpp
index f9fc7269f..8232e1f1e 100644
--- a/tdenewstuff/testnewstuff.cpp
+++ b/tdenewstuff/testnewstuff.cpp
@@ -72,17 +72,17 @@ MyWidget::MyWidget()
   
   TQPushButton *downloadButton = new TQPushButton( "Download", this );
   topLayout->addWidget( downloadButton );
-  connect( downloadButton, TQT_SIGNAL( clicked() ), TQT_SLOT( download() ) );
+  connect( downloadButton, TQ_SIGNAL( clicked() ), TQ_SLOT( download() ) );
 
   TQPushButton *uploadButton = new TQPushButton( "Upload", this );
   topLayout->addWidget( uploadButton );
-  connect( uploadButton, TQT_SIGNAL( clicked() ), TQT_SLOT( upload() ) );
+  connect( uploadButton, TQ_SIGNAL( clicked() ), TQ_SLOT( upload() ) );
 
   topLayout->addSpacing( 5 );
 
   TQPushButton *closeButton = new TQPushButton( "Close", this );
   topLayout->addWidget( closeButton );
-  connect( closeButton, TQT_SIGNAL( clicked() ), kapp, TQT_SLOT( quit() ) );
+  connect( closeButton, TQ_SIGNAL( clicked() ), kapp, TQ_SLOT( quit() ) );
 }
 
 MyWidget::~MyWidget()