From 48afe4d8df11f862f7ccc60f0594991f857f81db Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:58:18 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 5c194e6e7059ddcc96b0e0166ce6157c35fc183e.
---
 kscreensaver/kdesavers/wave.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'kscreensaver/kdesavers/wave.cpp')

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;
 }
-- 
cgit v1.2.1