Automated update from qt3

1 files changed, 21 insertions, 21 deletions

diff --git a/src/kernel/qjpegio.cpp b/src/kernel/qjpegio.cpp
index 41fbc2bc4..e7b33f8ca 100644
--- a/src/kernel/qjpegio.cpp
+++ b/src/kernel/qjpegio.cpp
@@ -263,7 +263,7 @@ void read_jpeg_image(TQImageIO* iio)
 	    } else if ( cinfo.output_components == 1 ) {
 		created = image.create( sWidth, sHeight, 8, 256 );
 		for (int i=0; i<256; i++)
-		    image.setColor(i, qRgb(i,i,i));
+		    image.setColor(i, tqRgb(i,i,i));
 	    } else {
 		// Unsupported format
 	    }
@@ -288,7 +288,7 @@ void read_jpeg_image(TQImageIO* iio)
 // the weight of it when added to the output buffer. At present it is a non-smooth scale which is
 // inefficently implemented, it still uncompresses all the jpeg, an optimization for progressive
 // jpegs could be made if scaling by say 50% or some other special cases
-			    out[sWidth * i / cinfo.output_width] = qRgb( in[0], in[1], in[2] );
+			    out[sWidth * i / cinfo.output_width] = tqRgb( in[0], in[1], in[2] );
 			    in += 3;
 			}
 		    } else {
@@ -312,7 +312,7 @@ void read_jpeg_image(TQImageIO* iio)
 	    } else if ( cinfo.output_components == 1 ) {
 		created = image.create( cinfo.output_width, cinfo.output_height, 8, 256 );
 		for (int i=0; i<256; i++)
-		    image.setColor(i, qRgb(i,i,i));
+		    image.setColor(i, tqRgb(i,i,i));
 	    } else {
 		// Unsupported format
 	    }
@@ -335,7 +335,7 @@ void read_jpeg_image(TQImageIO* iio)
 
 			for (uint i=cinfo.output_width; i--; ) {
 			    in-=3;
-			    out[i] = qRgb(in[0], in[1], in[2]);
+			    out[i] = tqRgb(in[0], in[1], in[2]);
 			}
 		    }
 		}
@@ -475,8 +475,8 @@ void write_jpeg_image(TQImageIO* iio)
 	    gray = TRUE;
 	    int i;
 	    for (i=image.numColors(); gray && i--; ) {
-		gray = gray & ( qRed(cmap[i]) == qGreen(cmap[i]) &&
-				qRed(cmap[i]) == qBlue(cmap[i]) );
+		gray = gray & ( tqRed(cmap[i]) == tqGreen(cmap[i]) &&
+				tqRed(cmap[i]) == tqBlue(cmap[i]) );
 	    }
 	    cinfo.input_components = gray ? 1 : 3;
 	    cinfo.in_color_space = gray ? JCS_GRAYSCALE : JCS_RGB;
@@ -522,12 +522,12 @@ void write_jpeg_image(TQImageIO* iio)
 		    if ( image.bitOrder() == TQImage::LittleEndian ) {
 			for (int i=0; i<w; i++) {
 			    bool bit = !!(*(data + (i >> 3)) & (1 << (i & 7)));
-			    row[i] = qRed(cmap[bit]);
+			    row[i] = tqRed(cmap[bit]);
 			}
 		    } else {
 			for (int i=0; i<w; i++) {
 			    bool bit = !!(*(data + (i >> 3)) & (1 << (7 -(i & 7))));
-			    row[i] = qRed(cmap[bit]);
+			    row[i] = tqRed(cmap[bit]);
 			}
 		    }
 		} else {
@@ -535,16 +535,16 @@ void write_jpeg_image(TQImageIO* iio)
 		    if ( image.bitOrder() == TQImage::LittleEndian ) {
 			for (int i=0; i<w; i++) {
 			    bool bit = !!(*(data + (i >> 3)) & (1 << (i & 7)));
-			    *row++ = qRed(cmap[bit]);
-			    *row++ = qGreen(cmap[bit]);
-			    *row++ = qBlue(cmap[bit]);
+			    *row++ = tqRed(cmap[bit]);
+			    *row++ = tqGreen(cmap[bit]);
+			    *row++ = tqBlue(cmap[bit]);
 			}
 		    } else {
 			for (int i=0; i<w; i++) {
 			    bool bit = !!(*(data + (i >> 3)) & (1 << (7 -(i & 7))));
-			    *row++ = qRed(cmap[bit]);
-			    *row++ = qGreen(cmap[bit]);
-			    *row++ = qBlue(cmap[bit]);
+			    *row++ = tqRed(cmap[bit]);
+			    *row++ = tqGreen(cmap[bit]);
+			    *row++ = tqBlue(cmap[bit]);
 			}
 		    }
 		}
@@ -553,15 +553,15 @@ void write_jpeg_image(TQImageIO* iio)
 		if (gray) {
 		    uchar* pix = image.scanLine(cinfo.next_scanline);
 		    for (int i=0; i<w; i++) {
-			*row = qRed(cmap[*pix]);
+			*row = tqRed(cmap[*pix]);
 			++row; ++pix;
 		    }
 		} else {
 		    uchar* pix = image.scanLine(cinfo.next_scanline);
 		    for (int i=0; i<w; i++) {
-			*row++ = qRed(cmap[*pix]);
-			*row++ = qGreen(cmap[*pix]);
-			*row++ = qBlue(cmap[*pix]);
+			*row++ = tqRed(cmap[*pix]);
+			*row++ = tqGreen(cmap[*pix]);
+			*row++ = tqBlue(cmap[*pix]);
 			++pix;
 		    }
 		}
@@ -569,9 +569,9 @@ void write_jpeg_image(TQImageIO* iio)
 	      case 32: {
 		TQRgb* rgb = (TQRgb*)image.scanLine(cinfo.next_scanline);
 		for (int i=0; i<w; i++) {
-		    *row++ = qRed(*rgb);
-		    *row++ = qGreen(*rgb);
-		    *row++ = qBlue(*rgb);
+		    *row++ = tqRed(*rgb);
+		    *row++ = tqGreen(*rgb);
+		    *row++ = tqBlue(*rgb);
 		    ++rgb;
 		}
 	      }