diff options
| author | Timothy Pearson <[email protected]> | 2012-03-02 02:11:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2012-03-02 02:11:59 -0600 |
| commit | 9a75b154bf0732aa3a501b6e31e566e06c5f8a31 (patch) | |
| tree | df1e10cc7504665622d096f9ba80dc9e56f3afb8 /tools/qvfb/qvfbview.cpp | |
| parent | a830bf10b7d4ed2c83ffe68c0b22d7c4ba9860b0 (diff) | |
| download | qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.tar.gz qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.zip | |
Undo prior accidental commit
Diffstat (limited to 'tools/qvfb/qvfbview.cpp')
| -rw-r--r-- | tools/qvfb/qvfbview.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/qvfb/qvfbview.cpp b/tools/qvfb/qvfbview.cpp index 2c1422d..781cf78 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: - tqFatal( "Unsupported bit depth %d\n", d ); + qFatal( "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 ) { - tqFatal( "Cannot open mouse pipe" ); + qFatal( "Cannot open mouse pipe" ); } unlink( keyboardPipe ); mkfifo( keyboardPipe, 0666 ); keyboardFd = open( keyboardPipe, O_RDWR | O_NDELAY ); if ( keyboardFd == -1 ) { - tqFatal( "Cannot open keyboard pipe" ); + qFatal( "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 ) - tqFatal( "Cannot attach to shared memory" ); + qFatal( "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); -//tqDebug("%d: %d,%d,%d",i,r,g,b); +//qDebug("%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 ) { - tqFatal( QString("Cannot create Qt/Embedded data directory: %1") + qFatal( QString("Cannot create Qt/Embedded data directory: %1") .arg( dataDir ) ); } } struct stat buf; if ( lstat( dataDir.latin1(), &buf ) ) - tqFatal( QString( "stat failed for Qt/Embedded data directory: %1" ) + qFatal( QString( "stat failed for Qt/Embedded data directory: %1" ) .arg( dataDir ) ); if ( !S_ISDIR( buf.st_mode ) ) - tqFatal( QString( "%1 is not a directory" ).arg( dataDir ) ); + qFatal( QString( "%1 is not a directory" ).arg( dataDir ) ); if ( buf.st_uid != getuid() ) - tqFatal( QString( "Qt/Embedded data directory is not owned by user %1" ) + qFatal( QString( "Qt/Embedded data directory is not owned by user %1" ) .arg( getuid() ) ); if ( (buf.st_mode & 0677) != 0600 ) - tqFatal( QString( "Qt/Embedded data directory has incorrect permissions: %1" ) + qFatal( 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(); - // tqDebug( "update %d, %d, %dx%d", r.y(), r.x(), r.width(), r.height() ); + // qDebug( "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 ) { |