From b08128530cb21bf09a084e48646f2862ece6a285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Mon, 30 Apr 2007 12:38:05 +0000 Subject: [PATCH] Merging from old trunk: r652293 | mlaurent | 2007-04-10 18:31:06 +0200 (Tue, 10 Apr 2007) | 2 lines Qt3support-- svn path=/trunk/KDE/kdebase/workspace/; revision=659577 --- clients/keramik/keramik.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/clients/keramik/keramik.cpp b/clients/keramik/keramik.cpp index 409ea045a3..9f09cd2e1f 100644 --- a/clients/keramik/keramik.cpp +++ b/clients/keramik/keramik.cpp @@ -583,23 +583,23 @@ QPixmap *KeramikHandler::composite( QImage *over, QImage *under ) int width = over->width(), height = over->height(); // Clear the destination image - Q_UINT32 *data = reinterpret_cast( dest.bits() ); + quint32 *data = reinterpret_cast( dest.bits() ); for (int i = 0; i < width * height; i++) *(data++) = 0; // Copy the under image (bottom aligned) to the destination image for (int y1 = height - under->height(), y2 = 0; y1 < height; y1++, y2++ ) { - register Q_UINT32 *dst = reinterpret_cast( dest.scanLine(y1) ); - register Q_UINT32 *src = reinterpret_cast( under->scanLine(y2) ); + register quint32 *dst = reinterpret_cast( dest.scanLine(y1) ); + register quint32 *src = reinterpret_cast( under->scanLine(y2) ); for ( int x = 0; x < width; x++ ) *(dst++) = *(src++); } // Blend the over image onto the destination - register Q_UINT32 *dst = reinterpret_cast( dest.bits() ); - register Q_UINT32 *src = reinterpret_cast( over->bits() ); + register quint32 *dst = reinterpret_cast( dest.bits() ); + register quint32 *src = reinterpret_cast( over->bits() ); for ( int i = 0; i < width * height; i++ ) { int r1 = qRed( *dst ), g1 = qGreen( *dst ), b1 = qBlue( *dst );