Replaced various '#define' with actual strings - part 3

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

src/gvcore/pngformattype.cpp

@@ -256,7 +256,7 @@ void setup_qt( TQImage& image, png_structp png_ptr, png_infop info_ptr )
 #endif
 		if (g < ncols) {
 		    image.setAlphaBuffer(TRUE);
-		    image.setColor(g, image.color(g) & TQRGB_MASK);
+		    image.setColor(g, image.color(g) & TQT_RGB_MASK);
 		}
 	    }
 	}

src/gvcore/qxcfi.cpp

@@ -28,7 +28,7 @@
 // Change a TQRgb value's alpha only. (an optimization)
 inline TQRgb tqRgba ( TQRgb rgb, int a )
 {
-  return ( ( a & 0xff ) << 24 | ( rgb & TQRGB_MASK ) );
+  return ( ( a & 0xff ) << 24 | ( rgb & TQT_RGB_MASK ) );
 }
 
 

src/gvcore/xpm.cpp

@@ -221,10 +221,10 @@ static void read_xpm_image_or_array( TQImageIO * iio, const char * const * sourc
 	    int transparentColor = currentColor;
 	    if ( image.depth() == 8 ) {
 		image.setColor( transparentColor,
-				TQRGB_MASK & tqRgb(198,198,198) );
+				TQT_RGB_MASK & tqRgb(198,198,198) );
 		colorMap.insert( index, transparentColor );
 	    } else {
-		TQRgb rgb = TQRGB_MASK & tqRgb(198,198,198);
+		TQRgb rgb = TQT_RGB_MASK & tqRgb(198,198,198);
 		colorMap.insert( index, rgb );
 	    }
 	} else {
@@ -388,7 +388,7 @@ static void write_xpm_image( TQImageIO * iio )
     TQMap<TQRgb, int>::Iterator c = colorMap.begin();
     while ( c != colorMap.end() ) {
 	TQRgb color = c.key();
-	if ( image.hasAlphaBuffer() && color == (color & TQRGB_MASK) )
+	if ( image.hasAlphaBuffer() && color == (color & TQT_RGB_MASK) )
 	    line.sprintf( "\"%s c None\"",
 			  xpm_color_name(cpp, *c) );
 	else