Same usage in kimgio/xcf.cpp too.
Error:
==================================================
/dev/shm/tdelibs/kimgio/ico.cpp: In function
'bool<unnamed>::loadFromDIB(TQDataStream&,
const<unnamed>::IconRec&, TQImage&)':
/dev/shm/tdelibs/kimgio/ico.cpp:236: error: 'RGB_MASK' was not declared in this
scope
make[2]: *** [kimgio/CMakeFiles/kimg_ico-module.dir/ico.cpp.o] Error 1
make[2]: Leaving directory `/dev/shm/tdelibs.build'
make[1]: *** [kimgio/CMakeFiles/kimg_ico-module.dir/all] Error 2
==================================================
Patch:
==================================================
diff -urN tdelibs/kimgio/ico.cpp tdelibs.new/kimgio/ico.cpp
--- tdelibs/kimgio/ico.cpp 2011-12-25 01:07:40.000000000 -0600
+++ tdelibs.new/kimgio/ico.cpp 2012-02-28 16:33:45.000000000 -0600
@@ -233,7 +233,7 @@
QRgb* p = reinterpret_cast< QRgb* >( lines[ y ] );
for ( unsigned x = 0; x < rec.width; ++x, ++p )
if ( ( ( buf[ x / 8 ] >> ( 7 - ( x & 0x07 ) ) ) & 1 )
)
- *p &= TQRGB_MASK;
+ *p &= TQT_RGB_MASK;
}
delete[] buf;
}
diff -urN tdelibs/kimgio/xcf.cpp tdelibs.new/kimgio/xcf.cpp
--- tdelibs/kimgio/xcf.cpp 2011-12-25 01:07:40.000000000 -0600
+++ tdelibs.new/kimgio/xcf.cpp 2012-02-28 16:34:21.000000000 -0600
@@ -80,7 +80,7 @@
//! Change a QRgb value's alpha only.
inline QRgb tqRgba ( QRgb rgb, int a )
{
- return ((a & 0xff) << 24 | (rgb & TQRGB_MASK));
+ return ((a & 0xff) << 24 | (rgb & TQT_RGB_MASK));
}
==================================================
While you're hacking TQt3 would you please glance at these TQt3 related bug reports:
872 tdesdk FTBFS Against TQt3
871 tdeadmin FTBFS Against TQt3
861 tqtinterface: tdegraphics FTBFS with qt3 version of tqobjdefs.h
Thanks!
Darrell