From 4d363cdf4860d6d6365c137eecf40f04b28d8300 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:21:44 -0600 Subject: [PATCH] Rename additional global TQt functions --- kuickshow/src/aboutwidget.cpp | 2 +- kuickshow/src/imagewindow.cpp | 2 +- kuickshow/src/imlibwidget.cpp | 10 +++++----- kuickshow/src/kuickimage.cpp | 14 +++++++------- kuickshow/src/kuickshow.cpp | 8 ++++---- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/kuickshow/src/aboutwidget.cpp b/kuickshow/src/aboutwidget.cpp index dc43578..72ce183 100644 --- a/kuickshow/src/aboutwidget.cpp +++ b/kuickshow/src/aboutwidget.cpp @@ -72,7 +72,7 @@ AboutWidget::AboutWidget( TQWidget *parent, const char *name ) else { delete im; im = 0L; - qWarning( "KuickShow: about-image not found/unreadable." ); + tqWarning( "KuickShow: about-image not found/unreadable." ); } } diff --git a/kuickshow/src/imagewindow.cpp b/kuickshow/src/imagewindow.cpp index 12aa911..39af7f5 100644 --- a/kuickshow/src/imagewindow.cpp +++ b/kuickshow/src/imagewindow.cpp @@ -288,7 +288,7 @@ void ImageWindow::setFullscreen( bool enable ) void ImageWindow::updateGeometry( int imWidth, int imHeight ) { -// qDebug("::updateGeometry: %i, %i", imWidth, imHeight); +// tqDebug("::updateGeometry: %i, %i", imWidth, imHeight); // XMoveWindow( x11Display(), win, 0, 0 ); XResizeWindow( x11Display(), win, imWidth, imHeight ); diff --git a/kuickshow/src/imlibwidget.cpp b/kuickshow/src/imlibwidget.cpp index 0bca327..3642091 100644 --- a/kuickshow/src/imlibwidget.cpp +++ b/kuickshow/src/imlibwidget.cpp @@ -109,7 +109,7 @@ void ImlibWidget::init() m_kuickFile = 0L; if ( !id ) - qFatal("ImlibWidget: Imlib not initialized, aborting."); + tqFatal("ImlibWidget: Imlib not initialized, aborting."); setAutoRender( true ); @@ -198,7 +198,7 @@ bool ImlibWidget::loadImage( KuickFile * file ) bool ImlibWidget::cacheImage( const KURL& url ) { -// qDebug("cache image: %s", url.url().latin1()); +// tqDebug("cache image: %s", url.url().latin1()); KuickFile *file = FileCache::self()->getFile( url ); if ( file->isAvailable() ) return cacheImage( file ); @@ -213,7 +213,7 @@ bool ImlibWidget::cacheImage( const KURL& url ) bool ImlibWidget::cacheImage( KuickFile * file ) { -// qDebug("cache image: %s", file->url().url().latin1()); +// tqDebug("cache image: %s", file->url().url().latin1()); KuickImage *kuim = loadImageInternal( file ); if ( kuim ) { kuim->renderPixmap(); @@ -632,7 +632,7 @@ KuickImage * ImageCache::getKuimage( KuickFile * file, // #ifndef NDEBUG // gettimeofday( &tms2, NULL ); -// qDebug("*** LOADING image: %s, took %ld ms", file.latin1(), +// tqDebug("*** LOADING image: %s, took %ld ms", file.latin1(), // (tms2.tv_usec - tms1.tv_usec)/1000); // #endif @@ -655,7 +655,7 @@ KuickImage * ImageCache::getKuimage( KuickFile * file, } if ( kuickList.count() > (uint) myMaxImages ) { -// qDebug(":::: now removing from cache: %s", (*fileList.fromLast()).latin1()); +// tqDebug(":::: now removing from cache: %s", (*fileList.fromLast()).latin1()); kuickList.removeLast(); fileList.remove( fileList.fromLast() ); } diff --git a/kuickshow/src/kuickimage.cpp b/kuickshow/src/kuickimage.cpp index 894a036..db8065f 100644 --- a/kuickshow/src/kuickimage.cpp +++ b/kuickshow/src/kuickimage.cpp @@ -47,7 +47,7 @@ void KuickImage::renderPixmap() if ( !myIsDirty ) return; -// qDebug("### rendering: %s", myFilename.latin1()); +// tqDebug("### rendering: %s", myFilename.latin1()); if ( myPixmap ) Imlib_free_pixmap( myId, myPixmap ); @@ -64,7 +64,7 @@ void KuickImage::renderPixmap() // #ifndef NDEBUG // gettimeofday( &tms2, NULL ); -// qDebug("*** rendering image: %s, took %ld ms", myFilename.latin1(), +// tqDebug("*** rendering image: %s, took %ld ms", myFilename.latin1(), // (tms2.tv_usec - tms1.tv_usec)/1000); // #endif @@ -164,7 +164,7 @@ void KuickImage::restoreOriginalSize() if (myWidth == myOrigWidth && myHeight == myOrigHeight) return; -// qDebug("-- restoreOriginalSize"); +// tqDebug("-- restoreOriginalSize"); if ( myOrigIm != 0L ) { @@ -200,7 +200,7 @@ void KuickImage::resize( int width, int height, KuickImage::ResizeMode mode ) void KuickImage::fastResize( int width, int height ) { -// qDebug("-- fastResize: %i x %i", width, height ); +// tqDebug("-- fastResize: %i x %i", width, height ); // lazy resizing (only done when rendering pixmap) myWidth = width; @@ -210,7 +210,7 @@ void KuickImage::fastResize( int width, int height ) bool KuickImage::smoothResize( int newWidth, int newHeight ) { -// qDebug("-- smoothResize: %i x %i", newWidth, newHeight); +// tqDebug("-- smoothResize: %i x %i", newWidth, newHeight); TQImage *image = newTQImage(); // Note: TQ_ScaleMin seems to have a bug (off-by-one, sometimes results in width being 1 pixel too small) @@ -239,7 +239,7 @@ TQImage * KuickImage::newTQImage() const { ImlibImage *im; -// qDebug("-- newTQImage"); +// tqDebug("-- newTQImage"); if ( myOrigIm != 0L && myRotation == ROT_0 && myFlipMode == FlipNone ) { @@ -356,7 +356,7 @@ bool KuickImage::smoothResize( int newWidth, int newHeight ) basis_xx = (int) (4096.0 / scalex); basis_yy = (int) (4096.0 / scaley); - //qDebug("Basis: (%d, %d), (%d, 0), (0, %d)", basis_ox, basis_oy, basis_xx, basis_yy); + //tqDebug("Basis: (%d, %d), (%d, 0), (0, %d)", basis_ox, basis_oy, basis_xx, basis_yy); int x2, y2; diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp index b0879c0..e9058d4 100644 --- a/kuickshow/src/kuickshow.cpp +++ b/kuickshow/src/kuickshow.cpp @@ -1228,14 +1228,14 @@ void KuickShow::initImlib() if ( !id ) { initImlibParams( idata, &par ); - qWarning("*** KuickShow: Whoops, can't initialize imlib, trying my own palettefile now."); + tqWarning("*** KuickShow: Whoops, can't initialize imlib, trying my own palettefile now."); TQString paletteFile = locate( "data", "kuickshow/im_palette.pal" ); - // ### - does the qstrdup() cure the segfault in imlib eventually? - char *file = qstrdup( paletteFile.local8Bit() ); + // ### - does the tqstrdup() cure the segfault in imlib eventually? + char *file = tqstrdup( paletteFile.local8Bit() ); par.palettefile = file; par.flags |= PARAMS_PALETTEFILE; - qWarning("Palettefile: %s", par.palettefile ); + tqWarning("Palettefile: %s", par.palettefile ); id = Imlib_init_with_params( x11Display(), &par );