Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

4 files changed, 12 insertions, 12 deletions

diff --git a/ksvg/impl/SVGDocumentImpl.cpp b/ksvg/impl/SVGDocumentImpl.cpp
index ce6de16e..ce3c1341 100644
--- a/ksvg/impl/SVGDocumentImpl.cpp
+++ b/ksvg/impl/SVGDocumentImpl.cpp
@@ -231,7 +231,7 @@ bool SVGDocumentImpl::open(const ::KURL &url)
 		if(!m_loader)
 			m_loader = new KSVGLoader();
 
-		connect(m_loader, TQT_SIGNAL(gotResult(TQIODevice *)), this, TQT_SLOT(slotSVGContent(TQIODevice *)));
+		connect(m_loader, TQ_SIGNAL(gotResult(TQIODevice *)), this, TQ_SLOT(slotSVGContent(TQIODevice *)));
 		m_loader->getSVGContent(url);
 	}
 	else
@@ -257,7 +257,7 @@ void SVGDocumentImpl::slotSVGContent(TQIODevice *dev)
 		args.SVGFragmentId = url.mid(pos + 1);
 		
 	m_reader = new KSVGReader(this, m_canvas, args);
-	connect(m_reader, TQT_SIGNAL(finished(bool, const TQString &)), this, TQT_SLOT(slotFinishedParsing(bool, const TQString &)));
+	connect(m_reader, TQ_SIGNAL(finished(bool, const TQString &)), this, TQ_SLOT(slotFinishedParsing(bool, const TQString &)));
 	m_t.start();
 	
 #if USE_VALGRIND
@@ -277,7 +277,7 @@ void SVGDocumentImpl::parseSVG(TQXmlInputSource *inputSource, bool getURLMode)
 	args.fit = m_fit;
 	args.getURLMode = getURLMode;
 	m_reader = new KSVGReader(this, 0, args);
-	connect(m_reader, TQT_SIGNAL(finished(bool, const TQString &)), this, TQT_SLOT(slotFinishedParsing(bool, const TQString &)));
+	connect(m_reader, TQ_SIGNAL(finished(bool, const TQString &)), this, TQ_SLOT(slotFinishedParsing(bool, const TQString &)));
 	
 #if USE_VALGRIND
 	CALLTREE_ZERO_STATS();
@@ -454,7 +454,7 @@ void SVGDocumentImpl::executeScripts()
 	bool test = executeScriptsRecursiveCheck(*rootElement());
 	
 	if(!test)
-		TQTimer::singleShot(50, this, TQT_SLOT(executeScripts()));
+		TQTimer::singleShot(50, this, TQ_SLOT(executeScripts()));
 	else
 	{
 		executeScriptsRecursive(*rootElement());
diff --git a/ksvg/impl/SVGImageElementImpl.cpp b/ksvg/impl/SVGImageElementImpl.cpp
index 65c678d2..c33d3737 100644
--- a/ksvg/impl/SVGImageElementImpl.cpp
+++ b/ksvg/impl/SVGImageElementImpl.cpp
@@ -273,8 +273,8 @@ void SVGImageElementImpl::createItem(KSVGCanvas *c)
 				m_doc->ref();
 				m_doc->attach(c);
 
-				connect(m_doc, TQT_SIGNAL(finishedParsing(bool, const TQString &)), this, TQT_SLOT(slotParsingFinished(bool, const TQString &)));
-				connect(m_doc, TQT_SIGNAL(finishedLoading()), this, TQT_SLOT(slotLoadingFinished()));
+				connect(m_doc, TQ_SIGNAL(finishedParsing(bool, const TQString &)), this, TQ_SLOT(slotParsingFinished(bool, const TQString &)));
+				connect(m_doc, TQ_SIGNAL(finishedLoading()), this, TQ_SLOT(slotLoadingFinished()));
 
 				KURL file;
 
diff --git a/ksvg/impl/SVGScriptElementImpl.cpp b/ksvg/impl/SVGScriptElementImpl.cpp
index cecf7fb2..ce1aede9 100644
--- a/ksvg/impl/SVGScriptElementImpl.cpp
+++ b/ksvg/impl/SVGScriptElementImpl.cpp
@@ -75,8 +75,8 @@ void SVGScriptElementImpl::setAttributes()
 		if(m_job == 0)
 			m_job = TDEIO::get(url, false, false);
 
-		connect(m_job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQT_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
-		connect(m_job, TQT_SIGNAL(result(TDEIO::Job *)), this, TQT_SLOT(slotResult(TDEIO::Job *)));
+		connect(m_job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)), this, TQ_SLOT(slotData(TDEIO::Job *, const TQByteArray &)));
+		connect(m_job, TQ_SIGNAL(result(TDEIO::Job *)), this, TQ_SLOT(slotResult(TDEIO::Job *)));
 	}
 }
 
diff --git a/ksvg/impl/SVGTimeScheduler.cpp b/ksvg/impl/SVGTimeScheduler.cpp
index b38eceaa..cf8bc75d 100644
--- a/ksvg/impl/SVGTimeScheduler.cpp
+++ b/ksvg/impl/SVGTimeScheduler.cpp
@@ -50,7 +50,7 @@ const TQTimer *SVGTimer::qtimer() const
 
 void SVGTimer::start(TQObject *receiver, const char *member)
 {
-	TQObject::connect(m_timer, TQT_SIGNAL(timeout()), receiver, member);
+	TQObject::connect(m_timer, TQ_SIGNAL(timeout()), receiver, member);
 	m_timer->start(m_ms, m_singleShot);
 }
 
@@ -165,7 +165,7 @@ void SVGTimeScheduler::startAnimations()
 	{
 		SVGTimer *svgTimer = *it;
 		if(svgTimer && !svgTimer->isActive())
-			svgTimer->start(this, TQT_SLOT(slotTimerNotify()));
+			svgTimer->start(this, TQ_SLOT(slotTimerNotify()));
 	}
 }
 
@@ -174,7 +174,7 @@ void SVGTimeScheduler::toggleAnimations()
 	if(m_intervalTimer->isActive())
 		m_intervalTimer->stop();
 	else
-		m_intervalTimer->start(this, TQT_SLOT(slotTimerNotify()));
+		m_intervalTimer->start(this, TQ_SLOT(slotTimerNotify()));
 }
 
 bool SVGTimeScheduler::animationsPaused() const
@@ -223,7 +223,7 @@ void SVGTimeScheduler::slotTimerNotify()
 	// by the previous call, and now all connections to the interval timer
 	// are created and now we just need to fire that timer (Niko)
 	if(svgTimer != m_intervalTimer && !m_intervalTimer->isActive())
-		m_intervalTimer->start(this, TQT_SLOT(slotTimerNotify()));
+		m_intervalTimer->start(this, TQ_SLOT(slotTimerNotify()));
 }
 
 float SVGTimeScheduler::elapsed() const