TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


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

1 files changed, 9 insertions, 9 deletions

diff --git a/kopete/libkopete/webcamwidget.cpp b/kopete/libkopete/webcamwidget.cpp
index ad701b8e..0e47a0d4 100644
--- a/kopete/libkopete/webcamwidget.cpp
+++ b/kopete/libkopete/webcamwidget.cpp
@@ -23,8 +23,8 @@
 namespace Kopete
 {
 
-WebcamWidget::WebcamWidget( TQWidget* parent, const char* name )
-: TQWidget( parent, name )
+WebcamWidget::WebcamWidget( TQWidget* tqparent, const char* name )
+: TQWidget( tqparent, name )
 {
 	clear();
 }
@@ -67,13 +67,13 @@ void WebcamWidget::setText(const TQString& text)
 
 void WebcamWidget::paintEvent( TQPaintEvent* event )
 {
-	TQMemArray<TQRect> rects = event->region().rects();
+	TQMemArray<TQRect> rects = TQRegion(event->region()).tqrects();
 
 	if (!mPixmap.isNull())
 	{
 		for (unsigned int i = 0; i < rects.count(); ++i)
 		{
-			bitBlt(this, rects[i].topLeft(), &mPixmap, rects[i], Qt::CopyROP, true);
+			bitBlt(TQT_TQPAINTDEVICE(this), rects[i].topLeft(), TQT_TQPAINTDEVICE(&mPixmap), rects[i], TQt::CopyROP, true);
 		}
 	}
 	else
@@ -88,17 +88,17 @@ void WebcamWidget::paintEvent( TQPaintEvent* event )
 
 	// TODO: draw the text
 	TQPainter p(this);
-	TQRect r = p.boundingRect(rect(), Qt::AlignCenter | Qt::WordBreak, mText );
+	TQRect r = p.boundingRect(rect(), TQt::AlignCenter | TQt::WordBreak, mText );
 	if ( !mText.isEmpty() && event->rect().intersects(r))
 	{
-		p.setPen(Qt::black);
+		p.setPen(TQt::black);
 		TQRect rec = rect();
 		rec.moveTopLeft(TQPoint(1,1));
-		p.drawText(rec, Qt::AlignCenter | Qt::WordBreak, mText, -1); 
+		p.drawText(rec, TQt::AlignCenter | TQt::WordBreak, mText, -1); 
 
 		rec.moveTopLeft(TQPoint(-1,-1));
-		p.setPen(Qt::white);
-		p.drawText(rec, Qt::AlignCenter | Qt::WordBreak, mText, -1); 
+		p.setPen(TQt::white);
+		p.drawText(rec, TQt::AlignCenter | TQt::WordBreak, mText, -1); 
 	}
 }