summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-28 22:31:39 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-28 22:31:39 -0600
commit41bb408dde90e755b07cd2ab8a9bdec7548c84b0 (patch)
tree6d4d5407c000add30aa78630e009c0e5d633e440 /src/opengl
parent1740cd279522c060e738bbbffacab83355d2b794 (diff)
downloadtqt3-41bb408dde90e755b07cd2ab8a9bdec7548c84b0.tar.gz
tqt3-41bb408dde90e755b07cd2ab8a9bdec7548c84b0.zip
Automated conversion from qt3
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/ntqgl.h2
-rw-r--r--src/opengl/qgl.cpp8
-rw-r--r--src/opengl/qgl_x11.cpp38
-rw-r--r--src/opengl/qglcolormap.cpp2
4 files changed, 25 insertions, 25 deletions
diff --git a/src/opengl/ntqgl.h b/src/opengl/ntqgl.h
index 7388c41ed..0ebe5a6b3 100644
--- a/src/opengl/ntqgl.h
+++ b/src/opengl/ntqgl.h
@@ -56,7 +56,7 @@
#define TQGL_VERSION 450
#define TQGL_VERSION_STR "4.5"
TQM_EXPORT_OPENGL inline const char *qGLVersion() {
- qObsolete( 0, "qGLVersion", "qVersion" );
+ tqObsolete( 0, "qGLVersion", "qVersion" );
return TQGL_VERSION_STR;
}
#endif
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp
index 95cbae5d7..d8f8914c4 100644
--- a/src/opengl/qgl.cpp
+++ b/src/opengl/qgl.cpp
@@ -159,7 +159,7 @@ static TQCleanupHandler<TQGLFormat> qgl_cleanup_format;
if ( !w->format().stereo() ) {
// ok, goggles off
if ( !w->format().hasOverlay() ) {
- qFatal( "Cool hardware required" );
+ tqFatal( "Cool hardware required" );
}
}
\endcode
@@ -211,9 +211,9 @@ TQGLFormat::TQGLFormat()
: TQGLWidget( TQGLFormat( StencilBuffer | AlphaChannel ), parent, name )
{
if ( !format().stencil() )
- qWarning( "Could not get stencil buffer; results will be suboptimal" );
+ tqWarning( "Could not get stencil buffer; results will be suboptimal" );
if ( !format().alphaChannel() )
- qWarning( "Could not get alpha channel; results will be suboptimal" );
+ tqWarning( "Could not get alpha channel; results will be suboptimal" );
...
}
\endcode
@@ -877,7 +877,7 @@ void TQGLContext::setDevice( TQPaintDevice *pDev )
if ( d->paintDevice && (d->paintDevice->devType() != TQInternal::Widget
&& d->paintDevice->devType() != TQInternal::Pixmap) ) {
#if defined(QT_CHECK_RANGE)
- qWarning( "TQGLContext: Unsupported paint device type" );
+ tqWarning( "TQGLContext: Unsupported paint device type" );
#endif
}
}
diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp
index 8989a05b4..a738aa486 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)
- qFatal("Unable to resolve GL/GLX symbols - please check your GL library installation.");
+ tqFatal("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;
- qAddPostRoutine( cleanup_cmaps );
+ tqAddPostRoutine( 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;
- // qDebug( "Choosing cmap for vID %0x", vi->visualid );
+ // tqDebug( "Choosing cmap for vID %0x", vi->visualid );
if ( vi->visualid ==
XVisualIDFromVisual( (Visual*)TQPaintDevice::x11AppVisual( vi->screen ) ) ) {
- // qDebug( "Using x11AppColormap" );
+ // tqDebug( "Using x11AppColormap" );
return TQPaintDevice::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];
- //qDebug( "Using HP_RGB scmap" );
+ //tqDebug( "Using HP_RGB scmap" );
}
i++;
@@ -288,7 +288,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi )
_XmuLookupStandardColormap qt_XmuLookupStandardColormap;
qt_XmuLookupStandardColormap = (_XmuLookupStandardColormap) TQLibrary::resolve("Xmu.so.6", "XmuLookupStandardColormap");
if (!qt_XmuLookupStandardColormap)
- qFatal("Unable to resolve Xmu symbols - please check your Xmu library installation.");
+ tqFatal("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];
- //qDebug( "Using RGB_DEFAULT scmap" );
+ //tqDebug( "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;
- // qDebug( "Allocating cmap" );
+ // tqDebug( "Allocating cmap" );
}
// associate cmap with visualid
@@ -399,7 +399,7 @@ bool TQGLFormat::hasOpenGL()
{
if (!qt_resolve_gl_symbols(FALSE))
return FALSE;
- return glXQueryExtension(qt_xdisplay(),0,0) != 0;
+ return glXQueryExtension(tqt_xdisplay(),0,0) != 0;
}
@@ -466,7 +466,7 @@ bool TQGLContext::chooseContext( const TQGLContext* shareContext )
if ( shareContext &&
( !shareContext->isValid() || !shareContext->cx ) ) {
#if defined(QT_CHECK_NULL)
- qWarning("TQGLContext::chooseContext(): Cannot share with invalid context");
+ tqWarning("TQGLContext::chooseContext(): Cannot share with invalid context");
#endif
shareContext = 0;
}
@@ -703,7 +703,7 @@ void TQGLContext::makeCurrent()
{
if ( !d->valid ) {
#if defined(QT_CHECK_STATE)
- qWarning("TQGLContext::makeCurrent(): Cannot make invalid context current.");
+ tqWarning("TQGLContext::makeCurrent(): Cannot make invalid context current.");
#endif
return;
}
@@ -718,9 +718,9 @@ void TQGLContext::makeCurrent()
((TQWidget *)d->paintDevice)->winId(),
(GLXContext)cx );
#if defined(QT_CHECK_NULL)
- // qDebug("makeCurrent: %i, vi=%i, vi->vi=%i, vi->id=%i", (int)this, (int)vi, (int)((XVisualInfo*)vi)->visual, (int)((XVisualInfo*)vi)->visualid );
+ // tqDebug("makeCurrent: %i, vi=%i, vi->vi=%i, vi->id=%i", (int)this, (int)vi, (int)((XVisualInfo*)vi)->visual, (int)((XVisualInfo*)vi)->visualid );
if ( !ok )
- qWarning("TQGLContext::makeCurrent(): Failed.");
+ tqWarning("TQGLContext::makeCurrent(): Failed.");
#endif
if ( ok )
currentCtx = this;
@@ -881,13 +881,13 @@ void qgl_use_font(TQFontEngineXft *engine, int first, int count, int listBase)
err = FT_Load_Glyph(face, FT_Get_Char_Index(face, i), FT_LOAD_DEFAULT);
if (err) {
- qDebug("failed loading glyph %d from font", i);
+ tqDebug("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) {
- qDebug("failed rendering glyph %d from font", i);
+ tqDebug("failed rendering glyph %d from font", i);
Q_ASSERT(!err);
}
@@ -1011,7 +1011,7 @@ void TQGLOverlayWidget::initializeGL()
if ( transparentColor.isValid() )
qglClearColor( transparentColor );
else
- qWarning( "TQGLOverlayWidget::initializeGL(): Could not get transparent color" );
+ tqWarning( "TQGLOverlayWidget::initializeGL(): Could not get transparent color" );
realWidget->initializeOverlayGL();
}
@@ -1128,13 +1128,13 @@ void TQGLWidget::setContext( TQGLContext *context,
{
if ( context == 0 ) {
#if defined(QT_CHECK_NULL)
- qWarning( "TQGLWidget::setContext: Cannot set null context" );
+ tqWarning( "TQGLWidget::setContext: Cannot set null context" );
#endif
return;
}
if ( !context->deviceIsPixmap() && context->device() != this ) {
#if defined(QT_CHECK_STATE)
- qWarning( "TQGLWidget::setContext: Context must refer to this widget" );
+ tqWarning( "TQGLWidget::setContext: Context must refer to this widget" );
#endif
return;
}
@@ -1333,7 +1333,7 @@ void TQGLWidget::setColormap( const TQGLColormap & c )
return;
if ( !cmap.d->cmapHandle && !qCanAllocColors( this ) ) {
- qWarning( "TQGLWidget::setColormap: Cannot create a read/write "
+ tqWarning( "TQGLWidget::setColormap: Cannot create a read/write "
"colormap for this visual" );
return;
}
diff --git a/src/opengl/qglcolormap.cpp b/src/opengl/qglcolormap.cpp
index d095a754c..541e309d6 100644
--- a/src/opengl/qglcolormap.cpp
+++ b/src/opengl/qglcolormap.cpp
@@ -173,7 +173,7 @@ void TQGLColormap::setEntry( int idx, TQRgb color )
#if defined(QT_CHECK_RANGE)
if ( idx < 0 || idx > (int) d->cells.size() ) {
- qWarning( "TQGLColormap::setRgb: Index out of range." );
+ tqWarning( "TQGLColormap::setRgb: Index out of range." );
return;
}
#endif