Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 1329ec6abbcb7b79cd960e0ca138f16598d5f11f)

4 files changed, 19 insertions, 19 deletions

diff --git a/librss/image.cpp b/librss/image.cpp
index d37ebdda..f9a6f9b3 100644
--- a/librss/image.cpp
+++ b/librss/image.cpp
@@ -111,9 +111,9 @@ void Image::getPixmap()
 	d->pixmapBuffer->open(IO_WriteOnly);
 
 	TDEIO::Job *job = TDEIO::get(d->url, false, false);
-	connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-	        this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
-	connect(job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *)));
+	connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+	        this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+	connect(job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotResult(TDEIO::Job *)));
 }
 
 void Image::slotData(TDEIO::Job *, const TQByteArray &data)
diff --git a/librss/loader.cpp b/librss/loader.cpp
index 51e993ce..442be08f 100644
--- a/librss/loader.cpp
+++ b/librss/loader.cpp
@@ -65,11 +65,11 @@ void FileRetriever::retrieveData(const KURL &url)
 	d->buffer->open(IO_WriteOnly);
 
 	TDEIO::Job *job = TDEIO::get(url, false, false);
-	connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-	             TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
-	connect(job, TQT_SIGNAL(result(TDEIO::Job *)), TQT_SLOT(slotResult(TDEIO::Job *)));
-	connect(job, TQT_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)),
-	             TQT_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &)));
+	connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+	             TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+	connect(job, TQ_SIGNAL(result(TDEIO::Job *)), TQ_SLOT(slotResult(TDEIO::Job *)));
+	connect(job, TQ_SIGNAL(permanentRedirection(TDEIO::Job *, const KURL &, const KURL &)),
+	             TQ_SLOT(slotPermanentRedirection(TDEIO::Job *, const KURL &, const KURL &)));
 }
 
 int FileRetriever::errorCode() const
@@ -138,10 +138,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);
 }
@@ -197,7 +197,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;
 }
@@ -218,8 +218,8 @@ void Loader::loadFrom(const KURL &url, DataRetriever *retriever)
 
 	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/librss/loader.h b/librss/loader.h
index 32857de0..09a7886e 100644
--- a/librss/loader.h
+++ b/librss/loader.h
@@ -197,8 +197,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/librss/testlibrss.cpp b/librss/testlibrss.cpp
index d68b2768..f84dc03d 100644
--- a/librss/testlibrss.cpp
+++ b/librss/testlibrss.cpp
@@ -10,8 +10,8 @@ using namespace RSS;
 void Tester::test()
 {
 	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://sourceforge.net/export/rss2_projnews.php?group_id=29057&rss_fulltext=1", new FileRetriever );
 }