summaryrefslogtreecommitdiffstats
path: root/kscreensaver/kdesavers/fountain.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kscreensaver/kdesavers/fountain.cpp')
-rw-r--r--kscreensaver/kdesavers/fountain.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/kscreensaver/kdesavers/fountain.cpp b/kscreensaver/kdesavers/fountain.cpp
index c4578418..2c208b4c 100644
--- a/kscreensaver/kdesavers/fountain.cpp
+++ b/kscreensaver/kdesavers/fountain.cpp
@@ -9,7 +9,7 @@
//
#include <stdlib.h>
#include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
#include <kapplication.h>
#include <klocale.h>
#include <kconfig.h>
@@ -218,8 +218,8 @@ Fountain::~Fountain()
/** load the particle file */
bool Fountain::loadParticle()
{
- /* Status indicator */
- bool Status = TRUE;
+ /* tqStatus indicator */
+ bool tqStatus = TRUE;
TQImage buf;
kdDebug() << "Loading: " << locate("data", "kscreensaver/particle.png") << endl;
@@ -238,7 +238,7 @@ bool Fountain::loadParticle()
}
/* 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 */
@@ -250,7 +250,7 @@ bool Fountain::loadParticle()
- return Status;
+ return tqStatus;
}
/** setup the GL enviroment */
void Fountain::initializeGL ()