diff options
Diffstat (limited to 'digikam/utilities')
| -rw-r--r-- | digikam/utilities/imageeditor/canvas/canvas.cpp | 4 | ||||
| -rw-r--r-- | digikam/utilities/imageeditor/editor/imageiface.cpp | 6 | ||||
| -rw-r--r-- | digikam/utilities/slideshow/slideshow.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/digikam/utilities/imageeditor/canvas/canvas.cpp b/digikam/utilities/imageeditor/canvas/canvas.cpp index f91e418..128a0da 100644 --- a/digikam/utilities/imageeditor/canvas/canvas.cpp +++ b/digikam/utilities/imageeditor/canvas/canvas.cpp @@ -568,7 +568,7 @@ void Canvas::paintViewport(const TQRect& er, bool antialias) TQRect rr(d->rubber->normalize()); TQRect r(i, j, d->tileSize, d->tileSize); - d->im->paintOnDevice(TQT_TQPAINTDEVICE(pix), sx, sy, sw, sh, + d->im->paintOnDevice(pix, sx, sy, sw, sh, 0, 0, d->tileSize, d->tileSize, rr.x() - i - d->pixmapRect.x(), rr.y() - j - d->pixmapRect.y(), @@ -591,7 +591,7 @@ void Canvas::paintViewport(const TQRect& er, bool antialias) } else { - d->im->paintOnDevice(TQT_TQPAINTDEVICE(pix), sx, sy, sw, sh, + d->im->paintOnDevice(pix, sx, sy, sw, sh, 0, 0, d->tileSize, d->tileSize, antialias); } diff --git a/digikam/utilities/imageeditor/editor/imageiface.cpp b/digikam/utilities/imageeditor/editor/imageiface.cpp index aa842e0..56cb559 100644 --- a/digikam/utilities/imageeditor/editor/imageiface.cpp +++ b/digikam/utilities/imageeditor/editor/imageiface.cpp @@ -420,7 +420,7 @@ void ImageIface::paint(TQPaintDevice* device, int x, int y, int w, int h, pixImage = d->targetPreviewImage.convertToPixmap(); } - bitBlt(TQT_TQPAINTDEVICE(&d->qpix), 0, 0, TQT_TQPAINTDEVICE(&pixImage), 0, 0, w, h, TQt::CopyROP, false); + bitBlt(&d->qpix, 0, 0, static_cast<TQPaintDevice*>(&pixImage), 0, 0, w, h, TQt::CopyROP, false); // Show the Over/Under exposure pixels indicators @@ -434,11 +434,11 @@ void ImageIface::paint(TQPaintDevice* device, int x, int y, int w, int h, TQImage pureColorMask = d->targetPreviewImage.pureColorMask(&expoSettings); TQPixmap pixMask(pureColorMask); - bitBlt(TQT_TQPAINTDEVICE(&d->qpix), 0, 0, TQT_TQPAINTDEVICE(&pixMask), 0, 0, w, h, TQt::CopyROP, false); + bitBlt(&d->qpix, 0, 0, static_cast<TQPaintDevice*>(&pixMask), 0, 0, w, h, TQt::CopyROP, false); } } - bitBlt(TQT_TQPAINTDEVICE(device), x, y, TQT_TQPAINTDEVICE(&d->qpix), 0, 0, -1, -1, TQt::CopyROP, false); + bitBlt(device, x, y, static_cast<TQPaintDevice*>(&d->qpix), 0, 0, -1, -1, TQt::CopyROP, false); } } // namespace Digikam diff --git a/digikam/utilities/slideshow/slideshow.cpp b/digikam/utilities/slideshow/slideshow.cpp index 0983e8c..a97ad19 100644 --- a/digikam/utilities/slideshow/slideshow.cpp +++ b/digikam/utilities/slideshow/slideshow.cpp @@ -534,7 +534,7 @@ void SlideShow::printComments(TQPainter &p, int &offset, const TQString& comment void SlideShow::paintEvent(TQPaintEvent *) { - bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&d->pixmap), + bitBlt(this, 0, 0, static_cast<TQPaintDevice*>(&d->pixmap), 0, 0, d->pixmap.width(), d->pixmap.height(), TQt::CopyROP, true); } |