[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-devel
Subject: Re: Some EBN fixes
From: "=?ISO-8859-1?Q?Nicolas_L=E9cureuil?=" <neoclust.kde () gmail ! com>
Date: 2007-05-16 19:09:48
Message-ID: 547338e40705161209m522ccd8q3856424a4e6dbe04 () mail ! gmail ! com
[Download RAW message or body]
2007/5/16, Stephen Leaf <smileaf@smileaf.org>:
> On Tuesday 15 May 2007 14:23:08 Nicolas L=E9cureuil wrote:
> > Hi,
> >
> > i fixes some EBN on kdebase ( TRUE / FALSE and QMIN / QMAX ). I attache=
d my
> > patch.
> >
> > I hope it can be commited.
> >
> >
> > Regards
> >
> > Nicolas
>
> Just a small thing that I noticed, you might wanna check that "whole word=
s
> only" option when you go to do the find/replace. Otherwise you get lines
> like:
> #ifndef QT_NO_IMAGE_TRUECOLOR
> Getting changed to:
> #ifndef QT_NO_IMAGE_trueCOLOR
> which will cause problems.
My apologies, i reread but missed one. Here's the fixed one. Thanks
for you comment
["Kdebase-EBN-Fixes.patch" (text/x-patch)]
Index: workspace/ksmserver/shutdowndlg.cpp
===================================================================
--- workspace/ksmserver/shutdowndlg.cpp (revision 665052)
+++ workspace/ksmserver/shutdowndlg.cpp (working copy)
@@ -133,9 +133,9 @@
#ifdef __GNUC__
#warning "Which one of the following two is correct?"
#endif
- w = QMAX( QFontMetrics(fnt).width( upper ) + 6, QFontMetrics(fnt).width( lower ) + 6 );
- w = QMAX( w, width() );
- h = QMAX( height(), 2 * QFontMetrics( fnt ).lineSpacing() + 52 + GLOW_WIDTH );
+ w = qMax( QFontMetrics(fnt).width( upper ) + 6, QFontMetrics(fnt).width( lower ) + 6 );
+ w = qMax( w, width() );
+ h = qMax( height(), 2 * QFontMetrics( fnt ).lineSpacing() + 52 + GLOW_WIDTH );
if( w > width() || h > height()) {
setMinimumSize( w, h );
updateGeometry();
Index: workspace/ksplash/ksplashx/qimage.cpp
===================================================================
--- workspace/ksplash/ksplashx/qimage.cpp (revision 665052)
+++ workspace/ksplash/ksplashx/qimage.cpp (working copy)
@@ -492,11 +492,11 @@
data->nbytes = bpl*h;
if ( colortable || !data->ncols ) {
data->ctbl = colortable;
- data->ctbl_mine = FALSE;
+ data->ctbl_mine = false;
} else {
// calloc since we realloc, etc. later (ick)
data->ctbl = (QRgb*)calloc( data->ncols*sizeof(QRgb), data->ncols );
- data->ctbl_mine = TRUE;
+ data->ctbl_mine = true;
}
uchar** jt = (uchar**)malloc(h*sizeof(uchar*));
for (int j=0; j<h; j++) {
@@ -537,11 +537,11 @@
data->nbytes = bpl * h;
if ( colortable || !numColors ) {
data->ctbl = colortable;
- data->ctbl_mine = FALSE;
+ data->ctbl_mine = false;
} else {
// calloc since we realloc, etc. later (ick)
data->ctbl = (QRgb*)calloc( numColors*sizeof(QRgb), numColors );
- data->ctbl_mine = TRUE;
+ data->ctbl_mine = true;
}
uchar** jt = (uchar**)malloc(h*sizeof(uchar*));
for (int j=0; j<h; j++) {
@@ -727,14 +727,14 @@
// alpha channel should be only copied, not used by bitBlt(), and
// this is mutable, we will restore the image state before returning
QImage *that = (QImage *) this;
- that->setAlphaBuffer( FALSE );
+ that->setAlphaBuffer( false );
}
memcpy( image.colorTable(), colorTable(), numColors()*sizeof(QRgb) );
bitBlt( &image, dx, dy, this, x, y, -1, -1, conversion_flags );
if ( has_alpha ) {
// restore image state
QImage *that = (QImage *) this;
- that->setAlphaBuffer( TRUE );
+ that->setAlphaBuffer( true );
}
image.setAlphaBuffer(hasAlphaBuffer());
image.data->dpmx = dotsPerMeterX();
@@ -762,7 +762,7 @@
/*!
\fn bool QImage::isNull() const
- Returns TRUE if it is a null image; otherwise returns FALSE.
+ Returns true if it is a null image; otherwise returns false.
A null image has all parameters set to zero and no allocated data.
*/
@@ -1148,7 +1148,7 @@
if ( data->ctbl_mine )
free( data->ctbl );
else
- data->ctbl_mine = TRUE;
+ data->ctbl_mine = true;
data->ctbl = 0;
}
data->ncols = 0;
@@ -1161,7 +1161,7 @@
(numColors-data->ncols)*sizeof(QRgb) );
} else { // create new color table
data->ctbl = (QRgb*)calloc( numColors*sizeof(QRgb), 1 );
- data->ctbl_mine = TRUE;
+ data->ctbl_mine = true;
}
data->ncols = data->ctbl == 0 ? 0 : numColors;
}
@@ -1170,14 +1170,14 @@
/*!
\fn bool QImage::hasAlphaBuffer() const
- Returns TRUE if alpha buffer mode is enabled; otherwise returns
- FALSE.
+ Returns true if alpha buffer mode is enabled; otherwise returns
+ false.
\sa setAlphaBuffer()
*/
/*!
- Enables alpha buffer mode if \a enable is TRUE, otherwise disables
+ Enables alpha buffer mode if \a enable is true, otherwise disables
it. The default setting is disabled.
An 8-bpp image has 8-bit pixels. A pixel is an index into the
@@ -1206,8 +1206,8 @@
/*!
Sets the image \a width, \a height, \a depth, its number of colors
- (in \a numColors), and bit order. Returns TRUE if successful, or
- FALSE if the parameters are incorrect or if memory cannot be
+ (in \a numColors), and bit order. Returns true if successful, or
+ false if the parameters are incorrect or if memory cannot be
allocated.
The \a width and \a height is limited to 32767. \a depth must be
@@ -1231,12 +1231,12 @@
{
reset(); // reset old data
if ( width <= 0 || height <= 0 || depth <= 0 || numColors < 0 )
- return FALSE; // invalid parameter(s)
+ return false; // invalid parameter(s)
if ( depth == 1 && bitOrder == IgnoreEndian ) {
#if defined(QT_CHECK_RANGE)
qWarning( "QImage::create: Bit order is required for 1 bpp images" );
#endif
- return FALSE;
+ return false;
}
if ( depth != 1 )
bitOrder = IgnoreEndian;
@@ -1257,18 +1257,18 @@
#endif
break;
default: // invalid depth
- return FALSE;
+ return false;
}
if ( depth == 32 )
numColors = 0;
setNumColors( numColors );
if ( data->ncols != numColors ) // could not alloc color table
- return FALSE;
+ return false;
if ( INT_MAX / depth < width) { // sanity check for potential overflow
setNumColors( 0 );
- return FALSE;
+ return false;
}
// Qt/Embedded doesn't waste memory on unnecessary padding.
#ifdef Q_WS_QWS
@@ -1281,7 +1281,7 @@
#endif
if (INT_MAX / bpl < height) { // sanity check for potential overflow
setNumColors( 0 );
- return FALSE;
+ return false;
}
int nbytes = bpl*height; // image size
int ptbl = height*sizeof(uchar*); // pointer table size
@@ -1290,7 +1290,7 @@
Q_CHECK_PTR(p);
if ( !p ) { // no memory
setNumColors( 0 );
- return FALSE;
+ return false;
}
data->w = width;
data->h = height;
@@ -1306,7 +1306,7 @@
memset( d+bpl-pad, 0, pad );
d += bpl;
}
- return TRUE;
+ return true;
}
/*!
@@ -1337,7 +1337,7 @@
data->ctbl = 0;
data->bits = 0;
data->bitordr = QImage::IgnoreEndian;
- data->alpha = FALSE;
+ data->alpha = false;
#ifndef QT_NO_IMAGE_TEXT
data->misc = 0;
#endif
@@ -1384,18 +1384,18 @@
{
register QRgb *p;
uchar *b;
- bool do_quant = FALSE;
+ bool do_quant = false;
int y, x;
if ( !dst->create(src->width(), src->height(), 8, 256) )
- return FALSE;
+ return false;
const int tablesize = 997; // prime
QRgbMap table[tablesize];
int pix=0;
QRgb amask = src->hasAlphaBuffer() ? 0xffffffff : 0x00ffffff;
if ( src->hasAlphaBuffer() )
- dst->setAlphaBuffer(TRUE);
+ dst->setAlphaBuffer(true);
if ( palette ) {
// Preload palette into table.
@@ -1429,7 +1429,7 @@
}
if ( (conversion_flags & Qt::DitherMode_Mask) == Qt::PreferDither ) {
- do_quant = TRUE;
+ do_quant = true;
} else {
for ( y=0; y<src->height(); y++ ) { // check if <= 256 colors
p = (QRgb *)src->scanLine(y);
@@ -1450,7 +1450,7 @@
} else {
// Cannot be in table
if ( pix == 256 ) { // too many colors
- do_quant = TRUE;
+ do_quant = true;
// Break right out
x = 0;
y = src->height();
@@ -1597,7 +1597,7 @@
// Bi-directional error diffusion
if ( y&1 ) {
for (x=0; x<sw; x++) {
- int pix = QMAX(QMIN(5, (l1[x] * 5 + 128)/ 255), 0);
+ int pix = qMax(qMin(5, (l1[x] * 5 + 128)/ 255), 0);
int err = l1[x] - pix * 255 / 5;
pv[chan][x] = pix;
@@ -1612,7 +1612,7 @@
}
} else {
for (x=sw; x-->0; ) {
- int pix = QMAX(QMIN(5, (l1[x] * 5 + 128)/ 255), 0);
+ int pix = qMax(qMin(5, (l1[x] * 5 + 128)/ 255), 0);
int err = l1[x] - pix * 255 / 5;
pv[chan][x] = pix;
@@ -1682,14 +1682,14 @@
}
- return TRUE;
+ return true;
}
static bool convert_8_to_32( const QImage *src, QImage *dst )
{
if ( !dst->create(src->width(), src->height(), 32) )
- return FALSE; // create failed
+ return false; // create failed
dst->setAlphaBuffer( src->hasAlphaBuffer() );
for ( int y=0; y<dst->height(); y++ ) { // for each scan line...
register uint *p = (uint *)dst->scanLine(y);
@@ -1698,14 +1698,14 @@
while ( p < end )
*p++ = src->color(*b++);
}
- return TRUE;
+ return true;
}
static bool convert_1_to_32( const QImage *src, QImage *dst )
{
if ( !dst->create(src->width(), src->height(), 32) )
- return FALSE; // could not create
+ return false; // could not create
dst->setAlphaBuffer( src->hasAlphaBuffer() );
for ( int y=0; y<dst->height(); y++ ) { // for each scan line...
register uint *p = (uint *)dst->scanLine(y);
@@ -1725,14 +1725,14 @@
}
}
}
- return TRUE;
+ return true;
}
#endif // QT_NO_IMAGE_TRUECOLOR
static bool convert_1_to_8( const QImage *src, QImage *dst )
{
if ( !dst->create(src->width(), src->height(), 8, 2) )
- return FALSE; // something failed
+ return false; // something failed
dst->setAlphaBuffer( src->hasAlphaBuffer() );
if (src->numColors() >= 2) {
dst->setColor( 0, src->color(0) ); // copy color table
@@ -1763,7 +1763,7 @@
}
}
}
- return TRUE;
+ return true;
}
#ifndef QT_NO_IMAGE_DITHER_TO_1
@@ -1775,7 +1775,7 @@
int conversion_flags, bool fromalpha )
{
if ( !dst->create(src->width(), src->height(), 1, 2, QImage::BigEndian) )
- return FALSE; // something failed
+ return false; // something failed
enum { Threshold, Ordered, Diffuse } dithermode;
@@ -1822,7 +1822,7 @@
int *line2 = new int[w];
int bmwidth = (w+7)/8;
if ( !(line1 && line2) )
- return FALSE;
+ return false;
register uchar *p;
uchar *end;
int *b1, *b2;
@@ -2052,7 +2052,7 @@
}
}
}
- return TRUE;
+ return true;
}
#endif
@@ -2070,7 +2070,7 @@
static bool convert_16_to_32( const QImage *src, QImage *dst )
{
if ( !dst->create(src->width(), src->height(), 32) )
- return FALSE; // create failed
+ return false; // create failed
dst->setAlphaBuffer( src->hasAlphaBuffer() );
for ( int y=0; y<dst->height(); y++ ) { // for each scan line...
register uint *p = (uint *)dst->scanLine(y);
@@ -2079,14 +2079,14 @@
while ( p < end )
*p++ = qt_conv16ToRgb( *s++ );
}
- return TRUE;
+ return true;
}
static bool convert_32_to_16( const QImage *src, QImage *dst )
{
if ( !dst->create(src->width(), src->height(), 16) )
- return FALSE; // create failed
+ return false; // create failed
dst->setAlphaBuffer( src->hasAlphaBuffer() );
for ( int y=0; y<dst->height(); y++ ) { // for each scan line...
register ushort *p = (ushort *)dst->scanLine(y);
@@ -2095,7 +2095,7 @@
while ( p < end )
*p++ = qt_convRgbTo16( *s++ );
}
- return TRUE;
+ return true;
}
@@ -2125,7 +2125,7 @@
image = *this; // no conversion
#ifndef QT_NO_IMAGE_DITHER_TO_1
else if ( (data->d == 8 || data->d == 32) && depth == 1 ) // dither
- dither_to_1( this, &image, conversion_flags, FALSE );
+ dither_to_1( this, &image, conversion_flags, false );
#endif
#ifndef QT_NO_IMAGE_TRUECOLOR
else if ( data->d == 32 && depth == 8 ) // 32 -> 8
@@ -2170,8 +2170,8 @@
}
/*!
- Returns TRUE if ( \a x, \a y ) is a valid coordinate in the image;
- otherwise returns FALSE.
+ Returns true if ( \a x, \a y ) is a valid coordinate in the image;
+ otherwise returns false.
\sa width() height() pixelIndex()
*/
@@ -2372,9 +2372,9 @@
}
/*!
- Returns TRUE if all the colors in the image are shades of gray
+ Returns true if all the colors in the image are shades of gray
(i.e. their red, green and blue components are equal); otherwise
- returns FALSE.
+ returns false.
This function is slow for large 16-bit (Qt/Embedded only) and 32-bit images.
@@ -2388,33 +2388,33 @@
QRgb* b = (QRgb*)bits();
while (p--)
if (!isGray(*b++))
- return FALSE;
+ return false;
#ifndef QT_NO_IMAGE_16_BIT
} else if (depth()==16) {
int p = width()*height();
ushort* b = (ushort*)bits();
while (p--)
if (!is16BitGray(*b++))
- return FALSE;
+ return false;
#endif
} else
#endif //QT_NO_IMAGE_TRUECOLOR
{
- if (!data->ctbl) return TRUE;
+ if (!data->ctbl) return true;
for (int i=0; i<numColors(); i++)
if (!isGray(data->ctbl[i]))
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
/*!
For 16-bit (Qt/Embedded only) and 32-bit images, this function is
equivalent to allGray().
- For 8-bpp images, this function returns TRUE if color(i) is
+ For 8-bpp images, this function returns true if color(i) is
QRgb(i,i,i) for all indices of the color table; otherwise returns
- FALSE.
+ false.
\sa allGray() depth()
*/
@@ -2431,11 +2431,11 @@
case 8: {
for (int i=0; i<numColors(); i++)
if (data->ctbl[i] != qRgb(i,i,i))
- return FALSE;
- return TRUE;
+ return false;
+ return true;
}
}
- return FALSE;
+ return false;
}
#ifndef QT_NO_IMAGE_SMOOTHSCALE
@@ -2494,7 +2494,7 @@
tempxelrow = new QRgb[cols];
if ( src.hasAlphaBuffer() ) {
- dst.setAlphaBuffer(TRUE);
+ dst.setAlphaBuffer( true );
as = new long[cols];
for ( col = 0; col < cols; ++col )
as[col] = HALFSCALE;
@@ -3043,7 +3043,7 @@
QImage QImage::createAlphaMask( int conversion_flags ) const
{
if ( conversion_flags == 1 ) {
- // Old code is passing "TRUE".
+ // Old code is passing "true".
conversion_flags = Qt::DiffuseAlphaDither;
}
@@ -3058,7 +3058,7 @@
}
QImage mask1;
- dither_to_1( this, &mask1, conversion_flags, TRUE );
+ dither_to_1( this, &mask1, conversion_flags, true );
return mask1;
}
#endif
@@ -3076,7 +3076,7 @@
The returned image has little-endian bit order, which you can
convert to big-endianness using convertBitOrder().
- If \a clipTight is TRUE the mask is just large enough to cover the
+ If \a clipTight is true the mask is just large enough to cover the
pixels; otherwise, the mask is larger than the data pixels.
This function disregards the \link hasAlphaBuffer() alpha buffer
@@ -3118,10 +3118,10 @@
}
int x,y;
- bool done = FALSE;
+ bool done = false;
uchar *ypp, *ypc, *ypn;
while( !done ) {
- done = TRUE;
+ done = true;
ypn = m.scanLine(0);
ypc = 0;
for ( y = 0; y < h; y++ ) {
@@ -3139,7 +3139,7 @@
!(*(ypn + (x >> 3)) & (1 << (x & 7))) ) &&
( (*(ypc + (x >> 3)) & (1 << (x & 7))) ) &&
( (*p & 0x00ffffff) == background ) ) {
- done = FALSE;
+ done = false;
*(ypc + (x >> 3)) &= ~(1 << (x & 7));
}
p++;
@@ -3189,7 +3189,7 @@
Returns a mirror of the image, mirrored in the horizontal and/or
the vertical direction depending on whether \a horizontal and \a
- vertical are set to TRUE or FALSE. The original image is not
+ vertical are set to true or false. The original image is not
changed.
\sa smoothScale()
@@ -3292,7 +3292,7 @@
QImage QImage::mirror() const
{
- return mirror(FALSE,TRUE);
+ return mirror(false,true);
}
#endif //QT_NO_IMAGE_MIRROR
@@ -3429,8 +3429,8 @@
/*!
- Loads an image from the file \a fileName. Returns TRUE if the
- image was successfully loaded; otherwise returns FALSE.
+ Loads an image from the file \a fileName. Returns true if the
+ image was successfully loaded; otherwise returns false.
If \a format is specified, the loader attempts to read the image
using the specified format. If \a format is not specified (which
@@ -3454,8 +3454,8 @@
/*!
Loads an image from the first \a len bytes of binary data in \a
- buf. Returns TRUE if the image was successfully loaded; otherwise
- returns FALSE.
+ buf. Returns true if the image was successfully loaded; otherwise
+ returns false.
If \a format is specified, the loader attempts to read the image
using the specified format. If \a format is not specified (which
@@ -3500,8 +3500,8 @@
compressed files, 100 for large uncompressed files, and -1 (the
default) to use the default settings.
- Returns TRUE if the image was successfully saved; otherwise
- returns FALSE.
+ Returns true if the image was successfully saved; otherwise
+ returns false.
\sa load() loadFromData() imageFormat() QPixmap::save() QImageIO
*/
@@ -3509,7 +3509,7 @@
bool QImage::save( const QString &fileName, const char* format, int quality ) const
{
if ( isNull() )
- return FALSE; // nothing to save
+ return false; // nothing to save
QImageIO io( fileName, format );
return doImageIO( &io, quality );
}
@@ -3532,7 +3532,7 @@
bool QImage::save( QIODevice* device, const char* format, int quality ) const
{
if ( isNull() )
- return FALSE; // nothing to save
+ return false; // nothing to save
QImageIO io( device, format );
return doImageIO( &io, quality );
}
@@ -3543,14 +3543,14 @@
bool QImage::doImageIO( QImageIO* io, int quality ) const
{
if ( !io )
- return FALSE;
+ return false;
io->setImage( *this );
#if defined(QT_CHECK_RANGE)
if ( quality > 100 || quality < -1 )
qWarning( "QPixmap::save: quality out of range [-1,100]" );
#endif
if ( quality >= 0 )
- io->setQuality( QMIN(quality,100) );
+ io->setQuality( qMin(quality,100) );
return io->write();
}
#endif //QT_NO_IMAGEIO
@@ -3883,7 +3883,7 @@
if ( !imageHandlers ) {
imageHandlers = new QIHList;
Q_CHECK_PTR( imageHandlers );
- imageHandlers->setAutoDelete( TRUE );
+ imageHandlers->setAutoDelete( true );
qAddPostRoutine( cleanup );
#ifndef QT_NO_IMAGEIO_BMP
QImageIO::defineIOHandler( "BMP", "^BM", 0,
@@ -4363,8 +4363,8 @@
/*!
- Reads an image into memory and returns TRUE if the image was
- successfully read; otherwise returns FALSE.
+ Reads an image into memory and returns true if the image was
+ successfully read; otherwise returns false.
Before reading an image you must set an IO device or a file name.
If both an IO device and a file name have been set, the IO device
@@ -4400,10 +4400,10 @@
} else if ( !fname.isEmpty() ) { // read from file
file.setName( fname );
if ( !file.open(IO_ReadOnly) )
- return FALSE; // cannot open file
+ return false; // cannot open file
iodev = &file;
} else { // no file name or io device
- return FALSE;
+ return false;
}
if (frmt.isEmpty()) {
// Try to guess format
@@ -4413,7 +4413,7 @@
file.close();
iodev = 0;
}
- return FALSE;
+ return false;
}
} else {
image_format = frmt;
@@ -4451,8 +4451,8 @@
/*!
- Writes an image to an IO device and returns TRUE if the image was
- successfully written; otherwise returns FALSE.
+ Writes an image to an IO device and returns true if the image was
+ successfully written; otherwise returns false.
Before writing an image you must set an IO device or a file name.
If both an IO device and a file name have been set, the IO device
@@ -4469,7 +4469,7 @@
iio.setFileName( "vegeburger.bmp" );
iio.setFormat( "BMP" );
if ( iio.write() )
- // returned TRUE if written successfully
+ // returned true if written successfully
\endcode
\sa setIODevice() setFileName() setFormat() read() QPixmap::save()
@@ -4478,7 +4478,7 @@
bool QImageIO::write()
{
if ( frmt.isEmpty() )
- return FALSE;
+ return false;
QImageHandler *h = get_image_handler( frmt );
if ( !h && !plugin_manager) {
qt_init_image_plugins();
@@ -4489,7 +4489,7 @@
qWarning( "QImageIO::write: No such image format handler: %s",
format() );
#endif
- return FALSE;
+ return false;
}
QFile file;
if ( !iodev && !fname.isEmpty() ) {
@@ -4497,7 +4497,7 @@
bool translate = h->text_mode==QImageHandler::TranslateInOut;
int fmode = translate ? IO_WriteOnly|IO_Translate : IO_WriteOnly;
if ( !file.open(fmode) ) // couldn't create file
- return FALSE;
+ return false;
iodev = &file;
}
iostat = 1;
@@ -4619,7 +4619,7 @@
s >> bi; // read BMP info header
if ( d->atEnd() ) // end of stream/file
- return FALSE;
+ return false;
#if 0
qDebug( "offset...........%d", offset );
qDebug( "startpos.........%d", startpos );
@@ -4647,10 +4647,10 @@
if ( !(nbits == 1 || nbits == 4 || nbits == 8 || nbits == 16 || nbits == 24 || nbits == 32) ||
bi.biPlanes != 1 || comp > BMP_BITFIELDS )
- return FALSE; // weird BMP image
+ return false; // weird BMP image
if ( !(comp == BMP_RGB || (nbits == 4 && comp == BMP_RLE4) ||
(nbits == 8 && comp == BMP_RLE8) || ((nbits == 16 || nbits == 32) && comp == BMP_BITFIELDS)) )
- return FALSE; // weird compression type
+ return false; // weird compression type
int ncols;
int depth;
@@ -4675,7 +4675,7 @@
image.create( w, h, depth, ncols, nbits == 1 ?
QImage::BigEndian : QImage::IgnoreEndian );
if ( image.isNull() ) // could not create image
- return FALSE;
+ return false;
image.setDotsPerMeterX( bi.biXPelsPerMeter );
image.setDotsPerMeterY( bi.biYPelsPerMeter );
@@ -4687,18 +4687,18 @@
int rgb_len = t == BMP_OLD ? 3 : 4;
for ( int i=0; i<ncols; i++ ) {
if ( d->readBlock( (char *)rgb, rgb_len ) != rgb_len )
- return FALSE;
+ return false;
image.setColor( i, qRgb(rgb[2],rgb[1],rgb[0]) );
if ( d->atEnd() ) // truncated file
- return FALSE;
+ return false;
}
} else if (comp == BMP_BITFIELDS && (nbits == 16 || nbits == 32)) {
if ( (Q_ULONG)d->readBlock( (char *)&red_mask, sizeof(red_mask) ) != sizeof(red_mask) )
- return FALSE;
+ return false;
if ( (Q_ULONG)d->readBlock( (char *)&green_mask, sizeof(green_mask) ) != sizeof(green_mask) )
- return FALSE;
+ return false;
if ( (Q_ULONG)d->readBlock( (char *)&blue_mask, sizeof(blue_mask) ) != sizeof(blue_mask) )
- return FALSE;
+ return false;
red_shift = calc_shift(red_mask);
red_scale = 256 / ((red_mask >> red_shift) + 1);
green_shift = calc_shift(green_mask);
@@ -4714,7 +4714,7 @@
red_shift = 16;
blue_scale = green_scale = red_scale = 1;
} else if (comp == BMP_RGB && nbits == 16) // don't support RGB values for 15/16 bpp
- return FALSE;
+ return false;
// offset can be bogus, be careful
if (offset>=0 && startpos + offset > (Q_LONG)d->at() )
@@ -4867,7 +4867,7 @@
b = endp-p;
if ( d->readBlock( (char *)p, b ) != b )
- return FALSE;
+ return false;
if ( (b & 1) == 1 )
d->getch(); // align on word boundary
x += b;
@@ -4922,7 +4922,7 @@
delete[] buf24;
}
- return TRUE;
+ return true;
}
bool qt_read_dib( QDataStream& s, QImage& image )
@@ -5022,7 +5022,7 @@
d->writeBlock( padding, pad );
#endif
}
- return TRUE;
+ return true;
}
uchar *buf = new uchar[bpl_bmp];
@@ -5054,11 +5054,11 @@
}
if ( bpl_bmp != d->writeBlock( (char*)buf, bpl_bmp ) ) {
delete[] buf;
- return FALSE;
+ return false;
}
}
delete[] buf;
- return TRUE;
+ return true;
}
@@ -5636,14 +5636,14 @@
// Skip until ", read until the next ", return the rest in *buf
-// Returns FALSE on error, TRUE on success
+// Returns false on error, true on success
static bool read_xpm_string( QCString &buf, QIODevice *d,
const char * const *source, int &index )
{
if ( source ) {
buf = source[index++];
- return TRUE;
+ return true;
}
if ( buf.size() < 69 ) //# just an approximation
@@ -5654,7 +5654,7 @@
int i;
while ( (c=d->getch()) != EOF && c != '"' ) { }
if ( c == EOF ) {
- return FALSE;
+ return false;
}
i = 0;
while ( (c=d->getch()) != EOF && c != '"' ) {
@@ -5663,13 +5663,13 @@
buf[i++] = c;
}
if ( c == EOF ) {
- return FALSE;
+ return false;
}
if ( i == (int)buf.size() ) // always use a 0 terminator
buf.resize( i+1 );
buf[i] = '\0';
- return TRUE;
+ return true;
}
@@ -5758,7 +5758,7 @@
buf.truncate(end);
buf = buf.stripWhiteSpace();
if ( buf == "none" ) {
- image.setAlphaBuffer( TRUE );
+ image.setAlphaBuffer( true );
int transparentColor = currentColor;
if ( image.depth() == 8 ) {
image.setColor( transparentColor,
@@ -6007,14 +6007,14 @@
bool
haveSamePalette(const QImage& a, const QImage& b)
{
- if (a.depth() != b.depth()) return FALSE;
- if (a.numColors() != b.numColors()) return FALSE;
+ if (a.depth() != b.depth()) return false;
+ if (a.numColors() != b.numColors()) return false;
QRgb* ca = a.colorTable();
QRgb* cb = b.colorTable();
for (int i=a.numColors(); i--; ) {
- if (*ca++ != *cb++) return FALSE;
+ if (*ca++ != *cb++) return false;
}
- return TRUE;
+ return true;
}
/*!
@@ -6169,7 +6169,7 @@
unsigned char r = ((qRed(*s)-qRed(*d)) * a) / 256 + qRed(*d);
unsigned char g = ((qGreen(*s)-qGreen(*d)) * a) / 256 + qGreen(*d);
unsigned char b = ((qBlue(*s)-qBlue(*d)) * a) / 256 + qBlue(*d);
- a = QMAX(qAlpha(*d),a); // alternatives...
+ a = qMax(qAlpha(*d),a); // alternatives...
*d++ = qRgba(r,g,b,a);
++s;
}
@@ -6209,8 +6209,8 @@
/*!
- Returns TRUE if this image and image \a i have the same contents;
- otherwise returns FALSE. The comparison can be slow, unless there
+ Returns true if this image and image \a i have the same contents;
+ otherwise returns false. The comparison can be slow, unless there
is some obvious difference, such as different widths, in which
case the function will return quickly.
@@ -6221,25 +6221,25 @@
{
// same object, or shared?
if ( i.data == data )
- return TRUE;
+ return true;
// obviously different stuff?
if ( i.data->h != data->h ||
i.data->w != data->w )
- return FALSE;
+ return false;
// that was the fast bit...
QImage i1 = convertDepth( 32 );
QImage i2 = i.convertDepth( 32 );
int l;
for( l=0; l < data->h; l++ )
if ( memcmp( i1.scanLine( l ), i2.scanLine( l ), 4*data->w ) )
- return FALSE;
- return TRUE;
+ return false;
+ return false;
}
/*!
- Returns TRUE if this image and image \a i have different contents;
- otherwise returns FALSE. The comparison can be slow, unless there
+ Returns true if this image and image \a i have different contents;
+ otherwise returns false. The comparison can be slow, unless there
is some obvious difference, such as different widths, in which
case the function will return quickly.
Index: workspace/ksplash/ksplashx/qcolor_p.cpp
===================================================================
--- workspace/ksplash/ksplashx/qcolor_p.cpp (revision 665052)
+++ workspace/ksplash/ksplashx/qcolor_p.cpp (working copy)
@@ -767,9 +767,9 @@
free(name_no_space);
if ( r ) {
*rgb = r->value;
- return TRUE;
+ return true;
} else {
- return FALSE;
+ return false;
}
}
@@ -794,7 +794,7 @@
bool qt_get_named_rgb( const char *, QRgb* )
{
- return FALSE;
+ return false;
}
uint qt_get_rgb_val( const char * )
Index: workspace/ksplash/ksplashx/qrect.h
===================================================================
--- workspace/ksplash/ksplashx/qrect.h (revision 665052)
+++ workspace/ksplash/ksplashx/qrect.h (working copy)
@@ -120,10 +120,10 @@
QRect& operator|=(const QRect &r);
QRect& operator&=(const QRect &r);
- bool contains( const QPoint &p, bool proper=FALSE ) const;
+ bool contains( const QPoint &p, bool proper=false ) const;
bool contains( int x, int y ) const; // inline methods, _don't_ merge these
bool contains( int x, int y, bool proper ) const;
- bool contains( const QRect &r, bool proper=FALSE ) const;
+ bool contains( const QRect &r, bool proper=false ) const;
QRect unite( const QRect &r ) const;
QRect intersect( const QRect &r ) const;
bool intersects( const QRect &r ) const;
Index: workspace/ksplash/ksplashx/qcolor_x11.cpp
===================================================================
--- workspace/ksplash/ksplashx/qcolor_x11.cpp (revision 665052)
+++ workspace/ksplash/ksplashx/qcolor_x11.cpp (working copy)
@@ -52,9 +52,9 @@
/*****************************************************************************
The color dictionary speeds up color allocation significantly for X11.
When there are no more colors, QColor::alloc() will set the colors_avail
- flag to FALSE and try to find the nearest color.
+ flag to false and try to find the nearest color.
NOTE: From deep within the event loop, the colors_avail flag is reset to
- TRUE (calls the function qt_reset_color_avail()), because some other
+ true (calls the function qt_reset_color_avail()), because some other
application might free its colors, thereby making them available for
this Qt application.
*****************************************************************************/
@@ -79,13 +79,13 @@
QColorScreenData()
{
//# colorDict = 0;
- colors_avail = TRUE;
+ colors_avail = true;
g_vis = 0;
g_carr = 0;
- g_carr_fetch = TRUE;
+ g_carr_fetch = true;
g_cells = 0;
g_our_alloc = 0;
- color_reduce = FALSE;
+ color_reduce = false;
}
//# QColorDict *colorDict; // dict of allocated colors
@@ -121,8 +121,8 @@
{
int i;
for ( i = 0; i < screencount; i++ ) {
- screendata[i]->colors_avail = TRUE;
- screendata[i]->g_carr_fetch = TRUE; // do XQueryColors if !colors_avail
+ screendata[i]->colors_avail = true;
+ screendata[i]->g_carr_fetch = true; // do XQueryColors if !colors_avail
}
}
@@ -217,7 +217,7 @@
if ( color_init ) // already initialized
return;
- color_init = TRUE;
+ color_init = true;
Display *dpy = QPaintDevice::x11AppDisplay();
int spec = QApplication::colorSpec();
@@ -240,15 +240,15 @@
colormodel = d8;
// Create the g_our_alloc array, which remembers which color pixels
// we allocated.
- screendata[scr]->g_cells = QMIN(ncols,256);
+ screendata[scr]->g_cells = qMin(ncols,256);
screendata[scr]->g_carr = new XColor[screendata[scr]->g_cells];
Q_CHECK_PTR( screendata[scr]->g_carr );
memset( screendata[scr]->g_carr, 0,
screendata[scr]->g_cells*sizeof(XColor) );
- screendata[scr]->g_carr_fetch = TRUE; // run XQueryColors on demand
+ screendata[scr]->g_carr_fetch = true; // run XQueryColors on demand
screendata[scr]->g_our_alloc = new bool[screendata[scr]->g_cells];
Q_CHECK_PTR( screendata[scr]->g_our_alloc );
- memset( screendata[scr]->g_our_alloc, FALSE,
+ memset( screendata[scr]->g_our_alloc, false,
screendata[scr]->g_cells*sizeof(bool) );
XColor *xc = &screendata[scr]->g_carr[0];
for ( int i=0; i<screendata[scr]->g_cells; i++ ) {
@@ -278,7 +278,7 @@
#endif
if ( spec == (int)QApplication::ManyColor ) {
- screendata[scr]->color_reduce = TRUE;
+ screendata[scr]->color_reduce = true;
switch ( qt_ncols_option ) {
case 216:
@@ -324,7 +324,7 @@
}
#if 0 /* 0 == allocate colors on demand */
- setLazyAlloc( FALSE ); // allocate global colors
+ setLazyAlloc( false ); // allocate global colors
((QColor*)(&darkGray))-> alloc();
((QColor*)(&gray))-> alloc();
((QColor*)(&lightGray))-> alloc();
@@ -340,7 +340,7 @@
((QColor*)(&darkCyan))-> alloc();
((QColor*)(&darkMagenta))-> alloc();
((QColor*)(&darkYellow))-> alloc();
- setLazyAlloc( TRUE );
+ setLazyAlloc( true );
#endif
}
@@ -355,7 +355,7 @@
{
if ( !color_init )
return;
- color_init = FALSE;
+ color_init = false;
int scr;
for ( scr = 0; scr < screencount; scr++ ) {
if ( screendata[scr]->g_carr ) {
@@ -368,7 +368,7 @@
}
#if 0
if ( screendata[scr]->colorDict ) {
- screendata[scr]->colorDict->setAutoDelete( TRUE );
+ screendata[scr]->colorDict->setAutoDelete( true );
screendata[scr]->colorDict->clear();
delete screendata[scr]->colorDict;
screendata[scr]->colorDict = 0;
@@ -420,12 +420,12 @@
if ( c ) { // found color in dictionary
pix = c->pix;
if ( screen == QPaintDevice::x11AppScreen() ) {
- d.d8.invalid = FALSE; // color ok
- d.d8.dirty = FALSE;
+ d.d8.invalid = false; // color ok
+ d.d8.dirty = false;
d.d8.pix = pix; // use same pixel value
if ( c->context != current_alloc_context ) {
c->context = 0; // convert to default context
- sd->g_our_alloc[pix] = TRUE; // reuse without XAllocColor
+ sd->g_our_alloc[pix] = true; // reuse without XAllocColor
}
}
return pix;
@@ -437,7 +437,7 @@
col.green = g << 8;
col.blue = b << 8;
- bool try_again = FALSE;
+ bool try_again = false;
bool try_alloc = !sd->color_reduce;
int try_count = 0;
@@ -445,7 +445,7 @@
// This loop is run until we manage to either allocate or
// find an approximate color, it stops after a few iterations.
- try_again = FALSE;
+ try_again = false;
if ( try_alloc && sd->colors_avail &&
XAllocColor(dpy, QPaintDevice::x11AppColormap( screen ),&col) ) {
@@ -453,18 +453,18 @@
pix = (uint) col.pixel;
if ( screen == QPaintDevice::x11AppScreen() ) {
d.d8.pix = pix;
- d.d8.invalid = FALSE;
- d.d8.dirty = FALSE;
+ d.d8.invalid = false;
+ d.d8.dirty = false;
sd->g_carr[d.d8.pix] = col; // update color array
if ( current_alloc_context == 0 )
- sd->g_our_alloc[d.d8.pix] = TRUE; // reuse without XAllocColor
+ sd->g_our_alloc[d.d8.pix] = true; // reuse without XAllocColor
}
} else {
// No available colors, or we did not want to allocate one
int i;
- sd->colors_avail = FALSE; // no more available colors
+ sd->colors_avail = false; // no more available colors
if ( sd->g_carr_fetch ) { // refetch color array
- sd->g_carr_fetch = FALSE;
+ sd->g_carr_fetch = false;
XQueryColors( dpy, QPaintDevice::x11AppColormap( screen ), sd->g_carr,
sd->g_cells );
}
@@ -488,9 +488,9 @@
col.red = r << 8;
col.green = g << 8;
col.blue = b << 8;
- try_alloc = TRUE;
- try_again = TRUE;
- sd->colors_avail = TRUE;
+ try_alloc = true;
+ try_again = true;
+ sd->colors_avail = true;
continue; // Try alloc reduced color
}
}
@@ -502,16 +502,16 @@
d.argb = qRgb(0,0,0);
pix = (uint)BlackPixel( dpy, screen );
if ( screen == QPaintDevice::x11AppScreen() ) {
- d.d8.invalid = FALSE;
- d.d8.dirty = FALSE;
+ d.d8.invalid = false;
+ d.d8.dirty = false;
d.d8.pix = pix;
}
} else { // light, use white
d.argb = qRgb(0xff,0xff,0xff);
pix = (uint)WhitePixel( dpy, screen );
if ( screen == QPaintDevice::x11AppScreen() ) {
- d.d8.invalid = FALSE;
- d.d8.dirty = FALSE;
+ d.d8.invalid = false;
+ d.d8.dirty = false;
d.d8.pix = pix;
}
}
@@ -527,21 +527,21 @@
sd->g_carr[i] = col; // update color array
if ( screen == QPaintDevice::x11AppScreen() ) {
if ( current_alloc_context == 0 )
- sd->g_our_alloc[i] = TRUE; // only in the default context
+ sd->g_our_alloc[i] = true; // only in the default context
}
} else {
// Oops, it's gone again
try_count++;
- try_again = TRUE;
- sd->colors_avail = TRUE;
- sd->g_carr_fetch = TRUE;
+ try_again = true;
+ sd->colors_avail = true;
+ sd->g_carr_fetch = true;
}
}
if ( !try_again ) { // got it
pix = (uint)sd->g_carr[i].pixel;
if ( screen == QPaintDevice::x11AppScreen() ) {
- d.d8.invalid = FALSE;
- d.d8.dirty = FALSE;
+ d.d8.invalid = false;
+ d.d8.dirty = false;
d.d8.pix = pix; // allocated X11 color
}
}
@@ -556,16 +556,16 @@
d.argb = qRgb(0,0,0);
pix = (uint)BlackPixel( dpy, screen );
if ( screen == QPaintDevice::x11AppScreen() ) {
- d.d8.invalid = FALSE;
- d.d8.dirty = FALSE;
+ d.d8.invalid = false;
+ d.d8.dirty = false;
d.d8.pix = pix;
}
} else { // light, use white
d.argb = qRgb(0xff,0xff,0xff);
pix = (uint)WhitePixel( dpy, screen );
if ( screen == QPaintDevice::x11AppScreen() ) {
- d.d8.invalid = FALSE;
- d.d8.dirty = FALSE;
+ d.d8.invalid = false;
+ d.d8.dirty = false;
d.d8.pix = pix;
}
}
@@ -651,8 +651,8 @@
#endif
setRgb( qRed(rgb), qGreen(rgb), qBlue(rgb) );
if ( colormodel == d8 ) {
- d.d8.invalid = FALSE;
- d.d8.dirty = TRUE;
+ d.d8.invalid = false;
+ d.d8.dirty = true;
d.d8.pix = 0;
} else {
alloc();
@@ -687,9 +687,9 @@
static void init_context_stack()
{
- static bool did_init = FALSE;
+ static bool did_init = false;
if ( !did_init ) {
- did_init = TRUE;
+ did_init = true;
context_stack[0] = current_alloc_context = 0;
}
}
@@ -833,7 +833,7 @@
#else
ulong pixels[256];
bool freeing[256];
- memset( freeing, FALSE, screendata[screen]->g_cells*sizeof(bool) );
+ memset( freeing, false, screendata[screen]->g_cells*sizeof(bool) );
QColorData *d;
QColorDictIt it( *screendata[screen]->colorDict );
int i = 0;
@@ -845,7 +845,7 @@
if ( !screendata[screen]->g_our_alloc[d->pix] && !freeing[d->pix] ) {
// will free this color
pixels[i++] = d->pix;
- freeing[d->pix] = TRUE;
+ freeing[d->pix] = true;
}
// remove from dict
screendata[screen]->colorDict->remove( (long)rgbv );
Index: workspace/ksplash/ksplashx/pixmap.cpp
===================================================================
--- workspace/ksplash/ksplashx/pixmap.cpp (revision 665052)
+++ workspace/ksplash/ksplashx/pixmap.cpp (working copy)
@@ -177,22 +177,22 @@
d = 1;
}
} else { // can be both
- bool conv8 = FALSE;
+ bool conv8 = false;
if ( d > 8 && dd <= 8 ) { // convert to 8 bit
if ( (conversion_flags & DitherMode_Mask) == AutoDither )
conversion_flags = (conversion_flags & ~DitherMode_Mask)
| PreferDither;
- conv8 = TRUE;
+ conv8 = true;
} else if ( (conversion_flags & ColorMode_Mask) == ColorOnly ) {
conv8 = d == 1; // native depth wanted
} else if ( d == 1 ) {
if ( image.numColors() == 2 ) {
QRgb c0 = image.color(0); // Auto: convert to best
QRgb c1 = image.color(1);
- conv8 = QMIN(c0,c1) != qRgb(0,0,0) || QMAX(c0,c1) != qRgb(255,255,255);
+ conv8 = qMin(c0,c1) != qRgb(0,0,0) || qMax(c0,c1) != qRgb(255,255,255);
} else {
// eg. 1-color monochrome images (they do exist).
- conv8 = TRUE;
+ conv8 = true;
}
}
if ( conv8 ) {
@@ -281,7 +281,7 @@
m = image.createAlphaMask( conversion_flags );
setMask( m );
}
- return TRUE;
+ return true;
#endif
}
@@ -353,7 +353,7 @@
// Can do it? (Contiguous bits?)
contig_bits;
- static bool init=FALSE;
+ static bool init=false;
static int D[16][16];
if ( dither_tc && !init ) {
// I also contributed this code to XV - WWA.
@@ -387,7 +387,7 @@
}
}
}
- init=TRUE;
+ init=true;
}
enum { BPP8,
@@ -859,11 +859,11 @@
#ifdef QT_MITSHM_CONVERSIONS
if( mitshm_ximage )
- XShmPutImage( dpy, hd, qt_xget_readonly_gc( x11Screen(), FALSE ),
+ XShmPutImage( dpy, hd, qt_xget_readonly_gc( x11Screen(), false ),
xi, 0, 0, 0, 0, w, h, False );
else
#endif
- XPutImage( dpy, hd, qt_xget_readonly_gc( x11Screen(), FALSE ),
+ XPutImage( dpy, hd, qt_xget_readonly_gc( x11Screen(), false ),
xi, 0, 0, 0, 0, w, h );
data->w = w;
Index: workspace/ksplash/ksplashx/qcolor.cpp
===================================================================
--- workspace/ksplash/ksplashx/qcolor.cpp (revision 665052)
+++ workspace/ksplash/ksplashx/qcolor.cpp (working copy)
@@ -193,8 +193,8 @@
QColor member functions
*****************************************************************************/
-bool QColor::color_init = FALSE; // color system not initialized
-bool QColor::globals_init = FALSE; // global color not initialized
+bool QColor::color_init = false; // color system not initialized
+bool QColor::globals_init = false; // global color not initialized
QColor::ColorModel QColor::colormodel = d32;
@@ -222,7 +222,7 @@
void QColor::initGlobalColors()
{
- globals_init = TRUE;
+ globals_init = true;
#ifdef Q_WS_X11
// HACK: we need a way to recognize color0 and color1 uniquely, so
@@ -330,9 +330,9 @@
{
switch ( colormodel ) {
case d8:
- d.d8.direct = TRUE;
- d.d8.invalid = FALSE;
- d.d8.dirty = FALSE;
+ d.d8.direct = true;
+ d.d8.invalid = false;
+ d.d8.dirty = false;
d.d8.pix = pixel;
break;
case d32:
@@ -434,8 +434,8 @@
/*!
\fn bool QColor::isValid() const
- Returns FALSE if the color is invalid, i.e. it was constructed using the
- default constructor; otherwise returns TRUE.
+ Returns false if the color is invalid, i.e. it was constructed using the
+ default constructor; otherwise returns true.
*/
/*!
@@ -531,7 +531,7 @@
#endif
d.argb = 0;
if ( colormodel == d8 ) {
- d.d8.invalid = TRUE;
+ d.d8.invalid = true;
} else {
d.d32.argb = Invalid;
}
@@ -753,9 +753,9 @@
}
d.argb = qRgb( r, g, b );
if ( colormodel == d8 ) {
- d.d8.invalid = FALSE;
- d.d8.direct = FALSE;
- d.d8.dirty = TRUE;
+ d.d8.invalid = false;
+ d.d8.direct = false;
+ d.d8.dirty = true;
} else {
d.d32.pix = Dirt;
}
@@ -775,9 +775,9 @@
{
d.argb = rgb;
if ( colormodel == d8 ) {
- d.d8.invalid = FALSE;
- d.d8.direct = FALSE;
- d.d8.dirty = TRUE;
+ d.d8.invalid = false;
+ d.d8.direct = false;
+ d.d8.dirty = true;
} else {
d.d32.pix = Dirt;
}
@@ -878,14 +878,14 @@
/*!
\fn bool QColor::operator==( const QColor &c ) const
- Returns TRUE if this color has the same RGB value as \a c;
- otherwise returns FALSE.
+ Returns true if this color has the same RGB value as \a c;
+ otherwise returns false.
*/
/*!
\fn bool QColor::operator!=( const QColor &c ) const
- Returns TRUE if this color has a different RGB value from \a c;
- otherwise returns FALSE.
+ Returns true if this color has a different RGB value from \a c;
+ otherwise returns false.
*/
/*!
Index: workspace/ksplash/ksplashx/qsize.h
===================================================================
--- workspace/ksplash/ksplashx/qsize.h (revision 665052)
+++ workspace/ksplash/ksplashx/qsize.h (working copy)
@@ -223,12 +223,12 @@
inline QSize QSize::expandedTo( const QSize & otherSize ) const
{
- return QSize( QMAX(wd,otherSize.wd), QMAX(ht,otherSize.ht) );
+ return QSize( qMax(wd,otherSize.wd), qMax(ht,otherSize.ht) );
}
inline QSize QSize::boundedTo( const QSize & otherSize ) const
{
- return QSize( QMIN(wd,otherSize.wd), QMIN(ht,otherSize.ht) );
+ return QSize( qMin(wd,otherSize.wd), qMin(ht,otherSize.ht) );
}
Index: workspace/ksplash/ksplashx/qimage.h
===================================================================
--- workspace/ksplash/ksplashx/qimage.h (revision 665052)
+++ workspace/ksplash/ksplashx/qimage.h (working copy)
@@ -134,10 +134,10 @@
void reset();
void fill( uint pixel );
- void invertPixels( bool invertAlpha = TRUE );
+ void invertPixels( bool invertAlpha = true );
QImage convertDepth( int ) const;
-#ifndef QT_NO_IMAGE_TRUECOLOR
+#ifndef QT_NO_IMAGE_TRUECOLOR
QImage convertDepthWithPalette( int, QRgb* p, int pc, int cf=0 ) const;
#endif
QImage convertDepth( int, int conversion_flags ) const;
@@ -164,7 +164,7 @@
QImage createAlphaMask( int conversion_flags=0 ) const;
#endif
#ifndef QT_NO_IMAGE_HEURISTIC_MASK
- QImage createHeuristicMask( bool clipTight=TRUE ) const;
+ QImage createHeuristicMask( bool clipTight=true ) const;
#endif
#ifndef QT_NO_IMAGE_MIRROR
QImage mirror() const;
Index: workspace/ksplash/ksplashx/x11_defs.cpp
===================================================================
--- workspace/ksplash/ksplashx/x11_defs.cpp (revision 665052)
+++ workspace/ksplash/ksplashx/x11_defs.cpp (working copy)
@@ -178,13 +178,13 @@
if ( !app_gc_ro_m ) // create GC for bitmap
memset( (app_gc_ro_m = new GC[appScreenCount]), 0, appScreenCount * sizeof( GC ) );
if ( !app_gc_ro_m[scrn] )
- app_gc_ro_m[scrn] = create_gc( scrn, TRUE );
+ app_gc_ro_m[scrn] = create_gc( scrn, true );
gc = app_gc_ro_m[scrn];
} else { // create standard GC
if ( !app_gc_ro )
memset( (app_gc_ro = new GC[appScreenCount]), 0, appScreenCount * sizeof( GC ) );
if ( !app_gc_ro[scrn] )
- app_gc_ro[scrn] = create_gc( scrn, FALSE );
+ app_gc_ro[scrn] = create_gc( scrn, false );
gc = app_gc_ro[scrn];
}
return gc;
@@ -204,13 +204,13 @@
if ( !app_gc_tmp_m ) // create GC for bitmap
memset( (app_gc_tmp_m = new GC[appScreenCount]), 0, appScreenCount * sizeof( GC ) );
if ( !app_gc_tmp_m[scrn] )
- app_gc_tmp_m[scrn] = create_gc( scrn, TRUE );
+ app_gc_tmp_m[scrn] = create_gc( scrn, true );
gc = app_gc_tmp_m[scrn];
} else { // create standard GC
if ( !app_gc_tmp )
memset( (app_gc_tmp = new GC[appScreenCount]), 0, appScreenCount * sizeof( GC ) );
if ( !app_gc_tmp[scrn] )
- app_gc_tmp[scrn] = create_gc( scrn, FALSE );
+ app_gc_tmp[scrn] = create_gc( scrn, false );
gc = app_gc_tmp[scrn];
}
return gc;
Index: workspace/ksplash/ksplashx/qrect.cpp
===================================================================
--- workspace/ksplash/ksplashx/qrect.cpp (revision 665052)
+++ workspace/ksplash/ksplashx/qrect.cpp (working copy)
@@ -819,10 +819,10 @@
if ( isValid() ) {
if ( r.isValid() ) {
QRect tmp;
- tmp.setLeft( QMIN( x1, r.x1 ) );
- tmp.setRight( QMAX( x2, r.x2 ) );
- tmp.setTop( QMIN( y1, r.y1 ) );
- tmp.setBottom( QMAX( y2, r.y2 ) );
+ tmp.setLeft( qMin( x1, r.x1 ) );
+ tmp.setRight( qMax( x2, r.x2 ) );
+ tmp.setTop( qMin( y1, r.y1 ) );
+ tmp.setBottom( qMax( y2, r.y2 ) );
return tmp;
} else {
return *this;
@@ -853,10 +853,10 @@
QRect QRect::operator&( const QRect &r ) const
{
QRect tmp;
- tmp.x1 = QMAX( x1, r.x1 );
- tmp.x2 = QMIN( x2, r.x2 );
- tmp.y1 = QMAX( y1, r.y1 );
- tmp.y2 = QMIN( y2, r.y2 );
+ tmp.x1 = qMax( x1, r.x1 );
+ tmp.x2 = qMin( x2, r.x2 );
+ tmp.y1 = qMax( y1, r.y1 );
+ tmp.y2 = qMin( y2, r.y2 );
return tmp;
}
@@ -879,8 +879,8 @@
bool QRect::intersects( const QRect &r ) const
{
- return ( QMAX( x1, r.x1 ) <= QMIN( x2, r.x2 ) &&
- QMAX( y1, r.y1 ) <= QMIN( y2, r.y2 ) );
+ return ( qMax( x1, r.x1 ) <= qMin( x2, r.x2 ) &&
+ qMax( y1, r.y1 ) <= qMin( y2, r.y2 ) );
}
Index: workspace/ksplash/ksplashx/qglobal.cpp
===================================================================
--- workspace/ksplash/ksplashx/qglobal.cpp (revision 665052)
+++ workspace/ksplash/ksplashx/qglobal.cpp (working copy)
@@ -1,6 +1,6 @@
#include "qglobal.h"
-static bool si_alreadyDone = FALSE;
+static bool si_alreadyDone = false;
static int si_wordSize;
static bool si_bigEndian;
@@ -10,12 +10,12 @@
Obtains information about the system.
The system's word size in bits (typically 32) is returned in \a
- *wordSize. The \a *bigEndian is set to TRUE if this is a big-endian
- machine, or to FALSE if this is a little-endian machine.
+ *wordSize. The \a *bigEndian is set to true if this is a big-endian
+ machine, or to false if this is a little-endian machine.
In debug mode, this function calls qFatal() with a message if the
computer is truly weird (i.e. different endianness for 16 bit and
- 32 bit integers); in release mode it returns FALSE.
+ 32 bit integers); in release mode it returns false.
*/
bool qSysInfo( int *wordSize, bool *bigEndian )
@@ -28,7 +28,7 @@
if ( si_alreadyDone ) { // run it only once
*wordSize = si_wordSize;
*bigEndian = si_bigEndian;
- return TRUE;
+ return true;
}
si_wordSize = 0;
@@ -45,14 +45,14 @@
#if defined(QT_CHECK_RANGE)
qFatal( "qSysInfo: Unsupported system word size %d", *wordSize );
#endif
- return FALSE;
+ return false;
}
if ( sizeof(Q_INT8) != 1 || sizeof(Q_INT16) != 2 || sizeof(Q_INT32) != 4 ||
sizeof(Q_ULONG)*8 != si_wordSize || sizeof(float) != 4 || sizeof(double) != 8 ) {
#if defined(QT_CHECK_RANGE)
qFatal( "qSysInfo: Unsupported system data type size" );
#endif
- return FALSE;
+ return false;
}
bool be16, be32; // determine byte ordering
@@ -64,10 +64,10 @@
p = (unsigned char *)(&nl); // 32-bit integer
if ( p[0] == 0x12 && p[1] == 0x34 && p[2] == 0x56 && p[3] == 0x78 )
- be32 = TRUE;
+ be32 = true;
else
if ( p[0] == 0x78 && p[1] == 0x56 && p[2] == 0x34 && p[3] == 0x12 )
- be32 = FALSE;
+ be32 = false;
else
be32 = !be16;
@@ -75,10 +75,10 @@
#if defined(QT_CHECK_RANGE)
qFatal( "qSysInfo: Inconsistent system byte order" );
#endif
- return FALSE;
+ return false;
}
*bigEndian = si_bigEndian = be32;
- si_alreadyDone = TRUE;
- return TRUE;
+ si_alreadyDone = true;
+ return true;
}
Index: workspace/ksplash/ksplashx/defs.h
===================================================================
--- workspace/ksplash/ksplashx/defs.h (revision 665052)
+++ workspace/ksplash/ksplashx/defs.h (working copy)
@@ -43,8 +43,8 @@
typedef unsigned int QRgb; // RGB triplet
-#define QMAX(a, b) ((b) < (a) ? (a) : (b))
-#define QMIN(a, b) ((a) < (b) ? (a) : (b))
+#define qMax(a, b) ((b) < (a) ? (a) : (b))
+#define qMin(a, b) ((a) < (b) ? (a) : (b))
#define QABS(a) ((a) >= 0 ? (a) : -(a))
#define Q_UNUSED(x) (void)x;
@@ -53,9 +53,9 @@
#define Q_ASSERT(x)
-#ifndef TRUE
-const bool FALSE = 0;
-const bool TRUE = !0;
+#ifndef true
+const bool false = 0;
+const bool true = !0;
#endif
typedef unsigned char uchar;
Index: workspace/ksplash/ksplashx/qsize.cpp
===================================================================
--- workspace/ksplash/ksplashx/qsize.cpp (revision 665052)
+++ workspace/ksplash/ksplashx/qsize.cpp (working copy)
@@ -80,20 +80,20 @@
/*!
\fn bool QSize::isNull() const
- Returns TRUE if the width is 0 and the height is 0; otherwise
- returns FALSE.
+ Returns true if the width is 0 and the height is 0; otherwise
+ returns false.
*/
/*!
\fn bool QSize::isEmpty() const
- Returns TRUE if the width is less than or equal to 0, or the height is
- less than or equal to 0; otherwise returns FALSE.
+ Returns true if the width is less than or equal to 0, or the height is
+ less than or equal to 0; otherwise returns false.
*/
/*!
\fn bool QSize::isValid() const
- Returns TRUE if the width is equal to or greater than 0 and the height is
- equal to or greater than 0; otherwise returns FALSE.
+ Returns true if the width is equal to or greater than 0 and the height is
+ equal to or greater than 0; otherwise returns false.
*/
/*!
@@ -179,7 +179,7 @@
wd = (QCOORD)w;
ht = (QCOORD)h;
} else {
- bool useHeight = TRUE;
+ bool useHeight = true;
int w0 = width();
int h0 = height();
int rw = h * w0 / h0;
@@ -284,13 +284,13 @@
/*!
\fn bool operator==( const QSize &s1, const QSize &s2 )
\relates QSize
- Returns TRUE if \a s1 and \a s2 are equal; otherwise returns FALSE.
+ Returns true if \a s1 and \a s2 are equal; otherwise returns false.
*/
/*!
\fn bool operator!=( const QSize &s1, const QSize &s2 )
\relates QSize
- Returns TRUE if \a s1 and \a s2 are different; otherwise returns FALSE.
+ Returns true if \a s1 and \a s2 are different; otherwise returns false.
*/
/*!
Index: workspace/ksplash/ksplashx/qpngio.cpp
===================================================================
--- workspace/ksplash/ksplashx/qpngio.cpp (revision 665052)
+++ workspace/ksplash/ksplashx/qpngio.cpp (working copy)
@@ -121,7 +121,7 @@
if (!image.create(width, height, 32))
return;
- image.setAlphaBuffer(TRUE);
+ image.setAlphaBuffer(true);
if (QImage::systemByteOrder() == QImage::BigEndian)
png_set_swap_alpha(png_ptr);
@@ -143,7 +143,7 @@
if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
const int g = info_ptr->trans_values.gray;
if (g < ncols) {
- image.setAlphaBuffer(TRUE);
+ image.setAlphaBuffer(true);
image.setColor(g, image.color(g) & RGB_MASK);
}
}
@@ -163,7 +163,7 @@
return;
int i = 0;
if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
- image.setAlphaBuffer( TRUE );
+ image.setAlphaBuffer( true );
while ( i < info_ptr->num_trans ) {
image.setColor(i, qRgba(
info_ptr->palette[i].red,
@@ -206,7 +206,7 @@
PNG_FILLER_BEFORE : PNG_FILLER_AFTER);
// We want 4 bytes, but it isn't an alpha channel
} else {
- image.setAlphaBuffer(TRUE);
+ image.setAlphaBuffer(true);
}
if ( QImage::systemByteOrder() == QImage::BigEndian ) {
@@ -341,7 +341,7 @@
while ( n-- && qAlpha(*c++)==0xff )
;
if ( n<0 ) // LIAR!
- image.setAlphaBuffer(FALSE);
+ image.setAlphaBuffer(false);
}
png_read_end(png_ptr, end_info);
Index: workspace/kdm/backend/greet.h
===================================================================
--- workspace/kdm/backend/greet.h (revision 665052)
+++ workspace/kdm/backend/greet.h (working copy)
@@ -71,9 +71,9 @@
#define DEBUG_VALGRIND 0x400
#define DEBUG_STRACE 0x800
-#ifndef TRUE
-# define TRUE 1
-# define FALSE 0
+#ifndef true
+# define true 1
+# define false 0
#endif
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic