diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-11-24 10:46:34 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2023-11-24 22:27:06 +0900 |
| commit | 20b4653fd010811fd1bae426eea31ec6faf554b7 (patch) | |
| tree | 4773748272817f8cb7c59330865d6747079fdf2c | |
| parent | d4e69bd209ceeb1889b8c57008bf5ae4627b6813 (diff) | |
| download | gwenview-20b4653fd010811fd1bae426eea31ec6faf554b7.tar.gz gwenview-20b4653fd010811fd1bae426eea31ec6faf554b7.zip | |
Replaced various '#define' with actual strings - part 3
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 357bdcb4722d4fbfe02cdd8685d76fd0be17259b)
| -rw-r--r-- | src/gvcore/pngformattype.cpp | 2 | ||||
| -rw-r--r-- | src/gvcore/qxcfi.cpp | 2 | ||||
| -rw-r--r-- | src/gvcore/xpm.cpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gvcore/pngformattype.cpp b/src/gvcore/pngformattype.cpp index 8da8089..96273b2 100644 --- a/src/gvcore/pngformattype.cpp +++ b/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); } } } diff --git a/src/gvcore/qxcfi.cpp b/src/gvcore/qxcfi.cpp index c4bf928..a6f2194 100644 --- a/src/gvcore/qxcfi.cpp +++ b/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 ) ); } diff --git a/src/gvcore/xpm.cpp b/src/gvcore/xpm.cpp index edb79e3..c398540 100644 --- a/src/gvcore/xpm.cpp +++ b/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 |