TQt4 port kdegraphics

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237557 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

6 files changed, 52 insertions, 50 deletions

diff --git a/ksvg/test/W3C_TESTSUITE_1.1 b/ksvg/test/W3C_TESTSUITE_1.1
index b0766355..39d280c4 100644
--- a/ksvg/test/W3C_TESTSUITE_1.1
+++ b/ksvg/test/W3C_TESTSUITE_1.1
@@ -103,13 +103,13 @@ linking-uri-02-b	-
 linking-uri-03-t	x
 
 [MASKING]
-masking-mask-01-b	-
-masking-opacity-01-b	o
-masking-path-01-b	x
-masking-path-02-b	x
-masking-path-03-t	x
-masking-path-04-b	o
-masking-path-05-f	x
+tqmasking-tqmask-01-b	-
+tqmasking-opacity-01-b	o
+tqmasking-path-01-b	x
+tqmasking-path-02-b	x
+tqmasking-path-03-t	x
+tqmasking-path-04-b	o
+tqmasking-path-05-f	x
 
 [METADATA]
 metadata-example-01-b	x
@@ -169,12 +169,12 @@ script-handle-03-t	x
 script-handle-04-t	x
 
 [SHAPES]
-shapes-circle-01-t	x
-shapes-ellipse-01-t	x
-shapes-line-01-t	x
-shapes-polygon-01-t	x
-shapes-polyline-01-t	x
-shapes-rect-01-t	x
+tqshapes-circle-01-t	x
+tqshapes-ellipse-01-t	x
+tqshapes-line-01-t	x
+tqshapes-polygon-01-t	x
+tqshapes-polyline-01-t	x
+tqshapes-rect-01-t	x
 
 [STRUCT]
 struct-cond-01-t	x
diff --git a/ksvg/test/ZVON-TEST-PASSED b/ksvg/test/ZVON-TEST-PASSED
index 81cb6d52..1f92bef0 100644
--- a/ksvg/test/ZVON-TEST-PASSED
+++ b/ksvg/test/ZVON-TEST-PASSED
@@ -81,15 +81,15 @@ linking-view-BE-05.svg			o
 linking-xlinkAttr-BE-02.svg		x
 
 Group 11: [Masking] - 21.09.2003
-masking-clipPath-BE-01.svg:		x
-masking-clipPath-BE-02.svg:		x
-masking-clipPath-BE-08.svg:		x
-masking-clipRule-BE-03.svg:		x
-masking-groupOpac-BE-04.svg:	x
-masking-mask-BE-05.svg:			x
-masking-mask-BE-06.svg:			x
-masking-property-BE-07.svg:		x
-masking-vportClip-BE-09.svg:	x
+tqmasking-clipPath-BE-01.svg:		x
+tqmasking-clipPath-BE-02.svg:		x
+tqmasking-clipPath-BE-08.svg:		x
+tqmasking-clipRule-BE-03.svg:		x
+tqmasking-groupOpac-BE-04.svg:	x
+tqmasking-tqmask-BE-05.svg:			x
+tqmasking-tqmask-BE-06.svg:			x
+tqmasking-property-BE-07.svg:		x
+tqmasking-vportClip-BE-09.svg:	x
 
 Group 12: [Metadata] - 21.09.2003
 metadata-sample-BE-01.svg:		x	PLANE REFERENCE IMAGE LOOKS WRONG - WE MATCH BATIK'S OUTPUT
@@ -112,7 +112,7 @@ path-lines-BE-01.svg:			x
 
 Group 16: [Rendering] - 21.09.2003
 rendering-orderGr-BE-01.svg:	x
-rendering-shape-BE-03.svg:		x
+rendering-tqshape-BE-03.svg:		x
 rendering-text-BE-02.svg:		x
 
 Group 17: [Script] - 21.09.2003
@@ -120,12 +120,12 @@ script-eventDom-BE-01.svg:		x
 script-uiEvents-BE-02.svg:		x
 
 Group 18: [Shapes] - 21.09.2003
-shapes-circle-BE-03.svg:		x
-shapes-ellipse-BE-02.svg:		x
-shapes-line-BE-04.svg:			x
-shapes-polygon-BE-05.svg:		x
-shapes-polyline-BE-06.svg:		x
-shapes-rect-BE-01.svg:			x
+tqshapes-circle-BE-03.svg:		x
+tqshapes-ellipse-BE-02.svg:		x
+tqshapes-line-BE-04.svg:			x
+tqshapes-polygon-BE-05.svg:		x
+tqshapes-polyline-BE-06.svg:		x
+tqshapes-rect-BE-01.svg:			x
 
 Group 19: [Structure] - 21.09.2003
 structure-allElem-BE-09.svg:	x
@@ -146,8 +146,8 @@ style-selector-BE-02.svg:		o
 style-selector-BE-03.svg:		o
 
 Group 21: [Text] - 29.09.2003
-text-alignment-BE-10.svg:		x
-text-alignment-BE-11.svg:		x
+text-tqalignment-BE-10.svg:		x
+text-tqalignment-BE-11.svg:		x
 text-altGlyph-BE-07.svg:		o	FONTS SUPPORT MISSING
 text-decoration-BE-12.svg:		x
 text-extTref-BE-18.svg:			x
diff --git a/ksvg/test/ecma/bbox/bbox.js b/ksvg/test/ecma/bbox/bbox.js
index 2d692694..88eaa592 100644
--- a/ksvg/test/ecma/bbox/bbox.js
+++ b/ksvg/test/ecma/bbox/bbox.js
@@ -13,12 +13,12 @@ function bbox_loop(drawit, number)
 
 	for(var i = 0; i < number; i++)
 	{
-		var shape = doc.getElementById("test-" + i);
-		var bbox = shape.getBBox();
+		var tqshape = doc.getElementById("test-" + i);
+		var bbox = tqshape.getBBox();
 	
 		if(drawit == "true")
 		{
-			draw_it(doc, bbox, shape, i + 1);
+			draw_it(doc, bbox, tqshape, i + 1);
 		}
 		else
 		{
@@ -27,13 +27,13 @@ function bbox_loop(drawit, number)
 	}
 }	
 
-function do_string(shape, number)
+function do_string(tqshape, number)
 {
-	var string = "\nShape " + number + "\nX = " + shape.x + "\nY = " + shape.y + "\nW = " + shape.width + "\nH = " + shape.height;
+	var string = "\nShape " + number + "\nX = " + tqshape.x + "\nY = " + tqshape.y + "\nW = " + tqshape.width + "\nH = " + shape.height;
 	alert(string);
 }
 
-function draw_it(doc, bbox, shape, number)
+function draw_it(doc, bbox, tqshape, number)
 {
 	var element = doc.createElement("rect");
 	element.setAttribute("x", bbox.x);
@@ -45,7 +45,7 @@ function draw_it(doc, bbox, shape, number)
 	element.setAttribute("stroke-width", "3");
 	element.setAttribute("id", "bbox" + number);
 	
-	shape.getParentNode().appendChild(element);
+	tqshape.getParentNode().appendChild(element);
 }
 
 function gen_buttons(evt, number)
diff --git a/ksvg/test/external/SVGTestWidget.cc b/ksvg/test/external/SVGTestWidget.cc
index aa968e24..ba17bc37 100644
--- a/ksvg/test/external/SVGTestWidget.cc
+++ b/ksvg/test/external/SVGTestWidget.cc
@@ -16,11 +16,11 @@ using namespace KSVG;
 
 SVGTestWidget::SVGTestWidget(const KURL &url)
 {
-	setBackgroundColor(Qt::white);
+	setBackgroundColor(TQt::white);
 	setMouseTracking(true);	
-	setFocusPolicy(WheelFocus);
+	setFocusPolicy(TQ_WheelFocus);
 
-	m_doc = DocumentFactory::self()->requestDocument(this, TQT_SLOT(slotRenderingFinished()));
+	m_doc = DocumentFactory::self()->requestDocument(TQT_TQOBJECT(this), TQT_SLOT(slotRenderingFinished()));
 	if(!m_doc)
 		return;	
 
@@ -29,7 +29,7 @@ SVGTestWidget::SVGTestWidget(const KURL &url)
 	if(!m_canvas)
 		return;
 
-	m_canvas->setup(this, this);
+	m_canvas->setup(TQT_TQPAINTDEVICE(this), TQT_TQPAINTDEVICE(this));
 
 	if(!DocumentFactory::self()->attachCanvas(m_canvas, m_doc))
 		return;
@@ -104,10 +104,10 @@ KSVG::SVGMouseEventImpl *newMouseEvent(SVGDocument *doc, KSVG::SVGEventImpl::Eve
 			event->globalY(), // screenYArg,
 			clientX, // clientXArg
 			clientY, // clientYArg
-			(event->state() & Qt::ControlButton), // ctrlKeyArg
-			(event->state() & Qt::AltButton), // altKeyArg
-			(event->state() & Qt::ShiftButton), // shiftKeyArg
-			(event->state() & Qt::MetaButton), // metaKeyArg
+			(event->state() & TQt::ControlButton), // ctrlKeyArg
+			(event->state() & TQt::AltButton), // altKeyArg
+			(event->state() & TQt::ShiftButton), // shiftKeyArg
+			(event->state() & TQt::MetaButton), // metaKeyArg
 			button, // buttonArg
 			0);
 
@@ -185,7 +185,7 @@ void SVGTestWidget::keyReleaseEvent(TQKeyEvent *event)
 	}
 	SVGSVGElementImpl *root = m_doc->rootElement();
 	if(!root) return;
-	if(event->key() == Qt::Key_Minus)
+	if(event->key() == TQt::Key_Minus)
 	{
 		erase(0, 0, m_canvas->width(), m_canvas->height());
 		float zoomFactor = root->currentScale() / 1.2;
@@ -193,7 +193,7 @@ void SVGTestWidget::keyReleaseEvent(TQKeyEvent *event)
 		m_doc->syncCachedMatrices();
 		m_canvas->update(zoomFactor);
 	}
-	else if(event->key() == Qt::Key_Plus)
+	else if(event->key() == TQt::Key_Plus)
 	{
 		float zoomFactor = root->currentScale() * 1.2;
 		root->setCurrentScale(zoomFactor);
diff --git a/ksvg/test/external/SVGTestWidget.h b/ksvg/test/external/SVGTestWidget.h
index 676f3269..d3ad6b77 100644
--- a/ksvg/test/external/SVGTestWidget.h
+++ b/ksvg/test/external/SVGTestWidget.h
@@ -6,9 +6,10 @@
 #include "SVGDocument.h"
 #include "KSVGCanvas.h"
 
-class SVGTestWidget : public QWidget
+class SVGTestWidget : public TQWidget
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	SVGTestWidget(const KURL &url);
 	~SVGTestWidget();
diff --git a/ksvg/test/external/printnodetest.h b/ksvg/test/external/printnodetest.h
index 19385014..ac1bdbf8 100644
--- a/ksvg/test/external/printnodetest.h
+++ b/ksvg/test/external/printnodetest.h
@@ -8,9 +8,10 @@ namespace KSVG
 {
 
 class SVGDocument;
-class Worker : public QObject
+class Worker : public TQObject
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
 	Worker(const KURL &url);
 	~Worker();