TQt conversion

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

4 files changed, 50 insertions, 50 deletions

diff --git a/ksvg/plugin/backends/agg/AggCanvasFactory.cpp b/ksvg/plugin/backends/agg/AggCanvasFactory.cpp
index 439623ad..368cb252 100644
--- a/ksvg/plugin/backends/agg/AggCanvasFactory.cpp
+++ b/ksvg/plugin/backends/agg/AggCanvasFactory.cpp
@@ -35,7 +35,7 @@ AggCanvasFactory::~AggCanvasFactory()
 {
 }
 
-QObject *AggCanvasFactory::createObject(QObject *, const char *, const char *, const QStringList &args)
+TQObject *AggCanvasFactory::createObject(TQObject *, const char *, const char *, const TQStringList &args)
 {
 	unsigned int width = (*args.at(1)).toUInt();
 	unsigned int height = (*args.at(0)).toUInt();
diff --git a/ksvg/plugin/backends/agg/AggCanvasFactory.h b/ksvg/plugin/backends/agg/AggCanvasFactory.h
index 9fb3ffbf..8e7d4747 100644
--- a/ksvg/plugin/backends/agg/AggCanvasFactory.h
+++ b/ksvg/plugin/backends/agg/AggCanvasFactory.h
@@ -35,7 +35,7 @@ public:
 	AggCanvasFactory();
 	virtual ~AggCanvasFactory();
 
-	virtual QObject *createObject(QObject *parent = 0, const char *pname = 0, const char *name = "QObject", const QStringList &args = QStringList());
+	virtual TQObject *createObject(TQObject *parent = 0, const char *pname = 0, const char *name = "TQObject", const TQStringList &args = TQStringList());
 };
 
 };
diff --git a/ksvg/plugin/backends/agg/AggCanvasItems.cpp b/ksvg/plugin/backends/agg/AggCanvasItems.cpp
index 4ceb6109..be4727ac 100644
--- a/ksvg/plugin/backends/agg/AggCanvasItems.cpp
+++ b/ksvg/plugin/backends/agg/AggCanvasItems.cpp
@@ -18,7 +18,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <qimage.h>
+#include <tqimage.h>
 
 #include "SVGPaint.h"
 #include "SVGRectImpl.h"
@@ -207,12 +207,12 @@ AggShape::~AggShape()
 	delete m_strokePainter;
 }
 
-QRect AggShape::bbox() const
+TQRect AggShape::bbox() const
 {
 	return m_bbox;
 }
 
-bool AggShape::fillContains(const QPoint &p)
+bool AggShape::fillContains(const TQPoint &p)
 {
 	agg::rasterizer_scanline_aa<> ras;
 	ras.filling_rule(m_style->getFillRule() == RULE_EVENODD ? agg::fill_even_odd : agg::fill_non_zero);
@@ -221,7 +221,7 @@ bool AggShape::fillContains(const QPoint &p)
 	return b;
 }
 
-bool AggShape::strokeContains(const QPoint &p)
+bool AggShape::strokeContains(const TQPoint &p)
 {
 	agg::rasterizer_scanline_aa<> ras;
 	ras.add_path(m_curved_stroked_trans);
@@ -287,7 +287,7 @@ void AggShape::draw(SVGShapeImpl *shape)
 
 	double x1, y1, x2, y2;
 	agg::bounding_rect(m_curved_trans, *this, 0, 1, &x1, &y1, &x2, &y2);
-	m_bbox = QRect(int(x1), int(y1), int(x2 - x1), int(y2 - y1));
+	m_bbox = TQRect(int(x1), int(y1), int(x2 - x1), int(y2 - y1));
 
 	m_curved.approximation_scale(pow(m_transform.scale(), 0.75));
 
@@ -309,7 +309,7 @@ void AggShape::calcSVPs(const SVGMatrixImpl *matrix)
 
 	double x1, y1, x2, y2;
 	agg::bounding_rect(m_curved_trans, *this, 0, 1, &x1, &y1, &x2, &y2);
-	m_bbox = QRect(int(x1), int(y1), int(x2 - x1), int(y2 - y1));
+	m_bbox = TQRect(int(x1), int(y1), int(x2 - x1), int(y2 - y1));
 }
 
 void AggShape::init(const SVGMatrixImpl *)
@@ -358,7 +358,7 @@ void AggStrokePaintServer::update(SVGStylableImpl *style)
 {
 	if(style->getStrokeColor()->paintType() != SVG_PAINTTYPE_URI)
 	{
-		QColor qcolor;
+		TQColor qcolor;
 		if(style->getStrokeColor()->paintType() == SVG_PAINTTYPE_CURRENTCOLOR)
 			qcolor = style->getColor()->rgbColor().color();
 		else
@@ -407,7 +407,7 @@ void AggFillPaintServer::update(SVGStylableImpl *style)
 {
 	if(style->getFillColor()->paintType() != SVG_PAINTTYPE_URI)
 	{
-		QColor qcolor;
+		TQColor qcolor;
 		if(style->getFillColor()->paintType() == SVG_PAINTTYPE_CURRENTCOLOR)
 			qcolor = style->getColor()->rgbColor().color();
 		else
@@ -678,7 +678,7 @@ void AggLine::draw()
 		{
 			m_canvas->m_ras.reset();
 			m_canvas->m_ras.add_path(m_curved_stroked_trans);
-			QColor qcolor;
+			TQColor qcolor;
 			if(m_style->getStrokeColor()->paintType() == SVG_PAINTTYPE_CURRENTCOLOR)
 				qcolor = m_style->getColor()->rgbColor().color();
 			else
@@ -995,9 +995,9 @@ void AggImage::draw()
 	{
 		//KSVGPolygon clippingPolygon = m_image->clippingShape();
 
-		QImage *img = m_image->image();
+		TQImage *img = m_image->image();
 		if(!img) return;
-		QImage image = m_image->scaledImage();
+		TQImage image = m_image->scaledImage();
 		agg::rendering_buffer source_buffer;
 		source_buffer.attach(image.bits(), image.width(), image.height(), image.width() * 4);
 
@@ -1053,9 +1053,9 @@ void AggImage::init()
 {
 }
 
-QRect AggImage::bbox() const
+TQRect AggImage::bbox() const
 {
-	QRect bbox(static_cast<int>(m_image->x()->baseVal()->value()),
+	TQRect bbox(static_cast<int>(m_image->x()->baseVal()->value()),
 			   static_cast<int>(m_image->y()->baseVal()->value()),
 			   static_cast<int>(m_image->width()->baseVal()->value()),
 			   static_cast<int>(m_image->height()->baseVal()->value()));
@@ -1077,9 +1077,9 @@ AggText::~AggText()
 {
 }
 
-bool AggText::fillContains(const QPoint &p)
+bool AggText::fillContains(const TQPoint &p)
 {
-	QPtrListIterator<SVPElement> it(m_drawItems);
+	TQPtrListIterator<SVPElement> it(m_drawItems);
 
 	SVPElement *fill = it.current();
 	while(fill)
@@ -1099,9 +1099,9 @@ bool AggText::fillContains(const QPoint &p)
 	return false;
 }
 
-bool AggText::strokeContains(const QPoint &p)
+bool AggText::strokeContains(const TQPoint &p)
 {
-	QPtrListIterator<SVPElement> it(m_drawItems);
+	TQPtrListIterator<SVPElement> it(m_drawItems);
 
 	SVPElement *stroke = it.current();
 	while(stroke)
@@ -1121,11 +1121,11 @@ bool AggText::strokeContains(const QPoint &p)
 	return false;
 }
 
-QRect AggText::bbox() const
+TQRect AggText::bbox() const
 {
-	QRect result, rect;
+	TQRect result, rect;
 
-	QPtrListIterator<SVPElement> it(m_drawItems);
+	TQPtrListIterator<SVPElement> it(m_drawItems);
 
 	SVPElement *elem = it.current();
 	while(elem)
@@ -1152,7 +1152,7 @@ void AggText::update(CanvasItemUpdate reason, int param1, int param2)
 {
 	if(reason == UPDATE_STYLE)
 	{
-		QPtrListIterator<SVPElement> it(m_drawItems);
+		TQPtrListIterator<SVPElement> it(m_drawItems);
 
 		SVPElement *svpelement = it.current();
 		SVGTextContentElementImpl *text;
@@ -1181,7 +1181,7 @@ void AggText::update(CanvasItemUpdate reason, int param1, int param2)
 	}
 	else if(reason == UPDATE_PAN)
 	{
-		QPtrListIterator<SVPElement> it(m_drawItems);
+		TQPtrListIterator<SVPElement> it(m_drawItems);
 
 		SVPElement *svpelement = it.current();
 		T2P::BezierPathAgg *bpath;
@@ -1202,7 +1202,7 @@ void AggText::update(CanvasItemUpdate reason, int param1, int param2)
 
 void AggText::draw()
 {
-	QPtrListIterator<SVPElement> it(m_drawItems);
+	TQPtrListIterator<SVPElement> it(m_drawItems);
 
 	SVPElement *svpelement = it.current();
 	BezierPathAggStroked *bpath;
@@ -1229,7 +1229,7 @@ void AggText::draw()
 bool AggText::isVisible()
 {
 	bool foundVisible = false;
-	QPtrListIterator<SVPElement> it(m_drawItems);
+	TQPtrListIterator<SVPElement> it(m_drawItems);
 
 	SVPElement *svpelement = it.current();
 	SVGTextContentElementImpl *text;
@@ -1361,7 +1361,7 @@ void AggGradient::parseGradientStops(SVGGradientElementImpl *gradient)
 			//offsets++;
 
 			// Get color
-			QColor qStopColor;
+			TQColor qStopColor;
 
 			if(elem->getStopColor()->colorType() == SVG_COLORTYPE_CURRENTCOLOR)
 				qStopColor = elem->getColor()->rgbColor().color();
@@ -1369,7 +1369,7 @@ void AggGradient::parseGradientStops(SVGGradientElementImpl *gradient)
 				qStopColor = elem->getStopColor()->rgbColor().color();
 
 			// Convert in an agg suitable form
-			QString tempName = qStopColor.name();
+			TQString tempName = qStopColor.name();
 			const char *str = tempName.latin1();
 
 			// We need to take into account fill/stroke opacity, if available (Rob)
@@ -1449,14 +1449,14 @@ void AggGradient::finalizePaintServer()
 {
 	parseGradientStops(m_gradient->stopsSource());
 
-	QString _href = SVGURIReferenceImpl::getTarget(m_gradient->href()->baseVal().string());
+	TQString _href = SVGURIReferenceImpl::getTarget(m_gradient->href()->baseVal().string());
 	if(!_href.isEmpty())
 		reference(_href);
 
 	setFinalized();
 }
 
-void AggGradient::reference(const QString &/*href*/)
+void AggGradient::reference(const TQString &/*href*/)
 {
 }
 
@@ -1475,7 +1475,7 @@ void AggLinearGradient::render(AggCanvas *c)
 	SVGMatrixImpl *gradTrans = linear->gradientTransform()->baseVal()->concatenate();
 	if(gradTrans)
 	{
-		QWMatrix m = gradTrans->qmatrix();
+		TQWMatrix m = gradTrans->qmatrix();
 		m.map(_x1, _y1, &_x1, &_y1);
 		m.map(_x2, _y2, &_x2, &_y2);
 		gradTrans->deref();
@@ -1613,7 +1613,7 @@ void AggRadialGradient::render(AggCanvas *c)
 	if(gradTrans)
 	{
 		agg::trans_affine mtx;
-		QWMatrix m = gradTrans->qmatrix();
+		TQWMatrix m = gradTrans->qmatrix();
 		mtx = agg::trans_affine(m.m11(), m.m12(), m.m21(), m.m22(), m.dx(), m.dy());
 		gradTrans->deref();
 		mtx_g1 *= mtx;
@@ -1693,7 +1693,7 @@ void AggPattern::finalizePaintServer()
 	setFinalized();
 }
 
-void AggPattern::reference(const QString &href)
+void AggPattern::reference(const TQString &href)
 {
 	m_pattern->reference(href);
 }
@@ -1704,7 +1704,7 @@ void AggPattern::render(AggCanvas *c)
 
         if(!tile.image().isNull())
         {
-                QWMatrix m = tile.screenToTile();
+                TQWMatrix m = tile.screenToTile();
                 double affine[6];
 
                 affine[0] = m.m11();
diff --git a/ksvg/plugin/backends/agg/AggCanvasItems.h b/ksvg/plugin/backends/agg/AggCanvasItems.h
index a8c242ec..b5599952 100644
--- a/ksvg/plugin/backends/agg/AggCanvasItems.h
+++ b/ksvg/plugin/backends/agg/AggCanvasItems.h
@@ -200,7 +200,7 @@ namespace KSVG
 		virtual ~AggPaintServer() {}
 
 		virtual void finalizePaintServer() = 0;
-		virtual void reference(const QString &href) = 0;
+		virtual void reference(const TQString &href) = 0;
 
 		virtual void render(AggCanvas *c) = 0;
 	};
@@ -214,7 +214,7 @@ namespace KSVG
 		void parseGradientStops(SVGGradientElementImpl *gradient);
 
 		virtual void finalizePaintServer();
-		virtual void reference(const QString &href);
+		virtual void reference(const TQString &href);
 
 	protected:
 		SVGGradientElementImpl *m_gradient;
@@ -254,7 +254,7 @@ namespace KSVG
 		virtual ~AggPattern() {}
 
 		virtual void finalizePaintServer();
-		virtual void reference(const QString &);
+		virtual void reference(const TQString &);
 
 		virtual void render(AggCanvas *c);
 
@@ -307,9 +307,9 @@ namespace KSVG
 		AggShape(AggCanvas *c, SVGStylableImpl *style);
 		virtual ~AggShape();
 
-		virtual QRect bbox() const;
-		virtual bool fillContains(const QPoint &p);
-		virtual bool strokeContains(const QPoint &p);
+		virtual TQRect bbox() const;
+		virtual bool fillContains(const TQPoint &p);
+		virtual bool strokeContains(const TQPoint &p);
 		virtual void update(CanvasItemUpdate reason, int param1 = 0, int param2 = 0);
 		void draw(SVGShapeImpl *shape);
 		void calcSVPs(const SVGMatrixImpl *matrix);
@@ -416,9 +416,9 @@ namespace KSVG
 		AggMarker(AggCanvas *c, SVGMarkerElementImpl *marker);
 		virtual ~AggMarker();
 
-		virtual QRect bbox() const { return QRect(); }
-		virtual bool fillContains(const QPoint &) { return true; }
-		virtual bool strokeContains(const QPoint &) { return true; }
+		virtual TQRect bbox() const { return TQRect(); }
+		virtual bool fillContains(const TQPoint &) { return true; }
+		virtual bool strokeContains(const TQPoint &) { return true; }
 		virtual void update(CanvasItemUpdate, int = 0, int = 0) { }
 		virtual void init();
 		virtual void draw();
@@ -438,9 +438,9 @@ namespace KSVG
 		AggImage(AggCanvas *c, SVGImageElementImpl *image);
 		virtual ~AggImage();
 
-		virtual QRect bbox() const;
-		virtual bool fillContains(const QPoint &) { return true; }
-		virtual bool strokeContains(const QPoint &) { return true; }
+		virtual TQRect bbox() const;
+		virtual bool fillContains(const TQPoint &) { return true; }
+		virtual bool strokeContains(const TQPoint &) { return true; }
 		virtual void update(CanvasItemUpdate, int = 0, int = 0) { }
 		virtual void init();
 		virtual void draw();
@@ -459,9 +459,9 @@ namespace KSVG
 		AggText(AggCanvas *c, SVGTextElementImpl *text);
 		virtual ~AggText();
 
-		virtual QRect bbox() const;
-		virtual bool fillContains(const QPoint &p);
-		virtual bool strokeContains(const QPoint &p);
+		virtual TQRect bbox() const;
+		virtual bool fillContains(const TQPoint &p);
+		virtual bool strokeContains(const TQPoint &p);
 		virtual void update(CanvasItemUpdate, int param1 = 0, int param2 = 0);
 		virtual void draw();
 		virtual bool isVisible();
@@ -491,7 +491,7 @@ namespace KSVG
 			AggStrokePaintServer		*strokePainter;
 		};
 
-		mutable QPtrList<SVPElement> m_drawItems;
+		mutable TQPtrList<SVPElement> m_drawItems;
 	};
 };