TQt4 port koffice

This should enable compilation under both Qt3 and Qt4; fixes for any missed components will be forthcoming


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

1 files changed, 105 insertions, 105 deletions

diff --git a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp
index ba7cd9ba..e3cf726b 100644
--- a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp
@@ -17,10 +17,10 @@
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include <qdom.h>
-#include <qfile.h>
-#include <qregexp.h>
-#include <qstringlist.h>
+#include <tqdom.h>
+#include <tqfile.h>
+#include <tqregexp.h>
+#include <tqstringlist.h>
 #include <kdebug.h>
 #include <math.h>
 
@@ -37,7 +37,7 @@ KivioDiaStencilSpawner::~KivioDiaStencilSpawner()
 {
 }
 
-QDomElement KivioDiaStencilSpawner::saveXML(QDomDocument &d)
+TQDomElement KivioDiaStencilSpawner::saveXML(TQDomDocument &d)
 {
 	return m_smlStencilSpawner->saveXML(d);
 }
@@ -69,13 +69,13 @@ float KivioDiaStencilSpawner::diaPointToKivio(float point, bool xpoint)
 	return returnPoint;
 }
 
-bool KivioDiaStencilSpawner::load(const QString &file)
+bool KivioDiaStencilSpawner::load(const TQString &file)
 {
-	QDomDocument dia("test");
-	QDomDocument kivio("XML");
+	TQDomDocument dia("test");
+	TQDomDocument kivio("XML");
 
 	m_filename = file;
-	QFile f(file);
+	TQFile f(file);
 
 	if(f.open(IO_ReadOnly) == false)
 	{
@@ -83,33 +83,33 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 		return false;
 	}
 	dia.setContent(&f);
-	QDomNode diaMain = dia.namedItem("shape");
+	TQDomNode diaMain = dia.namedItem("tqshape");
 
 	// Set "creator" attribute
-	QDomElement firstElement = kivio.createElement("KivioShapeStencil");
+	TQDomElement firstElement = kivio.createElement("KivioShapeStencil");
 	firstElement.setAttribute("creator", "kiviodiafilter");
 
 	kivio.appendChild(firstElement);
 
 	// Add KivioSMLStencilSpawnerInfo
-	QDomElement spawnerInfoElement = kivio.createElement("KivioSMLStencilSpawnerInfo");
-	QDomElement authorInfoElement = kivio.createElement("Author");
+	TQDomElement spawnerInfoElement = kivio.createElement("KivioSMLStencilSpawnerInfo");
+	TQDomElement authorInfoElement = kivio.createElement("Author");
 	authorInfoElement.setAttribute("data", "n/a");
-	QDomElement titleInfoElement = kivio.createElement("Title");
+	TQDomElement titleInfoElement = kivio.createElement("Title");
 	titleInfoElement.setAttribute("data", diaMain.namedItem("name").toElement().text());
-	QDomElement idInfoElement = kivio.createElement("Id");
+	TQDomElement idInfoElement = kivio.createElement("Id");
 	idInfoElement.setAttribute("data", diaMain.namedItem("name").toElement().text());
-	QDomElement descriptionInfoElement = kivio.createElement("Description");
+	TQDomElement descriptionInfoElement = kivio.createElement("Description");
 	descriptionInfoElement.setAttribute("data", diaMain.namedItem("description").toElement().text());
-	QDomElement versionInfoElement = kivio.createElement("Version");
+	TQDomElement versionInfoElement = kivio.createElement("Version");
 	versionInfoElement.setAttribute("data", "1.0");
-	QDomElement webInfoElement = kivio.createElement("Web");
+	TQDomElement webInfoElement = kivio.createElement("Web");
 	webInfoElement.setAttribute("data", "http://");
-	QDomElement emailInfoElement = kivio.createElement("Email");
+	TQDomElement emailInfoElement = kivio.createElement("Email");
 	emailInfoElement.setAttribute("data", "n/a");
-	QDomElement copyrightInfoElement = kivio.createElement("Copyright");
+	TQDomElement copyrightInfoElement = kivio.createElement("Copyright");
 	copyrightInfoElement.setAttribute("data", "n/a");
-	QDomElement autoUpdateInfoElement = kivio.createElement("AutoUpdate");
+	TQDomElement autoUpdateInfoElement = kivio.createElement("AutoUpdate");
 	autoUpdateInfoElement.setAttribute("data", "off");
 
 	spawnerInfoElement.appendChild(authorInfoElement);
@@ -127,15 +127,15 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 	m_xscale = m_yscale = 20.0f;
 
 	// Add Dimensions
-	QDomElement dimensionsElement = kivio.createElement("Dimensions");
+	TQDomElement dimensionsElement = kivio.createElement("Dimensions");
 	kivio.documentElement().appendChild(dimensionsElement);
 
 	// Calculate Dimensions
-	QDomElement svgElement = diaMain.namedItem("svg:svg").toElement();
-	QDomNode svgNode = svgElement.firstChild();
+	TQDomElement svgElement = diaMain.namedItem("svg:svg").toElement();
+	TQDomNode svgNode = svgElement.firstChild();
 	while(!svgNode.isNull())
 	{
-		QDomElement svgChild = svgNode.toElement();
+		TQDomElement svgChild = svgNode.toElement();
 		if(!svgChild.isNull())
 		{
 			if(svgChild.tagName() == "svg:rect")
@@ -175,13 +175,13 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 			{
 				if(svgChild.hasAttribute("points"))
 				{
-					QStringList points = QStringList::split(" ", svgChild.attribute("points"));
-					for(QStringList::Iterator it = points.begin(); it != points.end(); ++it)
+					TQStringList points = TQStringList::split(" ", svgChild.attribute("points"));
+					for(TQStringList::Iterator it = points.begin(); it != points.end(); ++it)
 					{
-						QString x, y;
+						TQString x, y;
 
-						QStringList parsed = QStringList::split(",", (*it));
-						QStringList::Iterator itp = parsed.begin();
+						TQStringList parsed = TQStringList::split(",", (*it));
+						TQStringList::Iterator itp = parsed.begin();
 						x = (*itp);
 						++itp;
 						y = (*itp);
@@ -194,13 +194,13 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 			{
 				if(svgChild.hasAttribute("points"))
 				{
-					QStringList points = QStringList::split(" ", svgChild.attribute("points"));
-					for(QStringList::Iterator it = points.begin(); it != points.end(); ++it)
+					TQStringList points = TQStringList::split(" ", svgChild.attribute("points"));
+					for(TQStringList::Iterator it = points.begin(); it != points.end(); ++it)
 					{
-						QString x, y;
+						TQString x, y;
 
-						QStringList parsed = QStringList::split(",", (*it));
-						QStringList::Iterator itp = parsed.begin();
+						TQStringList parsed = TQStringList::split(",", (*it));
+						TQStringList::Iterator itp = parsed.begin();
 						x = (*itp);
 						++itp;
 						y = (*itp);
@@ -222,8 +222,8 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 		svgNode = svgNode.nextSibling();
 	}
 
-	QValueList<float>::Iterator itx = m_xlist.begin();
-	QValueList<float>::Iterator ity = m_ylist.begin();
+	TQValueList<float>::Iterator itx = m_xlist.begin();
+	TQValueList<float>::Iterator ity = m_ylist.begin();
 	m_highestx = *itx;
 	m_lowestx = *itx;
 	m_highesty = *ity;
@@ -233,14 +233,14 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 
 	for( ; itx != m_xlist.end(); ++itx)
 	{
-		m_highestx = QMAX(m_highestx, *itx);
-		m_lowestx = QMIN(m_lowestx, *itx);
+		m_highestx = TQMAX(m_highestx, *itx);
+		m_lowestx = TQMIN(m_lowestx, *itx);
 	}
 
 	for( ; ity != m_ylist.end(); ++ity)
 	{
-		m_highesty = QMAX(m_highesty, *ity);
-		m_lowesty = QMIN(m_lowesty, *ity);
+		m_highesty = TQMAX(m_highesty, *ity);
+		m_lowesty = TQMIN(m_lowesty, *ity);
 	}
 
 	//if( svgElement.hasAttribute("width") && svgElement.hasAttribute("height"))
@@ -250,26 +250,26 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 	//}
 	//else
 	{
-		// scale the shape to be close to 30 by 30
+		// scale the tqshape to be close to 30 by 30
 		m_yscale = 30.0/(m_highesty - m_lowesty);
 		m_xscale = 30.0/(m_highestx - m_lowestx);
 	}
 
 	// Add KivioConnectorTarget's
-	QDomElement connectionsElement = diaMain.namedItem("connections").toElement();
-	QDomNode connectionsNode = connectionsElement.firstChild();
+	TQDomElement connectionsElement = diaMain.namedItem("connections").toElement();
+	TQDomNode connectionsNode = connectionsElement.firstChild();
 	while(!connectionsNode.isNull())
 	{
-		QDomElement connectionChild = connectionsNode.toElement();
+		TQDomElement connectionChild = connectionsNode.toElement();
 		if(!connectionChild.isNull())
 		{
 			if(connectionChild.tagName() == "point")
 			{
 				if(connectionChild.hasAttribute("x") && connectionChild.hasAttribute("y"))
 				{
-					QDomElement kivioConnectorTarget = kivio.createElement("KivioConnectorTarget");
-					kivioConnectorTarget.setAttribute("x", QString::number(diaPointToKivio(connectionChild.attribute("x").toFloat(),true) * m_xscale));
-					kivioConnectorTarget.setAttribute("y", QString::number(diaPointToKivio(connectionChild.attribute("y").toFloat(), false) * m_yscale));
+					TQDomElement kivioConnectorTarget = kivio.createElement("KivioConnectorTarget");
+					kivioConnectorTarget.setAttribute("x", TQString::number(diaPointToKivio(connectionChild.attribute("x").toFloat(),true) * m_xscale));
+					kivioConnectorTarget.setAttribute("y", TQString::number(diaPointToKivio(connectionChild.attribute("y").toFloat(), false) * m_yscale));
 
 					kivio.documentElement().appendChild(kivioConnectorTarget);
 				}
@@ -283,7 +283,7 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 	int runs = 0;
 	while(!svgNode.isNull())
 	{
-		QDomElement svgChild = svgNode.toElement();
+		TQDomElement svgChild = svgNode.toElement();
 		if(!svgChild.isNull())
 		{
 			if(svgChild.tagName() == "svg:rect")
@@ -292,13 +292,13 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 				// TODO: rx and ry -> rounded rects
 				if(svgChild.hasAttribute("x") && svgChild.hasAttribute("y") && svgChild.hasAttribute("width") && svgChild.hasAttribute("height"))
 				{
-					QDomElement kivioShape = kivio.createElement("KivioShape");
+					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Rectangle");
-					kivioShape.setAttribute("name", QString::fromLatin1("Element") + QString::number(runs));
-					kivioShape.setAttribute("x", QString::number(diaPointToKivio(svgChild.attribute("x").toFloat(),true) * m_xscale));
-					kivioShape.setAttribute("y", QString::number(diaPointToKivio(svgChild.attribute("y").toFloat(), false) * m_yscale));
-					kivioShape.setAttribute("w", QString::number(svgChild.attribute("width").toFloat() * m_xscale));
-					kivioShape.setAttribute("h", QString::number(svgChild.attribute("height").toFloat() * m_yscale));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("x", TQString::number(diaPointToKivio(svgChild.attribute("x").toFloat(),true) * m_xscale));
+					kivioShape.setAttribute("y", TQString::number(diaPointToKivio(svgChild.attribute("y").toFloat(), false) * m_yscale));
+					kivioShape.setAttribute("w", TQString::number(svgChild.attribute("width").toFloat() * m_xscale));
+					kivioShape.setAttribute("h", TQString::number(svgChild.attribute("height").toFloat() * m_yscale));
 					kivio.documentElement().appendChild(kivioShape);
 				}
 			}
@@ -307,13 +307,13 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 				runs++;
 				if(svgChild.hasAttribute("cx") && svgChild.hasAttribute("cy") && svgChild.hasAttribute("r"))
 				{
-					QDomElement kivioShape = kivio.createElement("KivioShape");
+					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Ellipse");
-					kivioShape.setAttribute("name", QString::fromLatin1("Element") + QString::number(runs));
-					kivioShape.setAttribute("x", QString::number((diaPointToKivio(svgChild.attribute("cx").toFloat() - svgChild.attribute("r").toFloat(),true) * m_xscale)));
-					kivioShape.setAttribute("y", QString::number((diaPointToKivio(svgChild.attribute("cy").toFloat() - svgChild.attribute("r").toFloat(), false) * m_yscale)));
-					kivioShape.setAttribute("w", QString::number(svgChild.attribute("r").toFloat() * m_xscale * 2));
-					kivioShape.setAttribute("h", QString::number(svgChild.attribute("r").toFloat() * m_yscale * 2));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("x", TQString::number((diaPointToKivio(svgChild.attribute("cx").toFloat() - svgChild.attribute("r").toFloat(),true) * m_xscale)));
+					kivioShape.setAttribute("y", TQString::number((diaPointToKivio(svgChild.attribute("cy").toFloat() - svgChild.attribute("r").toFloat(), false) * m_yscale)));
+					kivioShape.setAttribute("w", TQString::number(svgChild.attribute("r").toFloat() * m_xscale * 2));
+					kivioShape.setAttribute("h", TQString::number(svgChild.attribute("r").toFloat() * m_yscale * 2));
 					kivio.documentElement().appendChild(kivioShape);
 				}
 			}
@@ -322,13 +322,13 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 				runs++;
 				if(svgChild.hasAttribute("cx") && svgChild.hasAttribute("cy") && svgChild.hasAttribute("rx") && svgChild.hasAttribute("ry"))
 				{
-					QDomElement kivioShape = kivio.createElement("KivioShape");
+					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Ellipse");
-					kivioShape.setAttribute("name", QString::fromLatin1("Element") + QString::number(runs));
-					kivioShape.setAttribute("x", QString::number((diaPointToKivio(svgChild.attribute("cx").toFloat() - svgChild.attribute("rx").toFloat(),true) * m_xscale)));
-					kivioShape.setAttribute("y", QString::number((diaPointToKivio(svgChild.attribute("cy").toFloat() - svgChild.attribute("ry").toFloat(), false) * m_yscale)));
-					kivioShape.setAttribute("w", QString::number(svgChild.attribute("rx").toFloat() * m_xscale * 2));
-					kivioShape.setAttribute("h", QString::number(svgChild.attribute("ry").toFloat() * m_yscale * 2));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("x", TQString::number((diaPointToKivio(svgChild.attribute("cx").toFloat() - svgChild.attribute("rx").toFloat(),true) * m_xscale)));
+					kivioShape.setAttribute("y", TQString::number((diaPointToKivio(svgChild.attribute("cy").toFloat() - svgChild.attribute("ry").toFloat(), false) * m_yscale)));
+					kivioShape.setAttribute("w", TQString::number(svgChild.attribute("rx").toFloat() * m_xscale * 2));
+					kivioShape.setAttribute("h", TQString::number(svgChild.attribute("ry").toFloat() * m_yscale * 2));
 					kivio.documentElement().appendChild(kivioShape);
 				}
 			}
@@ -337,15 +337,15 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 				runs++;
 				if(svgChild.hasAttribute("x1") && svgChild.hasAttribute("y1") && svgChild.hasAttribute("x2") && svgChild.hasAttribute("y2"))
 				{
-					QDomElement kivioShape = kivio.createElement("KivioShape");
+					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "LineArray");
-					kivioShape.setAttribute("name", QString::fromLatin1("Element") + QString::number(runs));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
 
-					QDomElement lineArrayElement = kivio.createElement("Line");
-					lineArrayElement.setAttribute("x1", QString::number(diaPointToKivio(svgChild.attribute("x1").toFloat(),true) * m_xscale));
-					lineArrayElement.setAttribute("y1", QString::number(diaPointToKivio(svgChild.attribute("y1").toFloat(), false) * m_yscale));
-					lineArrayElement.setAttribute("x2", QString::number(diaPointToKivio(svgChild.attribute("x2").toFloat(),true) * m_xscale));
-					lineArrayElement.setAttribute("y2", QString::number(diaPointToKivio(svgChild.attribute("y2").toFloat(), false) * m_yscale));
+					TQDomElement lineArrayElement = kivio.createElement("Line");
+					lineArrayElement.setAttribute("x1", TQString::number(diaPointToKivio(svgChild.attribute("x1").toFloat(),true) * m_xscale));
+					lineArrayElement.setAttribute("y1", TQString::number(diaPointToKivio(svgChild.attribute("y1").toFloat(), false) * m_yscale));
+					lineArrayElement.setAttribute("x2", TQString::number(diaPointToKivio(svgChild.attribute("x2").toFloat(),true) * m_xscale));
+					lineArrayElement.setAttribute("y2", TQString::number(diaPointToKivio(svgChild.attribute("y2").toFloat(), false) * m_yscale));
 
 					kivioShape.appendChild(lineArrayElement);
 					kivio.documentElement().appendChild(kivioShape);
@@ -356,24 +356,24 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 				runs++;
 				if(svgChild.hasAttribute("points"))
 				{
-					QDomElement kivioShape = kivio.createElement("KivioShape");
+					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Polyline");
-					kivioShape.setAttribute("name", QString::fromLatin1("Element") + QString::number(runs));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
 
-					QStringList points = QStringList::split(" ", svgChild.attribute("points"));
-					for(QStringList::Iterator it = points.begin(); it != points.end(); ++it)
+					TQStringList points = TQStringList::split(" ", svgChild.attribute("points"));
+					for(TQStringList::Iterator it = points.begin(); it != points.end(); ++it)
 					{
-						QString x, y;
+						TQString x, y;
 
-						QStringList parsed = QStringList::split(",", (*it));
-						QStringList::Iterator itp = parsed.begin();
+						TQStringList parsed = TQStringList::split(",", (*it));
+						TQStringList::Iterator itp = parsed.begin();
 						x = (*itp);
 						++itp;
 						y = (*itp);
 
-						QDomElement kivioPointElement = kivio.createElement("KivioPoint");
-						kivioPointElement.setAttribute("x", QString::number(diaPointToKivio(x.toFloat(),true) * m_xscale));
-						kivioPointElement.setAttribute("y", QString::number(diaPointToKivio(y.toFloat(), false) * m_yscale));
+						TQDomElement kivioPointElement = kivio.createElement("KivioPoint");
+						kivioPointElement.setAttribute("x", TQString::number(diaPointToKivio(x.toFloat(),true) * m_xscale));
+						kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(y.toFloat(), false) * m_yscale));
 
 						kivioShape.appendChild(kivioPointElement);
 					}
@@ -385,24 +385,24 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 				runs++;
 				if(svgChild.hasAttribute("points"))
 				{
-					QDomElement kivioShape = kivio.createElement("KivioShape");
+					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Polygon");
-					kivioShape.setAttribute("name", QString::fromLatin1("Element") + QString::number(runs));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
 
-					QStringList points = QStringList::split(" ", svgChild.attribute("points"));
-					for(QStringList::Iterator it = points.begin(); it != points.end(); ++it)
+					TQStringList points = TQStringList::split(" ", svgChild.attribute("points"));
+					for(TQStringList::Iterator it = points.begin(); it != points.end(); ++it)
 					{
-						QString x, y;
+						TQString x, y;
 
-						QStringList parsed = QStringList::split(",", (*it));
-						QStringList::Iterator itp = parsed.begin();
+						TQStringList parsed = TQStringList::split(",", (*it));
+						TQStringList::Iterator itp = parsed.begin();
 						x = (*itp);
 						++itp;
 						y = (*itp);
 
-						QDomElement kivioPointElement = kivio.createElement("KivioPoint");
-						kivioPointElement.setAttribute("x", QString::number(diaPointToKivio(x.toFloat(),true) * m_xscale));
-						kivioPointElement.setAttribute("y", QString::number(diaPointToKivio(y.toFloat(), false) * m_yscale));
+						TQDomElement kivioPointElement = kivio.createElement("KivioPoint");
+						kivioPointElement.setAttribute("x", TQString::number(diaPointToKivio(x.toFloat(),true) * m_xscale));
+						kivioPointElement.setAttribute("y", TQString::number(diaPointToKivio(y.toFloat(), false) * m_yscale));
 
 						kivioShape.appendChild(kivioPointElement);
 					}
@@ -413,11 +413,11 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 			{
 				runs++;
 				bool isClosed;
-				QDomElement kivioShape = kivio.createElement("KivioShape");
+				TQDomElement kivioShape = kivio.createElement("KivioShape");
 				if(svgChild.hasAttribute("d"))
 				{
 
-					if(svgChild.attribute("d").contains('z') || svgChild.attribute("d").contains('Z'))
+					if(svgChild.attribute("d").tqcontains('z') || svgChild.attribute("d").tqcontains('Z'))
 					{
 						isClosed = true;
 						kivioShape.setAttribute("type", "ClosedPath");
@@ -428,7 +428,7 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 						kivioShape.setAttribute("type", "OpenPath");
 					}
 
-					kivioShape.setAttribute("name", QString::fromLatin1("Element") + QString::number(runs));
+					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
 
 					DiaPathParser *dpp = new DiaPathParser(&kivio,
 						&kivioShape, m_xscale, m_yscale,
@@ -447,16 +447,16 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 					// stroke-linejoin: milter, bevel, round
 					// stroke-linecap: round, square, flat
 					// fill: ?
-					QStringList styles = QStringList::split(";", svgChild.attribute("style"));
+					TQStringList styles = TQStringList::split(";", svgChild.attribute("style"));
 					for( uint idx = 0; idx < styles.count(); idx++)
 					{
 						//kdDebug(43000) << "Style: " << styles[idx] << endl;
-						if( isClosed && styles[idx].contains("fill:"))
+						if( isClosed && styles[idx].tqcontains("fill:"))
 						{
-							QDomElement fillStyle = kivio.createElement("KivioFillStyle");
-							if( styles[idx].contains("forground"))
+							TQDomElement fillStyle = kivio.createElement("KivioFillStyle");
+							if( styles[idx].tqcontains("forground"))
 								fillStyle.setAttribute("color", "#0000");
-							else if (styles[idx].contains("background"))
+							else if (styles[idx].tqcontains("background"))
 								fillStyle.setAttribute("color", "#ffff");
 
 							fillStyle.setAttribute("colorStyle", "1");
@@ -472,8 +472,8 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 
 	// Apply width and height
 
-	dimensionsElement.setAttribute("w", QString::number((fabs(m_highestx - m_lowestx)) * m_xscale));
-	dimensionsElement.setAttribute("h", QString::number((fabs(m_highesty - m_lowesty)) * m_yscale));
+	dimensionsElement.setAttribute("w", TQString::number((fabs(m_highestx - m_lowestx)) * m_xscale));
+	dimensionsElement.setAttribute("h", TQString::number((fabs(m_highesty - m_lowesty)) * m_yscale));
 
 	m_xlist.clear();
 	m_ylist.clear();
@@ -481,7 +481,7 @@ bool KivioDiaStencilSpawner::load(const QString &file)
 	return loadXML(file, kivio);
 }
 
-bool KivioDiaStencilSpawner::loadXML(const QString &file, QDomDocument &d)
+bool KivioDiaStencilSpawner::loadXML(const TQString &file, TQDomDocument &d)
 {
 	bool ret = m_smlStencilSpawner->loadXML(file, d);