Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

4 files changed, 20 insertions, 20 deletions

diff --git a/akregator/src/librss/image.cpp b/akregator/src/librss/image.cpp
index 174a105b5..65aaf5392 100644
--- a/akregator/src/librss/image.cpp
+++ b/akregator/src/librss/image.cpp
@@ -112,9 +112,9 @@ void Image::getPixmap()
 	d->pixmapBuffer->open(IO_WriteOnly);
 
 	d->job = TDEIO::get(d->url, false, false);
-	connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-	        this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
-	connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *)));
+	connect(d->job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+	        this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+	connect(d->job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotResult(TDEIO::Job *)));
 }
 
 void Image::slotData(TDEIO::Job *, const TQByteArray &data)
diff --git a/akregator/src/librss/loader.cpp b/akregator/src/librss/loader.cpp
index 8e2967b7b..5cc6aa22a 100644
--- a/akregator/src/librss/loader.cpp
+++ b/akregator/src/librss/loader.cpp
@@ -111,13 +111,13 @@ void FileRetriever::retrieveData(const KURL &url)
       d->job->addMetaData("UserAgent", ua);
 
 
-   TQTimer::singleShot(1000*90, this, TQT_SLOT(slotTimeout()));
+   TQTimer::singleShot(1000*90, this, TQ_SLOT(slotTimeout()));
 
-   connect(d->job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-                TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
-   connect(d->job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
-   connect(d->job, TQT_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)),
-                TQT_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &)));
+   connect(d->job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+                TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+   connect(d->job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *)));
+   connect(d->job, TQ_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)),
+                TQ_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &)));
 }
 
 void FileRetriever::slotTimeout()
@@ -207,10 +207,10 @@ void OutputRetriever::retrieveData(const KURL &url)
    d->buffer->open(IO_WriteOnly);
 
    d->process = new KShellProcess();
-   connect(d->process, TQT_SIGNAL(processExited(TDEProcess *)),
-                       TQT_SLOT(slotExited(TDEProcess *)));
-   connect(d->process, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-                       TQT_SLOT(slotOutput(TDEProcess *, char *, int)));
+   connect(d->process, TQ_SIGNAL(processExited(TDEProcess *)),
+                       TQ_SLOT(slotExited(TDEProcess *)));
+   connect(d->process, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+                       TQ_SLOT(slotOutput(TDEProcess *, char *, int)));
    *d->process << url.path();
    d->process->start(TDEProcess::NotifyOnExit, TDEProcess::Stdout);
 }
@@ -268,7 +268,7 @@ Loader *Loader::create()
 Loader *Loader::create(TQObject *object, const char *slot)
 {
    Loader *loader = create();
-   connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
+   connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)),
            object, slot);
    return loader;
 }
@@ -290,8 +290,8 @@ void Loader::loadFrom(const KURL &url, DataRetriever *retriever)
    d->url=url;
    d->retriever = retriever;
 
-   connect(d->retriever, TQT_SIGNAL(dataRetrieved(const TQByteArray &, bool)),
-           this, TQT_SLOT(slotRetrieverDone(const TQByteArray &, bool)));
+   connect(d->retriever, TQ_SIGNAL(dataRetrieved(const TQByteArray &, bool)),
+           this, TQ_SLOT(slotRetrieverDone(const TQByteArray &, bool)));
 
    d->retriever->retrieveData(url);
 }
diff --git a/akregator/src/librss/loader.h b/akregator/src/librss/loader.h
index c9d3eb09a..ea81a0a6b 100644
--- a/akregator/src/librss/loader.h
+++ b/akregator/src/librss/loader.h
@@ -211,8 +211,8 @@ namespace RSS
 	 *
 	 * \code
 	 * Loader *loader = Loader::create();
-	 * connect(loader, TQT_SIGNAL(loadingComplete(Loader *, Document, Status)),
-	 *         this, TQT_SLOT(slotLoadingComplete(Loader *, Document, Status)));
+	 * connect(loader, TQ_SIGNAL(loadingComplete(Loader *, Document, Status)),
+	 *         this, TQ_SLOT(slotLoadingComplete(Loader *, Document, Status)));
 	 * loader->loadFrom("http://www.blah.org/foobar.rdf", new FileRetriever);
 	 * \endcode
 	 *
diff --git a/akregator/src/librss/testlibrss.cpp b/akregator/src/librss/testlibrss.cpp
index bef989c68..4515cf7e0 100644
--- a/akregator/src/librss/testlibrss.cpp
+++ b/akregator/src/librss/testlibrss.cpp
@@ -19,8 +19,8 @@ static const TDECmdLineOptions options[] =
 void Tester::test( const TQString &url )
 {
 	Loader *loader = Loader::create();
-	connect( loader, TQT_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
-	         this, TQT_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) );
+	connect( loader, TQ_SIGNAL( loadingComplete( Loader *, Document, Status ) ),
+	         this, TQ_SLOT( slotLoadingComplete( Loader *, Document, Status ) ) );
 	loader->loadFrom( url, new FileRetriever );
 }