6 files changed, 8 insertions, 8 deletions
diff --git a/chalk/ui/kcurve.cpp b/chalk/ui/kcurve.cpp
index a69b78466..524a9a76f 100644
--- a/chalk/ui/kcurve.cpp
+++ b/chalk/ui/kcurve.cpp
@@ -133,7 +133,7 @@ void KCurve::paintEvent(TQPaintEvent *)
     
     TQPixmap pm(size());
     TQPainter p1;
-    p1.begin(TQT_TQPAINTDEVICE(&pm), this);
+    p1.begin(&pm, this);
     
     //  draw background
     if(m_pix)
diff --git a/chalk/ui/kis_boundary_painter.cpp b/chalk/ui/kis_boundary_painter.cpp
index 2b842e53c..1d782fbb7 100644
--- a/chalk/ui/kis_boundary_painter.cpp
+++ b/chalk/ui/kis_boundary_painter.cpp
@@ -26,7 +26,7 @@
 TQPixmap KisBoundaryPainter::createPixmap(const KisBoundary& boundary, int w, int h)
 {
     TQPixmap target(w, h);
-    KisCanvasPainter painter(TQT_TQPAINTDEVICE(&target));
+    KisCanvasPainter painter(&target);
 
     painter.eraseRect(0, 0, w, h);
 
diff --git a/chalk/ui/kis_canvas.cpp b/chalk/ui/kis_canvas.cpp
index 1128d9f2a..2ec1a044a 100644
--- a/chalk/ui/kis_canvas.cpp
+++ b/chalk/ui/kis_canvas.cpp
@@ -735,7 +735,7 @@ void KisCanvasWidget::X11TabletDevice::writeSettingsToConfig()
 void KisCanvasWidget::X11TabletDevice::enableEvents(TQWidget *widget) const
 {
     if (!m_eventClassList.isEmpty()) {
-        int result = XSelectExtensionEvent(TQT_TQPAINTDEVICE(widget)->x11AppDisplay(), widget->handle(), 
+        int result = XSelectExtensionEvent(widget->x11AppDisplay(), widget->handle(), 
                                            const_cast<XEventClass*>(&m_eventClassList[0]), 
                                            m_eventClassList.count());
     
diff --git a/chalk/ui/kis_clipboard.cpp b/chalk/ui/kis_clipboard.cpp
index bb80e75e0..1e8040cad 100644
--- a/chalk/ui/kis_clipboard.cpp
+++ b/chalk/ui/kis_clipboard.cpp
@@ -82,7 +82,7 @@ void KisClipboard::setClip(KisPaintDeviceSP selection)
     // We'll create a store (ZIP format) in memory
     TQBuffer buffer;
     TQCString mimeType("application/x-chalk-selection");
-    KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Write, mimeType );
+    KoStore* store = KoStore::createStore( &buffer, KoStore::Write, mimeType );
     Q_ASSERT( store );
     Q_ASSERT( !store->bad() );
 
@@ -146,7 +146,7 @@ KisPaintDeviceSP KisClipboard::clip()
     if(cbData && cbData->provides(mimeType))
     {
         TQBuffer buffer(cbData->encodedData(mimeType));
-        KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read, mimeType );
+        KoStore* store = KoStore::createStore( &buffer, KoStore::Read, mimeType );
         KisProfile *profile=0;
 
         if (store->hasFile("profile.icc")) {
@@ -244,7 +244,7 @@ TQSize KisClipboard::clipSize()
     if(cbData && cbData->provides(mimeType)) {
         
         TQBuffer buffer(cbData->encodedData(mimeType));
-        KoStore* store = KoStore::createStore( TQT_TQIODEVICE(&buffer), KoStore::Read, mimeType );
+        KoStore* store = KoStore::createStore( &buffer, KoStore::Read, mimeType );
         KisProfile *profile=0;
 
         if (store->hasFile("profile.icc")) {
diff --git a/chalk/ui/kis_qpaintdevice_canvas.cpp b/chalk/ui/kis_qpaintdevice_canvas.cpp
index e3824f555..cd024c4ae 100644
--- a/chalk/ui/kis_qpaintdevice_canvas.cpp
+++ b/chalk/ui/kis_qpaintdevice_canvas.cpp
@@ -108,7 +108,7 @@ bool KisTQPaintDeviceCanvasWidget::x11Event(XEvent *event)
 
 KisCanvasWidgetPainter *KisTQPaintDeviceCanvasWidget::createPainter()
 {
-    return new KisTQPaintDeviceCanvasPainter(TQT_TQPAINTDEVICE(this));
+    return new KisTQPaintDeviceCanvasPainter(this);
 }
 
 #if defined(EXTENDED_X11_TABLET_SUPPORT)
diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.cpp b/chalk/ui/kis_qpaintdevice_canvas_painter.cpp
index cc598ef29..7f3a67236 100644
--- a/chalk/ui/kis_qpaintdevice_canvas_painter.cpp
+++ b/chalk/ui/kis_qpaintdevice_canvas_painter.cpp
@@ -38,7 +38,7 @@ bool KisTQPaintDeviceCanvasPainter::begin(KisCanvasWidget *canvasWidget, bool un
     TQWidget *widget = dynamic_cast<TQWidget *>(canvasWidget);
 
     if (widget != 0) {
-        return m_painter.begin(TQT_TQPAINTDEVICE(widget), unclipped);
+        return m_painter.begin(widget, unclipped);
     } else {
         return false;
     }