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

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit fb6b4d204d1155fa3a1bc7a128873340db1524f7)

5 files changed, 6 insertions, 6 deletions

diff --git a/kivio/kiviopart/kivio_canvas.cpp b/kivio/kiviopart/kivio_canvas.cpp
index e6a192fe..89695d24 100644
--- a/kivio/kiviopart/kivio_canvas.cpp
+++ b/kivio/kiviopart/kivio_canvas.cpp
@@ -331,7 +331,7 @@ void KivioCanvas::paintEvent( TQPaintEvent* ev )
 
   // Draw content
   KivioScreenPainter kpainter;
-  kpainter.start(TQT_TQPAINTDEVICE(m_buffer));
+  kpainter.start(m_buffer);
   kpainter.translateBy(-m_iXOffset + m_pageOffsetX, -m_iYOffset + m_pageOffsetY);
   m_pDoc->paintContent(kpainter, paintRect, false, page, TQPoint(0, 0), m_pView->zoomHandler(), showConnectorTargets(), true);
   kpainter.stop();
@@ -706,7 +706,7 @@ void KivioCanvas::beginUnclippedSpawnerPainter()
     unclippedSpawnerPainter = new KivioScreenPainter();
 
     // Tell it to start (allocates a Qpainter object)
-    unclippedSpawnerPainter->start(TQT_TQPAINTDEVICE(this));
+    unclippedSpawnerPainter->start(this);
 
     // Uhhhhh??
     if( !unclipped )
diff --git a/kivio/kiviopart/kivio_page.cpp b/kivio/kiviopart/kivio_page.cpp
index cd09d54c..0009a1d4 100644
--- a/kivio/kiviopart/kivio_page.cpp
+++ b/kivio/kiviopart/kivio_page.cpp
@@ -204,7 +204,7 @@ void KivioPage::saveOasis(KoStore* /*store*/, KoXmlWriter* docWriter, KoGenStyle
 
   TQBuffer layerBuffer;
   layerBuffer.open(IO_WriteOnly);
-  KoXmlWriter layerWriter(TQT_TQIODEVICE(&layerBuffer));
+  KoXmlWriter layerWriter(&layerBuffer);
   layerWriter.startElement("draw:layer-set");
 
   // Iterate through all layers
diff --git a/kivio/kiviopart/kiviodragobject.cpp b/kivio/kiviopart/kiviodragobject.cpp
index 1649cfc3..bfe4ff55 100644
--- a/kivio/kiviopart/kiviodragobject.cpp
+++ b/kivio/kiviopart/kiviodragobject.cpp
@@ -160,7 +160,7 @@ TQByteArray KivioDragObject::imageEncoded(const char* mimetype) const
   TQPixmap buffer(zoomHandler.zoomItX(m_stencilRect.width()), zoomHandler.zoomItY(m_stencilRect.height()));
   buffer.fill(TQt::white);
   KivioScreenPainter p;
-  p.start( TQT_TQPAINTDEVICE(&buffer) );
+  p.start( &buffer );
   p.setTranslation(-zoomHandler.zoomItX(m_stencilRect.x()), -zoomHandler.zoomItY(m_stencilRect.y()));
   KivioIntraStencilData data;
   data.painter = &p;
diff --git a/kivio/kiviopart/kivioglobal.cpp b/kivio/kiviopart/kivioglobal.cpp
index 75db6ebd..ab6e53a7 100644
--- a/kivio/kiviopart/kivioglobal.cpp
+++ b/kivio/kiviopart/kivioglobal.cpp
@@ -1305,7 +1305,7 @@ TQPixmap Kivio::generatePixmapFromStencil(int width, int height, KivioStencil* s
   TQPixmap pix(width, height);
   pix.fill(TQt::white);
   KivioScreenPainter kpainter;
-  kpainter.start(TQT_TQPAINTDEVICE(&pix));
+  kpainter.start(&pix);
   kpainter.translateBy(-rect.x() + ((width - rect.width()) / 2), -rect.y() + ((height - rect.height()) / 2));
   KivioIntraStencilData data;
   data.painter = &kpainter;
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
index ed92bff8..398bebc9 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
@@ -150,7 +150,7 @@ void KivioBirdEyePanel::updateView()
   TQRect rect(TQPoint(0,0),s1);
 
   KivioScreenPainter kpainter;
-  kpainter.start(TQT_TQPAINTDEVICE(m_buffer));
+  kpainter.start(m_buffer);
   kpainter.painter()->fillRect(rect, TDEApplication::palette().active().brush(TQColorGroup::Mid));
 
   kpainter.painter()->fillRect(px0, py0, pw, ph, white);