Replaced various '#define' with actual strings - part 5

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

5 files changed, 8 insertions, 8 deletions

diff --git a/ksvg/core/KSVGLoader.cpp b/ksvg/core/KSVGLoader.cpp
index f075d2ff..91fdc0fb 100644
--- a/ksvg/core/KSVGLoader.cpp
+++ b/ksvg/core/KSVGLoader.cpp
@@ -128,14 +128,14 @@ void KSVGLoader::slotResult(TDEIO::Job *job)
 			if(check.contains(".svgz") || check.contains(".svg.gz"))
 			{
 				// decode the gzipped svg and emit it
-				TQIODevice *dev = KFilterDev::device(TQT_TQIODEVICE(new TQBuffer(m_data)), "application/x-gzip");
+				TQIODevice *dev = KFilterDev::device(new TQBuffer(m_data), "application/x-gzip");
 				dev->open(IO_ReadOnly);
 				emit gotResult(dev);
 			}
 			else
 			{
 				m_job = 0;
-				emit gotResult(TQT_TQIODEVICE(new TQBuffer(m_data)));
+				emit gotResult(new TQBuffer(m_data));
 				m_data.resize(0);
 			}
 		}
@@ -162,7 +162,7 @@ void KSVGLoader::slotResult(TDEIO::Job *job)
 
 				if(buffer.open(IO_ReadOnly))
 				{
-					const char *imageFormat = TQImageIO::imageFormat(TQT_TQIODEVICE(&buffer));
+					const char *imageFormat = TQImageIO::imageFormat(&buffer);
 
 					if(imageFormat != 0)
 					{
diff --git a/ksvg/impl/SVGScriptElementImpl.cpp b/ksvg/impl/SVGScriptElementImpl.cpp
index f97ebf89..cecf7fb2 100644
--- a/ksvg/impl/SVGScriptElementImpl.cpp
+++ b/ksvg/impl/SVGScriptElementImpl.cpp
@@ -95,7 +95,7 @@ void SVGScriptElementImpl::slotResult(TDEIO::Job *)
 	m_data[m_data.size() - 1] = '\0';
 
 	TQBuffer buf(m_data);
-	TQIODevice *dev = KFilterDev::device(TQT_TQIODEVICE(&buf), "application/x-gzip", false);
+	TQIODevice *dev = KFilterDev::device(&buf, "application/x-gzip", false);
 	TQByteArray contents;
 	if(dev->open(IO_ReadOnly))
 		contents = dev->readAll();
diff --git a/ksvg/plugin/ksvg_plugin.cpp b/ksvg/plugin/ksvg_plugin.cpp
index 48cf6d56..6ad05900 100644
--- a/ksvg/plugin/ksvg_plugin.cpp
+++ b/ksvg/plugin/ksvg_plugin.cpp
@@ -110,7 +110,7 @@ KSVGPlugin::KSVGPlugin(TQWidget *wparent, const char *, TQObject *parent, const
 	if(!ksvgd->canvas)
 		return;
 
-	ksvgd->canvas->setup(TQT_TQPAINTDEVICE(ksvgd->backgroundPixmap), TQT_TQPAINTDEVICE(ksvgd->window));
+	ksvgd->canvas->setup(ksvgd->backgroundPixmap, ksvgd->window);
 
 	ksvgd->zoomInAction = KStdAction::zoomIn(this, TQT_SLOT(slotZoomIn()), actionCollection());
 	ksvgd->zoomOutAction = KStdAction::zoomOut(this, TQT_SLOT(slotZoomOut()), actionCollection());
@@ -299,7 +299,7 @@ void KSVGPlugin::slotRenderingBackend()
 	if(!ksvgd->canvas)
 		return;
 
-	ksvgd->canvas->setup(TQT_TQPAINTDEVICE(ksvgd->backgroundPixmap), TQT_TQPAINTDEVICE(ksvgd->window));
+	ksvgd->canvas->setup(ksvgd->backgroundPixmap, ksvgd->window);
 	openURL(m_url);
 }
 
diff --git a/ksvg/plugin/svgcreator.cpp b/ksvg/plugin/svgcreator.cpp
index 60328855..9eecc993 100644
--- a/ksvg/plugin/svgcreator.cpp
+++ b/ksvg/plugin/svgcreator.cpp
@@ -59,7 +59,7 @@ bool SVGCreator::create(const TQString &path, int width, int height, TQImage &im
 	pix.fill(TQt::white);
 
 	KSVG::KSVGCanvas *c = KSVG::CanvasFactory::self()->loadCanvas(width, height);
-	c->setup(TQT_TQPAINTDEVICE(&pix), TQT_TQPAINTDEVICE(&pix));
+	c->setup(&pix, &pix);
 
 	doc->attach(c);
 	connect(doc, TQT_SIGNAL(finishedRendering()), TQT_SLOT(slotFinished()));
diff --git a/ksvg/test/external/SVGTestWidget.cpp b/ksvg/test/external/SVGTestWidget.cpp
index 0e0d5f9d..a42d4da6 100644
--- a/ksvg/test/external/SVGTestWidget.cpp
+++ b/ksvg/test/external/SVGTestWidget.cpp
@@ -29,7 +29,7 @@ SVGTestWidget::SVGTestWidget(const KURL &url)
 	if(!m_canvas)
 		return;
 
-	m_canvas->setup(TQT_TQPAINTDEVICE(this), TQT_TQPAINTDEVICE(this));
+	m_canvas->setup(this, this);
 
 	if(!DocumentFactory::self()->attachCanvas(m_canvas, m_doc))
 		return;