diff --git a/atlantik/libatlantikui/estatedetails.cpp b/atlantik/libatlantikui/estatedetails.cpp index 03ff0f13..cc271752 100644 --- a/atlantik/libatlantikui/estatedetails.cpp +++ b/atlantik/libatlantikui/estatedetails.cpp @@ -114,7 +114,7 @@ void EstateDetails::paintEvent(TQPaintEvent *) TQColor greenHouse(0, 255, 0); TQColor redHotel(255, 51, 51); TQPainter painter; - painter.begin(TQT_TQPAINTDEVICE(m_pixmap), this); + painter.begin(m_pixmap, this); painter.setPen(TQt::black); @@ -136,7 +136,7 @@ void EstateDetails::paintEvent(TQPaintEvent *) quartzBuffer->resize(25, (height()/4)-2); TQPainter quartzPainter; - quartzPainter.begin(TQT_TQPAINTDEVICE(quartzBuffer), this); + quartzPainter.begin(quartzBuffer, this); painter.setBrush(titleColor); painter.drawRect(0, 0, width(), titleHeight); diff --git a/atlantik/libatlantikui/estateview.cpp b/atlantik/libatlantikui/estateview.cpp index 47f96572..193ace17 100644 --- a/atlantik/libatlantikui/estateview.cpp +++ b/atlantik/libatlantikui/estateview.cpp @@ -255,7 +255,7 @@ void EstateView::paintEvent(TQPaintEvent *) TQColor greenHouse(0, 255, 0); TQColor redHotel(255, 51, 51); TQPainter painter; - painter.begin(TQT_TQPAINTDEVICE(qpixmap), this); + painter.begin(qpixmap, this); painter.setPen(TQt::black); @@ -281,7 +281,7 @@ void EstateView::paintEvent(TQPaintEvent *) quartzBuffer->resize(m_titleWidth-2, 25); TQPainter quartzPainter; - quartzPainter.begin(TQT_TQPAINTDEVICE(quartzBuffer), this); + quartzPainter.begin(quartzBuffer, this); painter.setBrush(m_estate->color()); switch(m_orientation) diff --git a/atlantik/libatlantikui/portfolioview.cpp b/atlantik/libatlantikui/portfolioview.cpp index cec443e7..7ff1a4c0 100644 --- a/atlantik/libatlantikui/portfolioview.cpp +++ b/atlantik/libatlantikui/portfolioview.cpp @@ -196,7 +196,7 @@ void PortfolioView::paintEvent(TQPaintEvent *) qpixmap = new TQPixmap(width(), height()); TQPainter painter; - painter.begin(TQT_TQPAINTDEVICE(qpixmap), this); + painter.begin(qpixmap, this); painter.setPen(TQt::white); painter.setBrush(TQt::white); diff --git a/atlantik/libatlantikui/token.cpp b/atlantik/libatlantikui/token.cpp index d6534df5..c89d3f49 100644 --- a/atlantik/libatlantikui/token.cpp +++ b/atlantik/libatlantikui/token.cpp @@ -127,7 +127,7 @@ void Token::paintEvent(TQPaintEvent *) qpixmap = new TQPixmap(width(), height()); TQPainter painter; - painter.begin(TQT_TQPAINTDEVICE(qpixmap), this); + painter.begin(qpixmap, this); if (m_image) { diff --git a/kenolaba/Ball.cpp b/kenolaba/Ball.cpp index 8590a059..6f10849a 100644 --- a/kenolaba/Ball.cpp +++ b/kenolaba/Ball.cpp @@ -314,7 +314,7 @@ void BallWidget::resizeEvent(TQResizeEvent *) void BallWidget::paintEvent(TQPaintEvent *) { - paint(TQT_TQPAINTDEVICE(this)); + paint(this); } diff --git a/kenolaba/BoardWidget.cpp b/kenolaba/BoardWidget.cpp index d4178fe6..620b7d77 100644 --- a/kenolaba/BoardWidget.cpp +++ b/kenolaba/BoardWidget.cpp @@ -164,7 +164,7 @@ void BoardWidget::paintEvent(TQPaintEvent *) { if (renderMode) { pm = boardPM; - BallWidget::paint(TQT_TQPAINTDEVICE(&pm)); + BallWidget::paint(&pm); } else draw(); diff --git a/kpat/dealer.cpp b/kpat/dealer.cpp index e021ea8c..2eb3c705 100644 --- a/kpat/dealer.cpp +++ b/kpat/dealer.cpp @@ -1335,7 +1335,7 @@ void Dealer::drawPile(KPixmap &pixmap, Pile *pile, bool selected) sy = -dy; dy = 0; } - bitBlt(TQT_TQPAINTDEVICE(&pixmap), dx, dy, TQT_TQPAINTDEVICE(&bg), + bitBlt(&pixmap, dx, dy, &bg, sx, sy, w, h, TQt::CopyROP, true); } } diff --git a/ksame/StoneWidget.cpp b/ksame/StoneWidget.cpp index c4fbb987..5097ac78 100644 --- a/ksame/StoneWidget.cpp +++ b/ksame/StoneWidget.cpp @@ -72,8 +72,8 @@ StoneWidget::StoneWidget( TQWidget *parent, int x, int y ) for (int s = 0; s < maxslices; s++) { map[c][s].stone.resize(stone_width, stone_height); assert(!map[c][s].stone.isNull()); - bitBlt(TQT_TQPAINTDEVICE(&map[c][s].stone), 0, 0, - TQT_TQPAINTDEVICE(&stonemap), stone_width * s, + bitBlt(&map[c][s].stone, 0, 0, + &stonemap, stone_width * s, c*stone_height, stone_width,stone_height,CopyROP,false); TQImage im = map[c][s].stone.convertToImage(); @@ -276,8 +276,8 @@ StoneWidget::paintEvent( TQPaintEvent *e ) { if (stone->color) { int tslice = stone->marked?slice:0; - bitBlt(TQT_TQPAINTDEVICE(this),cx,cy, - TQT_TQPAINTDEVICE(&map[stone->color-1][tslice].stone), + bitBlt(this,cx,cy, + &map[stone->color-1][tslice].stone, 0, 0, stone_width,stone_height,CopyROP,FALSE); diff --git a/ksnake/pixServer.cpp b/ksnake/pixServer.cpp index b13bfa43..64299e0a 100644 --- a/ksnake/pixServer.cpp +++ b/ksnake/pixServer.cpp @@ -100,7 +100,7 @@ void PixServer::initPixmaps() pm.convertFromImage(qi,TQPixmap::AvoidDither); for (int x = 0 ; x < 18; x++){ compuSnakePix[x].resize(BRICKSIZE, BRICKSIZE); - bitBlt(TQT_TQPAINTDEVICE(&compuSnakePix[x]) ,0,0, TQT_TQPAINTDEVICE(&pm),x*BRICKSIZE, 0, BRICKSIZE, BRICKSIZE, TQt::CopyROP, true); + bitBlt(&compuSnakePix[x] ,0,0, &pm,x*BRICKSIZE, 0, BRICKSIZE, BRICKSIZE, TQt::CopyROP, true); compuSnakePix[x].setMask(compuSnakePix[x].createHeuristicMask()); } @@ -110,7 +110,7 @@ void PixServer::initPixmaps() pm.convertFromImage(qi,TQPixmap::AvoidDither); for (int x = 0 ; x < 18; x++){ samyPix[x].resize(BRICKSIZE, BRICKSIZE); - bitBlt(TQT_TQPAINTDEVICE(&samyPix[x]) ,0,0, TQT_TQPAINTDEVICE(&pm),x*BRICKSIZE, 0, BRICKSIZE, BRICKSIZE, TQt::CopyROP, true); + bitBlt(&samyPix[x] ,0,0, &pm,x*BRICKSIZE, 0, BRICKSIZE, BRICKSIZE, TQt::CopyROP, true); samyPix[x].setMask(samyPix[x].createHeuristicMask()); } @@ -120,7 +120,7 @@ void PixServer::initPixmaps() pm.convertFromImage(qi,TQPixmap::AvoidDither); for (int x = 0 ; x < 4; x++){ ballPix[x].resize(BRICKSIZE, BRICKSIZE); - bitBlt(TQT_TQPAINTDEVICE(&ballPix[x]) ,0,0, TQT_TQPAINTDEVICE(&pm),x*BRICKSIZE, 0, BRICKSIZE, BRICKSIZE, TQt::CopyROP, true); + bitBlt(&ballPix[x] ,0,0, &pm,x*BRICKSIZE, 0, BRICKSIZE, BRICKSIZE, TQt::CopyROP, true); ballPix[x].setMask(ballPix[x].createHeuristicMask()); } @@ -130,7 +130,7 @@ void PixServer::initPixmaps() pm.convertFromImage(qi,TQPixmap::AvoidDither); for (int x = 0 ; x < 2; x++){ applePix[x].resize(BRICKSIZE, BRICKSIZE); - bitBlt(TQT_TQPAINTDEVICE(&applePix[x]) ,0,0, TQT_TQPAINTDEVICE(&pm),x*BRICKSIZE, 0, BRICKSIZE, BRICKSIZE, TQt::CopyROP, true); + bitBlt(&applePix[x] ,0,0, &pm,x*BRICKSIZE, 0, BRICKSIZE, BRICKSIZE, TQt::CopyROP, true); applePix[x].setMask(applePix[x].createHeuristicMask()); } } diff --git a/libksirtet/lib/types.cpp b/libksirtet/lib/types.cpp index 54aa79e6..e6c3e836 100644 --- a/libksirtet/lib/types.cpp +++ b/libksirtet/lib/types.cpp @@ -187,7 +187,7 @@ void Stream::setArray(TQByteArray a) bool ReadingStream::readOk() { - return ( TQT_TQIODEVICE(&buf)->status()==IO_Ok ); + return ( buf.status()==IO_Ok ); } void ReadingStream::clearRead() diff --git a/libtdegames/kgame/kmessageclient.cpp b/libtdegames/kgame/kmessageclient.cpp index 8c9278b6..eddd6f9f 100644 --- a/libtdegames/kgame/kmessageclient.cpp +++ b/libtdegames/kgame/kmessageclient.cpp @@ -155,7 +155,7 @@ void KMessageClient::sendBroadcast (const TQByteArray &msg) TQDataStream stream (&buffer); stream << static_cast ( KMessageServer::REQ_BROADCAST ); - TQT_TQIODEVICE(&buffer)->writeBlock (msg); + buffer.writeBlock (msg); sendServerMessage (sendBuffer); } @@ -167,7 +167,7 @@ void KMessageClient::sendForward (const TQByteArray &msg, const TQValueList ( KMessageServer::REQ_FORWARD ) << clients; - TQT_TQIODEVICE(&buffer)->writeBlock (msg); + buffer.writeBlock (msg); sendServerMessage (sendBuffer); } diff --git a/libtdegames/kgame/kmessageserver.cpp b/libtdegames/kgame/kmessageserver.cpp index 0ea66dda..cd5da802 100644 --- a/libtdegames/kgame/kmessageserver.cpp +++ b/libtdegames/kgame/kmessageserver.cpp @@ -415,10 +415,7 @@ void KMessageServer::processOneMessage () { case REQ_BROADCAST: out_stream << TQ_UINT32 (MSG_BROADCAST) << clientID; - // FIXME, compiler bug? - // this should be okay, since TQBuffer is subclass of TQIODevice! : - // out_buffer.writeBlock (in_buffer.readAll()); - TQT_TQIODEVICE(&out_buffer)->writeBlock (in_buffer.readAll()); + out_buffer.writeBlock (in_buffer.readAll()); broadcastMessage (out_msg); break; @@ -427,8 +424,7 @@ void KMessageServer::processOneMessage () TQValueList clients; in_stream >> clients; out_stream << TQ_UINT32 (MSG_FORWARD) << clientID << clients; - // see above! - TQT_TQIODEVICE(&out_buffer)->writeBlock (in_buffer.readAll()); + out_buffer.writeBlock (in_buffer.readAll()); sendMessage (clients, out_msg); } break; diff --git a/lskat/lskat/lskatview.cpp b/lskat/lskat/lskatview.cpp index d8a1a9bd..f26de4a2 100644 --- a/lskat/lskat/lskatview.cpp +++ b/lskat/lskat/lskatview.cpp @@ -760,7 +760,7 @@ void LSkatView::paintEvent( TQPaintEvent * e) TQPixmap pm(this->rect().size()); TQPainter p; TQBrush brush; - p.begin(TQT_TQPAINTDEVICE(&pm),this); + p.begin(&pm,this); brush.setPixmap( getDocument()->mPixBackground ); p.fillRect(0,0,this->rect().width(),this->rect().height(),brush); drawIntro(&p);