diff options
Diffstat (limited to 'tdecore/kiconeffect.cpp')
| -rw-r--r-- | tdecore/kiconeffect.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/tdecore/kiconeffect.cpp b/tdecore/kiconeffect.cpp index 675731401..cd6b9bad7 100644 --- a/tdecore/kiconeffect.cpp +++ b/tdecore/kiconeffect.cpp @@ -1,4 +1,4 @@ -/* vi: ts=8 sts=4 sw=4 +/* * $Id$ * * This file is part of the KDE project, module tdecore. @@ -35,7 +35,7 @@ #include <kicontheme.h> #include "kiconeffect.h" -#if defined(Q_WS_WIN) || defined(Q_WS_MACX) +#if defined(TQ_WS_WIN) || defined(TQ_WS_MACX) static bool tqt_use_xrender=true; static bool tqt_has_xft=true; #else @@ -287,7 +287,7 @@ void TDEIconEffect::toGray(TQImage &img, float value) int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = img.depth() > 8 ? (unsigned int *) img.bits() - : (unsigned int *) img.tqcolorTable(); + : (unsigned int *) img.colorTable(); int rval, gval, bval, val, alpha, i; for (i=0; i<pixels; i++) { @@ -309,7 +309,7 @@ void TDEIconEffect::colorize(TQImage &img, const TQColor &col, float value) int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = img.depth() > 8 ? (unsigned int *) img.bits() - : (unsigned int *) img.tqcolorTable(); + : (unsigned int *) img.colorTable(); int rval, gval, bval, val, alpha, i; float rcol = col.red(), gcol = col.green(), bcol = col.blue(); for (i=0; i<pixels; i++) @@ -348,7 +348,7 @@ void TDEIconEffect::colorize(TQImage &img, const TQColor &col, float value) void TDEIconEffect::toMonochrome(TQImage &img, const TQColor &black, const TQColor &white, float value) { int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = img.depth() > 8 ? (unsigned int *) img.bits() - : (unsigned int *) img.tqcolorTable(); + : (unsigned int *) img.colorTable(); int rval, gval, bval, alpha, i; int rw = white.red(), gw = white.green(), bw = white.blue(); int rb = black.red(), gb = black.green(), bb = black.blue(); @@ -400,7 +400,7 @@ void TDEIconEffect::deSaturate(TQImage &img, float value) int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = (img.depth() > 8) ? (unsigned int *) img.bits() - : (unsigned int *) img.tqcolorTable(); + : (unsigned int *) img.colorTable(); TQColor color; int h, s, v, i; for (i=0; i<pixels; i++) @@ -418,7 +418,7 @@ void TDEIconEffect::toGamma(TQImage &img, float value) int pixels = (img.depth() > 8) ? img.width()*img.height() : img.numColors(); unsigned int *data = (img.depth() > 8) ? (unsigned int *) img.bits() - : (unsigned int *) img.tqcolorTable(); + : (unsigned int *) img.colorTable(); TQColor color; int i, rval, gval, bval; float gamma; @@ -462,7 +462,7 @@ void TDEIconEffect::semiTransparent(TQImage &img) else for (y=0; y<height; y++) { - QRgb *line = (QRgb *) img.scanLine(y); + TQRgb *line = (TQRgb *) img.scanLine(y); for (x=(y%2); x<width; x+=2) line[x] &= 0x00ffffff; } @@ -530,8 +530,8 @@ void TDEIconEffect::semiTransparent(TQPixmap &pix) for (int y=0; y<img.height(); y++) { - QRgb *line = (QRgb *) img.scanLine(y); - QRgb pattern = (y % 2) ? 0x55555555 : 0xaaaaaaaa; + TQRgb *line = (TQRgb *) img.scanLine(y); + TQRgb pattern = (y % 2) ? 0x55555555 : 0xaaaaaaaa; for (int x=0; x<(img.width()+31)/32; x++) line[x] &= pattern; } @@ -557,11 +557,11 @@ TQImage TDEIconEffect::doublePixels(TQImage src) const int x, y; if (src.depth() == 32) { - QRgb *l1, *l2; + TQRgb *l1, *l2; for (y=0; y<h; y++) { - l1 = (QRgb *) src.scanLine(y); - l2 = (QRgb *) dst.scanLine(y*2); + l1 = (TQRgb *) src.scanLine(y); + l2 = (TQRgb *) dst.scanLine(y*2); for (x=0; x<w; x++) { l2[x*2] = l2[x*2+1] = l1[x]; @@ -669,14 +669,14 @@ void TDEIconEffect::overlay(TQImage &src, TQImage &overlay) if (src.depth() == 32) { - QRgb *oline, *sline; + TQRgb *oline, *sline; int r1, g1, b1, a1; int r2, g2, b2, a2; for (i=0; i<src.height(); i++) { - oline = (QRgb *) overlay.scanLine(i); - sline = (QRgb *) src.scanLine(i); + oline = (TQRgb *) overlay.scanLine(i); + sline = (TQRgb *) src.scanLine(i); for (j=0; j<src.width(); j++) { @@ -743,7 +743,7 @@ TDEIconEffect::visualActivate(TQWidget * widget, TQRect rect) TQPainter p(widget); // Use NotROP to avoid having to repaint the pixmap each time. - p.setPen(TQPen(Qt::black, 2, Qt::DotLine)); + p.setPen(TQPen(TQt::black, 2, TQt::DotLine)); p.setRasterOp(TQt::NotROP); // The spacing between the rects we draw. @@ -846,13 +846,13 @@ TDEIconEffect::visualActivate(TQWidget * widget, TQRect rect, TQPixmap *pixmap) if ((widget->rect().width() <= maxRect.width()) || (widget->rect().height() <= maxRect.height())) { -// p = new TQPainter(TQApplication::desktop()->screen( -1 ), TRUE); // WARNING: This was done in Qt3. It only worked in this placement due to a glitch in Qt3; it has therefore been moved below grabWidget, where it should have been in the first place. +// p = new TQPainter(TQApplication::desktop()->screen( -1 ), true); // WARNING: This was done in Qt3. It only worked in this placement due to a glitch in Qt3; it has therefore been moved below grabWidget, where it should have been in the first place. pix = TQPixmap::grabWindow((TQApplication::desktop()->screen( -1 ))->winId(), maxRect.x(), maxRect.y(), maxRect.width(), maxRect.height()); - p = new TQPainter(TQApplication::desktop()->screen( -1 ), TRUE); + p = new TQPainter(TQApplication::desktop()->screen( -1 ), true); } else { // not as ugly as drawing directly to the screen |