summaryrefslogtreecommitdiffstats
path: root/kscreensaver/kdesavers/wave.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kscreensaver/kdesavers/wave.cpp')
-rw-r--r--kscreensaver/kdesavers/wave.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/kscreensaver/kdesavers/wave.cpp b/kscreensaver/kdesavers/wave.cpp
index 73278272..7d94057f 100644
--- a/kscreensaver/kdesavers/wave.cpp
+++ b/kscreensaver/kdesavers/wave.cpp
@@ -6,7 +6,7 @@
//
#include <stdlib.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kapplication.h>
#include <klocale.h>
#include <kconfig.h>
@@ -288,8 +288,8 @@ void Wave::paintGL ()
bool Wave::LoadGLTextures()
{
- /* Status indicator */
- bool Status = TRUE;
+ /* tqStatus indicator */
+ bool tqStatus = TRUE;
TQImage buf; // = TQPixmap::grabWindow ( 0 ).convertToImage();
kdDebug() << "Loading: " << locate("data", "kscreensaver/image.png") << endl;
@@ -307,7 +307,7 @@ bool Wave::LoadGLTextures()
tex = convertToGLFormat( buf );
}
/* Set the status to true */
- //Status = TRUE;
+ //tqStatus = TRUE;
glGenTextures(1, &texture[0]); /* create three textures */
glBindTexture(GL_TEXTURE_2D, texture[0]);
/* use linear filtering */
@@ -320,5 +320,5 @@ bool Wave::LoadGLTextures()
kdDebug() << "Texture Loaded: " << tex.width() << "," << tex.height() << endl;
- return Status;
+ return tqStatus;
}