Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 5c194e6e7059ddcc96b0e0166ce6157c35fc183e.

5 files changed, 24 insertions, 24 deletions

diff --git a/kscreensaver/xsavers/helpers.cpp b/kscreensaver/xsavers/helpers.cpp
index ef700545..242d2f75 100644
--- a/kscreensaver/xsavers/helpers.cpp
+++ b/kscreensaver/xsavers/helpers.cpp
@@ -3,27 +3,27 @@
 #include <kapplication.h>
 
 void min_width(TQWidget *w) {
-  w->setMinimumWidth(w->sizeHint().width());
+  w->setMinimumWidth(w->tqsizeHint().width());
 }
 
 void fixed_width(TQWidget *w) {
-  w->setFixedWidth(w->sizeHint().width());
+  w->setFixedWidth(w->tqsizeHint().width());
 }
 
 void min_height(TQWidget *w) {
-  w->setMinimumHeight(w->sizeHint().height());
+  w->setMinimumHeight(w->tqsizeHint().height());
 }
 
 void fixed_height(TQWidget *w) {
-  w->setFixedHeight(w->sizeHint().height());
+  w->setFixedHeight(w->tqsizeHint().height());
 }
 
 void min_size(TQWidget *w) {
-  w->setMinimumSize(w->sizeHint());
+  w->setMinimumSize(w->tqsizeHint());
 }
 
 void fixed_size(TQWidget *w) {
-  w->setFixedSize(w->sizeHint());
+  w->setFixedSize(w->tqsizeHint());
 }
 
 KConfig *klock_config()
diff --git a/kscreensaver/xsavers/mode.h b/kscreensaver/xsavers/mode.h
index c2bc7f1d..10213f0a 100644
--- a/kscreensaver/xsavers/mode.h
+++ b/kscreensaver/xsavers/mode.h
@@ -38,7 +38,7 @@ typedef struct LockStruct_s {
 	ModeHook   *init_hook;	/* func to init a mode */
 	ModeHook   *callback_hook;	/* func to run (tick) a mode */
 	ModeHook   *release_hook;	/* func to shutdown a mode */
-	ModeHook   *refresh_hook;	/* tells mode to repaint */
+	ModeHook   *refresh_hook;	/* tells mode to tqrepaint */
 	ModeHook   *change_hook;	/* user wants mode to change */
 	ModeHook   *unused_hook;	/* for future expansion */
 	ModeSpecOpt *msopt;	/* this mode's def resources */
@@ -313,10 +313,10 @@ extern ModeHook release_galaxy;
 extern ModeHook refresh_galaxy;
 extern ModeSpecOpt galaxy_opts;
 
-extern ModeHook init_geometry;
-extern ModeHook draw_geometry;
-extern ModeHook release_geometry;
-extern ModeHook refresh_geometry;
+extern ModeHook init_tqgeometry;
+extern ModeHook draw_tqgeometry;
+extern ModeHook release_tqgeometry;
+extern ModeHook refresh_tqgeometry;
 extern ModeSpecOpt geometry_opts;
 
 extern ModeHook init_grav;
@@ -504,11 +504,11 @@ extern ModeHook release_rotor;
 extern ModeHook refresh_rotor;
 extern ModeSpecOpt rotor_opts;
 
-extern ModeHook init_shape;
-extern ModeHook draw_shape;
-extern ModeHook release_shape;
-extern ModeHook refresh_shape;
-extern ModeSpecOpt shape_opts;
+extern ModeHook init_tqshape;
+extern ModeHook draw_tqshape;
+extern ModeHook release_tqshape;
+extern ModeHook refresh_tqshape;
+extern ModeSpecOpt tqshape_opts;
 
 extern ModeHook init_slip;
 extern ModeHook draw_slip;
diff --git a/kscreensaver/xsavers/space.cpp b/kscreensaver/xsavers/space.cpp
index 434b5802..99c7d10d 100644
--- a/kscreensaver/xsavers/space.cpp
+++ b/kscreensaver/xsavers/space.cpp
@@ -50,7 +50,7 @@
 //#define TQT_CLEAN_NAMESPACE
 
 #include <tqslider.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <krandomsequence.h>
@@ -275,7 +275,7 @@ static void Init(void)
     glDisable(GL_DITHER);
 }
 
-void reshape(int width, int height)
+void retqshape(int width, int height)
 {
 
     windW = (GLint)width;
@@ -444,7 +444,7 @@ initSpace(Window window)
 	  glClearIndex(BlackPixel(display, screen));
 	}
 
-	reshape(xwa.width, xwa.height);
+	retqshape(xwa.width, xwa.height);
 	Init();
 }
 
@@ -725,8 +725,8 @@ void main(int argc, char **argv)
 
     Init();
 
-    tkExposeFunc(Reshape);
-    tkReshapeFunc(Reshape);
+    tkExposeFunc(Retqshape);
+    tkRetqshapeFunc(Retqshape);
     tkKeyDownFunc(Key);
     tkIdleFunc(Idle);
     tkExec();
diff --git a/kscreensaver/xsavers/swarm.cpp b/kscreensaver/xsavers/swarm.cpp
index c9ae3487..5b2c8fae 100644
--- a/kscreensaver/xsavers/swarm.cpp
+++ b/kscreensaver/xsavers/swarm.cpp
@@ -12,7 +12,7 @@
    Contact me in case of problems, not the original author!
    Last revised: 10-Jul-97
 */
-// layout management added 1998/04/19 by Mario Weilguni <[email protected]>
+// tqlayout management added 1998/04/19 by Mario Weilguni <[email protected]>
 
 #define MAXSPEED 100
 #define MINSPEED 0
@@ -220,7 +220,7 @@ drawswarm(Window win, KRandomSequence &rnd)
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqcolor.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kscreensaver/xsavers/xlock.h b/kscreensaver/xsavers/xlock.h
index 77530a9f..ff309c63 100644
--- a/kscreensaver/xsavers/xlock.h
+++ b/kscreensaver/xsavers/xlock.h
@@ -139,7 +139,7 @@ extern char  *text_pass;
 extern char  *text_info;
 extern char  *text_valid;
 extern char  *text_invalid;
-extern char  *geometry;
+extern char  *tqgeometry;
 extern float saturation;
 extern int   nicelevel;
 extern int   delay;