1 files changed, 20 insertions, 20 deletions

diff --git a/tdenewstuff/engine.cpp b/tdenewstuff/engine.cpp
index 1427f7eb7..5f54af9bd 100644
--- a/tdenewstuff/engine.cpp
+++ b/tdenewstuff/engine.cpp
@@ -28,7 +28,7 @@
 #include <tdeio/job.h>
 #include <tdelocale.h>
 #include <tdemessagebox.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
 
 #include "knewstuff.h"
 #include "downloaddialog.h"
@@ -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 );
 }
 
@@ -290,7 +290,7 @@ void Engine::upload( Entry *entry )
 {
   if ( mUploadFile.isNull()) {
     mUploadFile = entry->fullName();
-    mUploadFile = locateLocal( "data", TQString(kapp->instanceName()) + "/upload/" + mUploadFile );
+    mUploadFile = locateLocal( "data", TQString(tdeApp->instanceName()) + "/upload/" + mUploadFile );
 
     if ( !d->mNewStuff->createUploadFile( mUploadFile ) ) {
       KMessageBox::error( mParentWidget, i18n("Unable to create file to upload.") );
@@ -329,7 +329,7 @@ void Engine::upload( Entry *entry )
                                                i18n("Upload Info"),
                                                KStdGuiItem::close() );
       if ( result == KMessageBox::Yes ) {
-        kapp->invokeBrowser( noUploadUrl.url() );
+        tdeApp->invokeBrowser( noUploadUrl.url() );
       }
     }
   } else {
@@ -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 );
     }
@@ -364,7 +364,7 @@ bool Engine::createMetaFile( Entry *entry )
 
   if ( mUploadMetaFile.isNull() ) {
     mUploadMetaFile = entry->fullName() + ".meta";
-    mUploadMetaFile = locateLocal( "data", TQString(kapp->instanceName()) + "/upload/" + mUploadMetaFile );
+    mUploadMetaFile = locateLocal( "data", TQString(tdeApp->instanceName()) + "/upload/" + mUploadMetaFile );
   }
 
   TQFile f( mUploadMetaFile );
@@ -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 )