From a830bf10b7d4ed2c83ffe68c0b22d7c4ba9860b0 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 1 Mar 2012 13:24:30 -0600 Subject: Rename additional global TQt functions --- tools/qvfb/main.cpp | 2 +- tools/qvfb/qanimationwriter.cpp | 4 ++-- tools/qvfb/qvfbview.cpp | 22 +++++++++++----------- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'tools/qvfb') diff --git a/tools/qvfb/main.cpp b/tools/qvfb/main.cpp index 50e11ec..0fea3b3 100644 --- a/tools/qvfb/main.cpp +++ b/tools/qvfb/main.cpp @@ -86,7 +86,7 @@ int main( int argc, char *argv[] ) displayId = displaySpec.mid( m+1, rx.matchedLength()-1 ).toInt(); } - qDebug( "Using display %d", displayId ); + tqDebug( "Using display %d", displayId ); QVFb mw( displayId, width, height, depth, skin ); app.setMainWidget( &mw ); diff --git a/tools/qvfb/qanimationwriter.cpp b/tools/qvfb/qanimationwriter.cpp index 35d6131..400d9da 100644 --- a/tools/qvfb/qanimationwriter.cpp +++ b/tools/qvfb/qanimationwriter.cpp @@ -251,7 +251,7 @@ public: QAnimationWriter::QAnimationWriter( const QString& filename, const char* format ) { if ( QCString(format) != "MNG" ) { - qWarning("Format \"%s\" not supported, only MNG", format); + tqWarning("Format \"%s\" not supported, only MNG", format); dev = 0; d = 0; } else { @@ -389,7 +389,7 @@ void QAnimationWriter::appendFrame(const QImage& frm, const QPoint& offset) } } } -qDebug("%d,%d %d,%d",minx,miny,offset.x(),offset.y()); +tqDebug("%d,%d %d,%d",minx,miny,offset.x(),offset.y()); d->composeImage(diff,QPoint(minx,miny)+offset); } if ( prev.isNull() || prev.size() == frame.size() && offset == QPoint(0,0) ) { diff --git a/tools/qvfb/qvfbview.cpp b/tools/qvfb/qvfbview.cpp index 781cf78..2c1422d 100644 --- a/tools/qvfb/qvfbview.cpp +++ b/tools/qvfb/qvfbview.cpp @@ -88,7 +88,7 @@ QVFbView::QVFbView( int display_id, int w, int h, int d, QWidget *parent, break; default: - qFatal( "Unsupported bit depth %d\n", d ); + tqFatal( "Unsupported bit depth %d\n", d ); } mousePipe = QString(QT_VFB_MOUSE_PIPE).arg(display_id); @@ -99,14 +99,14 @@ QVFbView::QVFbView( int display_id, int w, int h, int d, QWidget *parent, mouseFd = open( mousePipe.latin1(), O_RDWR | O_NDELAY ); if ( mouseFd == -1 ) { - qFatal( "Cannot open mouse pipe" ); + tqFatal( "Cannot open mouse pipe" ); } unlink( keyboardPipe ); mkfifo( keyboardPipe, 0666 ); keyboardFd = open( keyboardPipe, O_RDWR | O_NDELAY ); if ( keyboardFd == -1 ) { - qFatal( "Cannot open keyboard pipe" ); + tqFatal( "Cannot open keyboard pipe" ); } key_t key = ftok( mousePipe.latin1(), 'b' ); @@ -129,7 +129,7 @@ QVFbView::QVFbView( int display_id, int w, int h, int d, QWidget *parent, } if ( (long)data == -1 ) - qFatal( "Cannot attach to shared memory" ); + tqFatal( "Cannot attach to shared memory" ); hdr = (QVFbHeader *)data; hdr->width = w; @@ -215,7 +215,7 @@ void QVFbView::setGamma(double gr, double gg, double gb) if ( g > 255 ) g = 255; if ( b > 255 ) b = 255; gammatable[i] = qRgb(r,g,b); -//qDebug("%d: %d,%d,%d",i,r,g,b); +//tqDebug("%d: %d,%d,%d",i,r,g,b); } setDirty(rect()); @@ -282,25 +282,25 @@ static QString qws_dataDir() QString dataDir = "/tmp/qtembedded-" + username; if ( mkdir( dataDir.latin1(), 0700 ) ) { if ( errno != EEXIST ) { - qFatal( QString("Cannot create Qt/Embedded data directory: %1") + tqFatal( QString("Cannot create Qt/Embedded data directory: %1") .arg( dataDir ) ); } } struct stat buf; if ( lstat( dataDir.latin1(), &buf ) ) - qFatal( QString( "stat failed for Qt/Embedded data directory: %1" ) + tqFatal( QString( "stat failed for Qt/Embedded data directory: %1" ) .arg( dataDir ) ); if ( !S_ISDIR( buf.st_mode ) ) - qFatal( QString( "%1 is not a directory" ).arg( dataDir ) ); + tqFatal( QString( "%1 is not a directory" ).arg( dataDir ) ); if ( buf.st_uid != getuid() ) - qFatal( QString( "Qt/Embedded data directory is not owned by user %1" ) + tqFatal( QString( "Qt/Embedded data directory is not owned by user %1" ) .arg( getuid() ) ); if ( (buf.st_mode & 0677) != 0600 ) - qFatal( QString( "Qt/Embedded data directory has incorrect permissions: %1" ) + tqFatal( QString( "Qt/Embedded data directory has incorrect permissions: %1" ) .arg( dataDir ) ); dataDir += "/"; @@ -485,7 +485,7 @@ void QVFbView::drawScreen() QRect r( hdr->update ); hdr->dirty = FALSE; hdr->update = QRect(); - // qDebug( "update %d, %d, %dx%d", r.y(), r.x(), r.width(), r.height() ); + // tqDebug( "update %d, %d, %dx%d", r.y(), r.x(), r.width(), r.height() ); r = r.intersect( QRect(0, 0, hdr->width, hdr->height ) ); if ( !r.isEmpty() ) { if ( int(zm) != zm ) { -- cgit v1.2.1