From 71504ea6add98edf0e5104b4c01b605c0c186692 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:26:58 -0600 Subject: [PATCH] Rename additional global TQt functions --- libs/qt-x11-free/files/0007-qpixmap_constants.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/qt-x11-free/files/0007-qpixmap_constants.patch b/libs/qt-x11-free/files/0007-qpixmap_constants.patch index c946dfd..87ee911 100644 --- a/libs/qt-x11-free/files/0007-qpixmap_constants.patch +++ b/libs/qt-x11-free/files/0007-qpixmap_constants.patch @@ -47,7 +47,7 @@ See 0005-qpixmap_mitshm.patch for details. - ? b << blue_shift : b >> -blue_shift; + int wordsize; + bool bigendian; -+ qSysInfo( &wordsize, &bigendian ); ++ tqSysInfo( &wordsize, &bigendian ); + bool same_msb_lsb = ( xi->byte_order == MSBFirst ) == ( bigendian ); + + if( bppc == 8 ) // 8 bit @@ -70,7 +70,7 @@ See 0005-qpixmap_mitshm.patch for details. + else + mode = bppc == 33 ? BPP32_LSB : BPP32_MSB; + } else -+ qFatal("Logic error 3"); ++ tqFatal("Logic error 3"); #define GET_PIXEL \ int pixel; \ @@ -194,7 +194,7 @@ See 0005-qpixmap_mitshm.patch for details. + ) break; default: - qFatal("Logic error"); + tqFatal("Logic error"); } - } else { - uint x; @@ -314,7 +314,7 @@ See 0005-qpixmap_mitshm.patch for details. + ) break; - default: -- qFatal("Logic error 2"); +- tqFatal("Logic error 2"); - } - } - } @@ -347,7 +347,7 @@ See 0005-qpixmap_mitshm.patch for details. + ) + break; + default: -+ qFatal("Logic error 2"); ++ tqFatal("Logic error 2"); + } + } + xi->data = (char *)newbits;