Rename old tq methods that no longer need a unique name

2 files changed, 9 insertions, 9 deletions

diff --git a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp
index 4407d2d0..7dac3244 100644
--- a/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_dia_stencil_spawner.cpp
@@ -294,7 +294,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 				{
 					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Rectangle");
-					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("name", TQString::fromLatin1("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));
@@ -309,7 +309,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 				{
 					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Ellipse");
-					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("name", TQString::fromLatin1("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));
@@ -324,7 +324,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 				{
 					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Ellipse");
-					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("name", TQString::fromLatin1("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));
@@ -339,7 +339,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 				{
 					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "LineArray");
-					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs));
 
 					TQDomElement lineArrayElement = kivio.createElement("Line");
 					lineArrayElement.setAttribute("x1", TQString::number(diaPointToKivio(svgChild.attribute("x1").toFloat(),true) * m_xscale));
@@ -358,7 +358,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 				{
 					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Polyline");
-					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs));
 
 					TQStringList points = TQStringList::split(" ", svgChild.attribute("points"));
 					for(TQStringList::Iterator it = points.begin(); it != points.end(); ++it)
@@ -387,7 +387,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 				{
 					TQDomElement kivioShape = kivio.createElement("KivioShape");
 					kivioShape.setAttribute("type", "Polygon");
-					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs));
 
 					TQStringList points = TQStringList::split(" ", svgChild.attribute("points"));
 					for(TQStringList::Iterator it = points.begin(); it != points.end(); ++it)
@@ -428,7 +428,7 @@ bool KivioDiaStencilSpawner::load(const TQString &file)
 						kivioShape.setAttribute("type", "OpenPath");
 					}
 
-					kivioShape.setAttribute("name", TQString::tqfromLatin1("Element") + TQString::number(runs));
+					kivioShape.setAttribute("name", TQString::fromLatin1("Element") + TQString::number(runs));
 
 					DiaPathParser *dpp = new DiaPathParser(&kivio,
 						&kivioShape, m_xscale, m_yscale,
diff --git a/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp b/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp
index 07f005fa..02c850e4 100644
--- a/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_screen_painter.cpp
@@ -549,7 +549,7 @@ void KivioScreenPainter::drawPolyline( TQPointArray &pArray )
   m_pPainter->setPen(m_pLineStyle->pen(1.0f));
   m_pPainter->setBrush( TQBrush::NoBrush );
 
-  m_pPainter->tqdrawPolyline( pArray, 0, pArray.size() );
+  m_pPainter->drawPolyline( pArray, 0, pArray.size() );
 }
 
 void KivioScreenPainter::drawPolygon( TQPointArray &pArray )
@@ -586,7 +586,7 @@ void KivioScreenPainter::drawPolygon( TQPointArray &pArray )
   m_pPainter->setPen(m_pLineStyle->pen(1.0f));
   m_pPainter->setBrush(b);
 
-  m_pPainter->tqdrawPolygon( pArray, true );
+  m_pPainter->drawPolygon( pArray, true );
   m_pPainter->setBrushOrigin(0, 0);
 }