From 9a75b154bf0732aa3a501b6e31e566e06c5f8a31 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 2 Mar 2012 02:11:59 -0600 Subject: Undo prior accidental commit --- src/kernel/qpixmap_x11.cpp | 54 +++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'src/kernel/qpixmap_x11.cpp') diff --git a/src/kernel/qpixmap_x11.cpp b/src/kernel/qpixmap_x11.cpp index cec8ad8..d0a16c5 100644 --- a/src/kernel/qpixmap_x11.cpp +++ b/src/kernel/qpixmap_x11.cpp @@ -141,7 +141,7 @@ static bool qt_create_mitshm_buffer( const QPaintDevice* dev, int w, int h ) } else { if ( !XShmQueryVersion(dpy, &major, &minor, &pixmaps_ok) ) return FALSE; // MIT Shm not supported - tqAddPostRoutine( qt_cleanup_mitshm ); + qAddPostRoutine( qt_cleanup_mitshm ); xshminit = TRUE; } @@ -350,14 +350,14 @@ static void build_scale_table( uint **table, uint nBits ) { if ( nBits > 7 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "build_scale_table: internal error, nBits = %i", nBits ); + qWarning( "build_scale_table: internal error, nBits = %i", nBits ); #endif return; } if (!*table) { static bool firstTable = TRUE; if ( firstTable ) { - tqAddPostRoutine( cleanup_scale_tables ); + qAddPostRoutine( cleanup_scale_tables ); firstTable = FALSE; } *table = new uint[256]; @@ -394,7 +394,7 @@ void QPixmap::init( int w, int h, int d, bool bitmap, Optimization optim ) { #if defined(QT_CHECK_STATE) if ( qApp->type() == QApplication::Tty ) { - tqWarning( "QPixmap: Cannot create a QPixmap when no GUI " + qWarning( "QPixmap: Cannot create a QPixmap when no GUI " "is being used" ); } #endif @@ -441,7 +441,7 @@ void QPixmap::init( int w, int h, int d, bool bitmap, Optimization optim ) rendhd = 0; #if defined(QT_CHECK_RANGE) if ( !make_null ) - tqWarning( "QPixmap: Invalid pixmap parameters" ); + qWarning( "QPixmap: Invalid pixmap parameters" ); #endif return; } @@ -690,7 +690,7 @@ int QPixmap::metric( int m ) const default: val = 0; #if defined(QT_CHECK_RANGE) - tqWarning( "QPixmap::metric: Invalid metric command" ); + qWarning( "QPixmap::metric: Invalid metric command" ); #endif } } @@ -889,7 +889,7 @@ QImage QPixmap::convertToImage() const y = h; pixel = 0; // eliminate compiler warning #if defined(QT_CHECK_RANGE) - tqWarning( "QPixmap::convertToImage: Invalid depth %d", + qWarning( "QPixmap::convertToImage: Invalid depth %d", bppc ); #endif } @@ -938,7 +938,7 @@ QImage QPixmap::convertToImage() const } else { /* Typically 2 or 4 bits display depth */ #if defined(QT_CHECK_RANGE) - tqWarning( "QPixmap::convertToImage: Display not supported (bpp=%d)", + qWarning( "QPixmap::convertToImage: Display not supported (bpp=%d)", xi->bits_per_pixel ); #endif image.reset(); @@ -1098,7 +1098,7 @@ bool QPixmap::convertFromImage( const QImage &img, int conversion_flags ) { if ( img.isNull() ) { #if defined(QT_CHECK_NULL) - tqWarning( "QPixmap::convertFromImage: Cannot convert a null image" ); + qWarning( "QPixmap::convertFromImage: Cannot convert a null image" ); #endif return FALSE; } @@ -1352,7 +1352,7 @@ bool QPixmap::convertFromImage( const QImage &img, int conversion_flags ) int wordsize; bool bigendian; - tqSysInfo( &wordsize, &bigendian ); + qSysInfo( &wordsize, &bigendian ); bool same_msb_lsb = ( xi->byte_order == MSBFirst ) == ( bigendian ); if( bppc == 8 ) // 8 bit @@ -1375,7 +1375,7 @@ bool QPixmap::convertFromImage( const QImage &img, int conversion_flags ) else mode = bppc == 33 ? BPP32_LSB : BPP32_MSB; } else - tqFatal("Logic error 3"); + qFatal("Logic error 3"); #define GET_PIXEL \ int pixel; \ @@ -1494,7 +1494,7 @@ bool QPixmap::convertFromImage( const QImage &img, int conversion_flags ) ) break; default: - tqFatal("Logic error"); + qFatal("Logic error"); } } else { switch ( mode ) { @@ -1591,7 +1591,7 @@ bool QPixmap::convertFromImage( const QImage &img, int conversion_flags ) ) break; default: - tqFatal("Logic error 2"); + qFatal("Logic error 2"); } } xi->data = (char *)newbits; @@ -1756,7 +1756,7 @@ bool QPixmap::convertFromImage( const QImage &img, int conversion_flags ) newbits = (uchar *)newerbits; } else if ( xi->bits_per_pixel != 8 ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QPixmap::convertFromImage: Display not supported " + qWarning( "QPixmap::convertFromImage: Display not supported " "(bpp=%d)", xi->bits_per_pixel ); #endif } @@ -2155,17 +2155,17 @@ QPixmap QPixmap::xForm( const QWMatrix &matrix ) const // #define QT_DEBUG_XIMAGE #if defined(QT_DEBUG_XIMAGE) - tqDebug( "----IMAGE--INFO--------------" ); - tqDebug( "width............. %d", xi->width ); - tqDebug( "height............ %d", xi->height ); - tqDebug( "xoffset........... %d", xi->xoffset ); - tqDebug( "format............ %d", xi->format ); - tqDebug( "byte order........ %d", xi->byte_order ); - tqDebug( "bitmap unit....... %d", xi->bitmap_unit ); - tqDebug( "bitmap bit order.. %d", xi->bitmap_bit_order ); - tqDebug( "depth............. %d", xi->depth ); - tqDebug( "bytes per line.... %d", xi->bytes_per_line ); - tqDebug( "bits per pixel.... %d", xi->bits_per_pixel ); + qDebug( "----IMAGE--INFO--------------" ); + qDebug( "width............. %d", xi->width ); + qDebug( "height............ %d", xi->height ); + qDebug( "xoffset........... %d", xi->xoffset ); + qDebug( "format............ %d", xi->format ); + qDebug( "byte order........ %d", xi->byte_order ); + qDebug( "bitmap unit....... %d", xi->bitmap_unit ); + qDebug( "bitmap bit order.. %d", xi->bitmap_bit_order ); + qDebug( "depth............. %d", xi->depth ); + qDebug( "bytes per line.... %d", xi->bytes_per_line ); + qDebug( "bits per pixel.... %d", xi->bits_per_pixel ); #endif int type; @@ -2188,7 +2188,7 @@ QPixmap QPixmap::xForm( const QWMatrix &matrix ) const if ( !qt_xForm_helper( mat, xi->xoffset, type, bpp, dptr, xbpl, p_inc, h, sptr, sbpl, ws, hs ) ){ #if defined(QT_CHECK_RANGE) - tqWarning( "QPixmap::xForm: display not supported (bpp=%d)",bpp); + qWarning( "QPixmap::xForm: display not supported (bpp=%d)",bpp); #endif QPixmap pm; return pm; @@ -2325,7 +2325,7 @@ void QPixmap::x11SetScreen( int screen ) return; } #if 0 - tqDebug("QPixmap::x11SetScreen for %p from %d to %d. Size is %d/%d", data, x11Screen(), screen, width(), height() ); + qDebug("QPixmap::x11SetScreen for %p from %d to %d. Size is %d/%d", data, x11Screen(), screen, width(), height() ); #endif QImage img = convertToImage(); -- cgit v1.2.1