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 /examples/demo/opengl | |
| parent | a830bf10b7d4ed2c83ffe68c0b22d7c4ba9860b0 (diff) | |
| download | qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.tar.gz qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.zip | |
Undo prior accidental commit
Diffstat (limited to 'examples/demo/opengl')
| -rw-r--r-- | examples/demo/opengl/glinfo_x11.cpp | 2 | ||||
| -rw-r--r-- | examples/demo/opengl/gltexobj.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/demo/opengl/glinfo_x11.cpp b/examples/demo/opengl/glinfo_x11.cpp index 58d5144..1137ef9 100644 --- a/examples/demo/opengl/glinfo_x11.cpp +++ b/examples/demo/opengl/glinfo_x11.cpp @@ -236,7 +236,7 @@ GLInfo::GLInfo() dpy = gl.x11Display(); if ( !dpy ) { - tqWarning( "Error: unable to open display %s\n", displayName ); + qWarning( "Error: unable to open display %s\n", displayName ); } numScreens = ScreenCount( dpy ); diff --git a/examples/demo/opengl/gltexobj.cpp b/examples/demo/opengl/gltexobj.cpp index 2844462..60627da 100644 --- a/examples/demo/opengl/gltexobj.cpp +++ b/examples/demo/opengl/gltexobj.cpp @@ -100,7 +100,7 @@ void GLTexobj::initializeGL() QImage tex1, tex2, buf; if ( !buf.load( "opengl/gllogo.bmp" ) ) { // Load first image from file - tqWarning( "Could not read image file, using single-color instead." ); + qWarning( "Could not read image file, using single-color instead." ); QImage dummy( 128, 128, 32 ); dummy.fill( Qt::green.rgb() ); buf = dummy; @@ -108,7 +108,7 @@ void GLTexobj::initializeGL() tex1 = QGLWidget::convertToGLFormat( buf ); // flipped 32bit RGBA if ( !buf.load( "opengl/qtlogo.bmp" ) ) { // Load first image from file - tqWarning( "Could not read image file, using single-color instead." ); + qWarning( "Could not read image file, using single-color instead." ); QImage dummy( 128, 128, 32 ); dummy.fill( Qt::red.rgb() ); buf = dummy; |