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/opengl/qgl.cpp | 8 ++++---- src/opengl/qgl.h | 2 +- src/opengl/qgl_x11.cpp | 36 ++++++++++++++++++------------------ src/opengl/qglcolormap.cpp | 2 +- 4 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/opengl') diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 51cb0b3..c2a35ea 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -159,7 +159,7 @@ static QCleanupHandler qgl_cleanup_format; if ( !w->format().stereo() ) { // ok, goggles off if ( !w->format().hasOverlay() ) { - tqFatal( "Cool hardware required" ); + qFatal( "Cool hardware required" ); } } \endcode @@ -211,9 +211,9 @@ QGLFormat::QGLFormat() : QGLWidget( QGLFormat( StencilBuffer | AlphaChannel ), parent, name ) { if ( !format().stencil() ) - tqWarning( "Could not get stencil buffer; results will be suboptimal" ); + qWarning( "Could not get stencil buffer; results will be suboptimal" ); if ( !format().alphaChannel() ) - tqWarning( "Could not get alpha channel; results will be suboptimal" ); + qWarning( "Could not get alpha channel; results will be suboptimal" ); ... } \endcode @@ -877,7 +877,7 @@ void QGLContext::setDevice( QPaintDevice *pDev ) if ( d->paintDevice && (d->paintDevice->devType() != QInternal::Widget && d->paintDevice->devType() != QInternal::Pixmap) ) { #if defined(QT_CHECK_RANGE) - tqWarning( "QGLContext: Unsupported paint device type" ); + qWarning( "QGLContext: Unsupported paint device type" ); #endif } } diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index 9a0343c..55fa07e 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -56,7 +56,7 @@ #define QGL_VERSION 450 #define QGL_VERSION_STR "4.5" QM_EXPORT_OPENGL inline const char *qGLVersion() { - tqObsolete( 0, "qGLVersion", "qVersion" ); + qObsolete( 0, "qGLVersion", "qVersion" ); return QGL_VERSION_STR; } #endif diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index 1787134..a8abef8 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -135,7 +135,7 @@ bool qt_resolve_gl_symbols(bool fatal) if (!qt_glCallLists) { // if this fails the rest will surely fail if (fatal) - tqFatal("Unable to resolve GL/GLX symbols - please check your GL library installation."); + qFatal("Unable to resolve GL/GLX symbols - please check your GL library installation."); return FALSE; } @@ -241,7 +241,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi ) const char *v = glXQueryServerString( dpy, vi->screen, GLX_VERSION ); if ( v ) mesa_gl = strstr(v,"Mesa") != 0; - tqAddPostRoutine( cleanup_cmaps ); + qAddPostRoutine( cleanup_cmaps ); } CMapEntry *x = cmap_dict->find( (long) vi->visualid + ( vi->screen * 256 ) ); @@ -253,11 +253,11 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi ) XStandardColormap *c; int n, i; - // tqDebug( "Choosing cmap for vID %0x", vi->visualid ); + // qDebug( "Choosing cmap for vID %0x", vi->visualid ); if ( vi->visualid == XVisualIDFromVisual( (Visual*)QPaintDevice::x11AppVisual( vi->screen ) ) ) { - // tqDebug( "Using x11AppColormap" ); + // qDebug( "Using x11AppColormap" ); return QPaintDevice::x11AppColormap( vi->screen ); } @@ -271,7 +271,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi ) if ( c[i].visualid == vi->visual->visualid ) { x->cmap = c[i].colormap; x->scmap = c[i]; - //tqDebug( "Using HP_RGB scmap" ); + //qDebug( "Using HP_RGB scmap" ); } i++; @@ -288,7 +288,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi ) _XmuLookupStandardColormap qt_XmuLookupStandardColormap; qt_XmuLookupStandardColormap = (_XmuLookupStandardColormap) QLibrary::resolve("Xmu.so.6", "XmuLookupStandardColormap"); if (!qt_XmuLookupStandardColormap) - tqFatal("Unable to resolve Xmu symbols - please check your Xmu library installation."); + qFatal("Unable to resolve Xmu symbols - please check your Xmu library installation."); #define XmuLookupStandardColormap qt_XmuLookupStandardColormap #endif @@ -302,7 +302,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi ) if ( c[i].visualid == vi->visualid ) { x->cmap = c[i].colormap; x->scmap = c[i]; - //tqDebug( "Using RGB_DEFAULT scmap" ); + //qDebug( "Using RGB_DEFAULT scmap" ); } i++; } @@ -315,7 +315,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi ) x->cmap = XCreateColormap( dpy, RootWindow(dpy,vi->screen), vi->visual, AllocNone ); x->alloc = TRUE; - // tqDebug( "Allocating cmap" ); + // qDebug( "Allocating cmap" ); } // associate cmap with visualid @@ -466,7 +466,7 @@ bool QGLContext::chooseContext( const QGLContext* shareContext ) if ( shareContext && ( !shareContext->isValid() || !shareContext->cx ) ) { #if defined(QT_CHECK_NULL) - tqWarning("QGLContext::chooseContext(): Cannot share with invalid context"); + qWarning("QGLContext::chooseContext(): Cannot share with invalid context"); #endif shareContext = 0; } @@ -703,7 +703,7 @@ void QGLContext::makeCurrent() { if ( !d->valid ) { #if defined(QT_CHECK_STATE) - tqWarning("QGLContext::makeCurrent(): Cannot make invalid context current."); + qWarning("QGLContext::makeCurrent(): Cannot make invalid context current."); #endif return; } @@ -718,9 +718,9 @@ void QGLContext::makeCurrent() ((QWidget *)d->paintDevice)->winId(), (GLXContext)cx ); #if defined(QT_CHECK_NULL) - // tqDebug("makeCurrent: %i, vi=%i, vi->vi=%i, vi->id=%i", (int)this, (int)vi, (int)((XVisualInfo*)vi)->visual, (int)((XVisualInfo*)vi)->visualid ); + // qDebug("makeCurrent: %i, vi=%i, vi->vi=%i, vi->id=%i", (int)this, (int)vi, (int)((XVisualInfo*)vi)->visual, (int)((XVisualInfo*)vi)->visualid ); if ( !ok ) - tqWarning("QGLContext::makeCurrent(): Failed."); + qWarning("QGLContext::makeCurrent(): Failed."); #endif if ( ok ) currentCtx = this; @@ -881,13 +881,13 @@ void qgl_use_font(QFontEngineXft *engine, int first, int count, int listBase) err = FT_Load_Glyph(face, FT_Get_Char_Index(face, i), FT_LOAD_DEFAULT); if (err) { - tqDebug("failed loading glyph %d from font", i); + qDebug("failed loading glyph %d from font", i); Q_ASSERT(!err); } err = FT_Render_Glyph(face->glyph, (antialiased ? ft_render_mode_normal : ft_render_mode_mono)); if (err) { - tqDebug("failed rendering glyph %d from font", i); + qDebug("failed rendering glyph %d from font", i); Q_ASSERT(!err); } @@ -1011,7 +1011,7 @@ void QGLOverlayWidget::initializeGL() if ( transparentColor.isValid() ) qglClearColor( transparentColor ); else - tqWarning( "QGLOverlayWidget::initializeGL(): Could not get transparent color" ); + qWarning( "QGLOverlayWidget::initializeGL(): Could not get transparent color" ); realWidget->initializeOverlayGL(); } @@ -1128,13 +1128,13 @@ void QGLWidget::setContext( QGLContext *context, { if ( context == 0 ) { #if defined(QT_CHECK_NULL) - tqWarning( "QGLWidget::setContext: Cannot set null context" ); + qWarning( "QGLWidget::setContext: Cannot set null context" ); #endif return; } if ( !context->deviceIsPixmap() && context->device() != this ) { #if defined(QT_CHECK_STATE) - tqWarning( "QGLWidget::setContext: Context must refer to this widget" ); + qWarning( "QGLWidget::setContext: Context must refer to this widget" ); #endif return; } @@ -1333,7 +1333,7 @@ void QGLWidget::setColormap( const QGLColormap & c ) return; if ( !cmap.d->cmapHandle && !qCanAllocColors( this ) ) { - tqWarning( "QGLWidget::setColormap: Cannot create a read/write " + qWarning( "QGLWidget::setColormap: Cannot create a read/write " "colormap for this visual" ); return; } diff --git a/src/opengl/qglcolormap.cpp b/src/opengl/qglcolormap.cpp index 71d3937..2deb46b 100644 --- a/src/opengl/qglcolormap.cpp +++ b/src/opengl/qglcolormap.cpp @@ -173,7 +173,7 @@ void QGLColormap::setEntry( int idx, QRgb color ) #if defined(QT_CHECK_RANGE) if ( idx < 0 || idx > (int) d->cells.size() ) { - tqWarning( "QGLColormap::setRgb: Index out of range." ); + qWarning( "QGLColormap::setRgb: Index out of range." ); return; } #endif -- cgit v1.2.1