5 files changed, 10 insertions, 10 deletions
diff --git a/kexi/kexiutils/utils.cpp b/kexi/kexiutils/utils.cpp
index 4a0d5489..9d794242 100644
--- a/kexi/kexiutils/utils.cpp
+++ b/kexi/kexiutils/utils.cpp
@@ -300,7 +300,7 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
 			}
 			pixmapBuffer.convertFromImage(img);
 			if (!fast) {
-				p2.begin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.device());
+				p2.begin(&pixmapBuffer, p.device());
 			}
 			else
 				target->drawPixmap(pos, pixmapBuffer);
@@ -308,7 +308,7 @@ void KexiUtils::drawPixmap( TQPainter& p, int lineWidth, const TQRect& rect,
 		else {
 			if (!fast) {
 				pixmapBuffer.resize(rect.size()-TQSize(lineWidth, lineWidth));
-				p2.begin(TQT_TQPAINTDEVICE(&pixmapBuffer), p.device());
+				p2.begin(&pixmapBuffer, p.device());
 				p2.drawPixmap(TQRect(rect.x(), rect.y(), w, h), pixmap);
 			}
 			else
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index b6cb9f44..404237bb 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -52,7 +52,7 @@ void KexiSimplePrintPreviewView::paintEvent( TQPaintEvent *pe )
 		return;
 	TQPixmap pm(size()); //dbl buffered
 	TQPainter p;
-	p.begin(TQT_TQPAINTDEVICE(&pm), this);
+	p.begin(&pm, this);
 //! @todo only for screen!
 	p.fillRect(TQRect(TQPoint(0,0),pm.size()), TQBrush(white));//pe->rect(), TQBrush(white));
 	if (m_window->currentPage()>=0)
diff --git a/kexi/plugins/forms/widgets/kexidbform.cpp b/kexi/plugins/forms/widgets/kexidbform.cpp
index 81ce6684..41e8cc64 100644
--- a/kexi/plugins/forms/widgets/kexidbform.cpp
+++ b/kexi/plugins/forms/widgets/kexidbform.cpp
@@ -148,7 +148,7 @@ void
 KexiDBForm::drawRects(const TQValueList<TQRect> &list, int type)
 {
 	TQPainter p;
-	p.begin(TQT_TQPAINTDEVICE(this), true);
+	p.begin(this, true);
 	bool unclipped = testWFlags( WPaintUnclipped );
 	setWFlags( WPaintUnclipped );
 
@@ -192,7 +192,7 @@ void
 KexiDBForm::clearForm()
 {
 	TQPainter p;
-	p.begin(TQT_TQPAINTDEVICE(this), true);
+	p.begin(this, true);
 	bool unclipped = testWFlags( WPaintUnclipped );
 	setWFlags( WPaintUnclipped );
 
@@ -216,7 +216,7 @@ KexiDBForm::highlightWidgets(TQWidget *from, TQWidget *to)//, const TQPoint &poi
 		toPoint = to->parentWidget()->mapTo(this, to->pos());
 
 	TQPainter p;
-	p.begin(TQT_TQPAINTDEVICE(this), true);
+	p.begin(this, true);
 	bool unclipped = testWFlags( WPaintUnclipped );
 	setWFlags( WPaintUnclipped );
 
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index 4c23fead..1d74f94f 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -640,7 +640,7 @@ void KexiDBImageBox::paintEvent( TQPaintEvent *pe )
 	if (m_designMode && pixmap().isNull()) {
 		TQPixmap pm(size()-TQSize(m, m));
 		TQPainter p2;
-		p2.begin(TQT_TQPAINTDEVICE(&pm), this);
+		p2.begin(&pm, this);
 		p2.fillRect(0,0,width(),height(), bg);
 
 		updatePixmap();
diff --git a/kexi/widget/utils/kexiflowlayout.cpp b/kexi/widget/utils/kexiflowlayout.cpp
index cedb7b74..b7fef91f 100644
--- a/kexi/widget/utils/kexiflowlayout.cpp
+++ b/kexi/widget/utils/kexiflowlayout.cpp
@@ -98,16 +98,16 @@ KexiFlowLayout::~KexiFlowLayout()
 void
 KexiFlowLayout::addItem(TQLayoutItem *item)
 {
-	m_list.append(TQT_TQLAYOUTITEM(item));
+	m_list.append(item);
 }
 
 void
 KexiFlowLayout::addSpacing(int size)
 {
 	if (m_orientation ==TQt::Horizontal)
-		addItem( TQT_TQLAYOUTITEM(new TQSpacerItem( size, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum )) );
+		addItem( new TQSpacerItem( size, 0, TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
 	else
-		addItem( TQT_TQLAYOUTITEM(new TQSpacerItem( 0, size, TQSizePolicy::Minimum, TQSizePolicy::Fixed )) );
+		addItem( new TQSpacerItem( 0, size, TQSizePolicy::Minimum, TQSizePolicy::Fixed ) );
 }
 
 TQLayoutIterator