summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--digikam/libs/widgets/common/curveswidget.cpp8
-rw-r--r--digikam/libs/widgets/common/histogramwidget.cpp10
-rw-r--r--digikam/libs/widgets/imageplugins/imageguidewidget.cpp10
-rw-r--r--digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp2
-rw-r--r--digikam/utilities/imageeditor/canvas/canvas.cpp4
-rw-r--r--digikam/utilities/imageeditor/editor/imageiface.cpp6
-rw-r--r--digikam/utilities/slideshow/slideshow.cpp2
7 files changed, 21 insertions, 21 deletions
diff --git a/digikam/libs/widgets/common/curveswidget.cpp b/digikam/libs/widgets/common/curveswidget.cpp
index d050778..8ac7bdc 100644
--- a/digikam/libs/widgets/common/curveswidget.cpp
+++ b/digikam/libs/widgets/common/curveswidget.cpp
@@ -312,7 +312,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
int asize = 24;
TQPixmap anim(asize, asize);
TQPainter p2;
- p2.begin(TQT_TQPAINTDEVICE(&anim), this);
+ p2.begin(&anim, this);
p2.fillRect(0, 0, asize, asize, palette().active().background());
p2.translate(asize/2, asize/2);
@@ -330,7 +330,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
TQPixmap pm(size());
TQPainter p1;
- p1.begin(TQT_TQPAINTDEVICE(&pm), this);
+ p1.begin(&pm, this);
p1.fillRect(0, 0, width(), height(), palette().active().background());
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
@@ -353,7 +353,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
{
TQPixmap pm(size());
TQPainter p1;
- p1.begin(TQT_TQPAINTDEVICE(&pm), this);
+ p1.begin(&pm, this);
p1.fillRect(0, 0, width(), height(), palette().active().background());
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
@@ -418,7 +418,7 @@ void CurvesWidget::paintEvent(TQPaintEvent*)
TQPixmap pm(size());
TQPainter p1;
- p1.begin(TQT_TQPAINTDEVICE(&pm), this);
+ p1.begin(&pm, this);
int curvePrevVal = 0;
diff --git a/digikam/libs/widgets/common/histogramwidget.cpp b/digikam/libs/widgets/common/histogramwidget.cpp
index 44b52c7..114e788 100644
--- a/digikam/libs/widgets/common/histogramwidget.cpp
+++ b/digikam/libs/widgets/common/histogramwidget.cpp
@@ -383,7 +383,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
{
TQPixmap pm(size());
TQPainter p1;
- p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
+ p1.begin(&pm, TQT_TQOBJECT(this));
p1.fillRect(0, 0, size().width(), size().height(), palette().disabled().background());
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
@@ -405,7 +405,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
int asize = 24;
TQPixmap anim(asize, asize);
TQPainter p2;
- p2.begin(TQT_TQPAINTDEVICE(&anim), TQT_TQOBJECT(this));
+ p2.begin(&anim, TQT_TQOBJECT(this));
p2.fillRect(0, 0, asize, asize, palette().active().background());
p2.translate(asize/2, asize/2);
@@ -423,7 +423,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
TQPixmap pm(size());
TQPainter p1;
- p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
+ p1.begin(&pm, TQT_TQOBJECT(this));
p1.fillRect(0, 0, width(), height(), palette().active().background());
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
@@ -447,7 +447,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
{
TQPixmap pm(size());
TQPainter p1;
- p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
+ p1.begin(&pm, TQT_TQOBJECT(this));
p1.fillRect(0, 0, width(), height(), palette().active().background());
p1.setPen(TQPen(palette().active().foreground(), 1, TQt::SolidLine));
p1.drawRect(0, 0, width(), height());
@@ -524,7 +524,7 @@ void HistogramWidget::paintEvent(TQPaintEvent*)
TQPixmap pm(size());
TQPainter p1;
- p1.begin(TQT_TQPAINTDEVICE(&pm), TQT_TQOBJECT(this));
+ p1.begin(&pm, TQT_TQOBJECT(this));
p1.fillRect(0, 0, width(), height(), palette().active().background());
// Drawing selection or all histogram values.
diff --git a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp
index 43ce104..4ed7f25 100644
--- a/digikam/libs/widgets/imageplugins/imageguidewidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imageguidewidget.cpp
@@ -253,7 +253,7 @@ void ImageGuideWidget::updatePixmap()
else if (d->renderingPreviewMode == PreviewTargetImage || d->renderingPreviewMode == NoPreviewMode ||
(d->renderingPreviewMode == PreviewToggleOnMouseOver && d->onMouseMovePreviewToggled == true ))
{
- d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap), d->rect.x(), d->rect.y(),
+ d->iface->paint(d->pixmap, d->rect.x(), d->rect.y(),
d->rect.width(), d->rect.height(),
d->underExposureIndicator, d->overExposureIndicator);
@@ -278,7 +278,7 @@ void ImageGuideWidget::updatePixmap()
p.drawPixmap(d->rect, d->iface->convertToPixmap(d->preview));
// Drawing the target image under the original.
- d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap),
+ d->iface->paint(d->pixmap,
d->rect.x()+d->rect.width()/2,
d->rect.y(),
d->rect.width()/2,
@@ -289,7 +289,7 @@ void ImageGuideWidget::updatePixmap()
else
{
// Drawing the target image.
- d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap),
+ d->iface->paint(d->pixmap,
d->rect.x(),
d->rect.y(),
d->rect.width(),
@@ -344,7 +344,7 @@ void ImageGuideWidget::updatePixmap()
p.drawPixmap(d->rect, d->iface->convertToPixmap(d->preview));
// Drawing the target image under the original.
- d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap),
+ d->iface->paint(d->pixmap,
d->rect.x(),
d->rect.y()+d->rect.height()/2,
d->rect.width(),
@@ -355,7 +355,7 @@ void ImageGuideWidget::updatePixmap()
else
{
// Drawing the target image.
- d->iface->paint(TQT_TQPAINTDEVICE(d->pixmap),
+ d->iface->paint(d->pixmap,
d->rect.x(),
d->rect.y(),
d->rect.width(),
diff --git a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp b/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp
index 8fbeb17..3856422 100644
--- a/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp
+++ b/digikam/libs/widgets/imageplugins/imagepaniconwidget.cpp
@@ -104,7 +104,7 @@ void ImagePanIconWidget::updatePixmap()
{
// Drawing background and image.
m_pixmap->fill(colorGroup().background());
- d->iface->paint(TQT_TQPAINTDEVICE(m_pixmap), m_rect.x(), m_rect.y(), m_rect.width(), m_rect.height());
+ d->iface->paint(m_pixmap, m_rect.x(), m_rect.y(), m_rect.width(), m_rect.height());
TQPainter p(m_pixmap);
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);
}
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 05:23:49 +0000