From 5c194e6e7059ddcc96b0e0166ce6157c35fc183e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:45:12 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kscreensaver/xsavers/helpers.cpp | 12 ++++++------ kscreensaver/xsavers/mode.h | 20 ++++++++++---------- kscreensaver/xsavers/space.cpp | 10 +++++----- kscreensaver/xsavers/swarm.cpp | 4 ++-- kscreensaver/xsavers/xlock.h | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) (limited to 'kscreensaver/xsavers') diff --git a/kscreensaver/xsavers/helpers.cpp b/kscreensaver/xsavers/helpers.cpp index 242d2f75..ef700545 100644 --- a/kscreensaver/xsavers/helpers.cpp +++ b/kscreensaver/xsavers/helpers.cpp @@ -3,27 +3,27 @@ #include void min_width(TQWidget *w) { - w->setMinimumWidth(w->tqsizeHint().width()); + w->setMinimumWidth(w->sizeHint().width()); } void fixed_width(TQWidget *w) { - w->setFixedWidth(w->tqsizeHint().width()); + w->setFixedWidth(w->sizeHint().width()); } void min_height(TQWidget *w) { - w->setMinimumHeight(w->tqsizeHint().height()); + w->setMinimumHeight(w->sizeHint().height()); } void fixed_height(TQWidget *w) { - w->setFixedHeight(w->tqsizeHint().height()); + w->setFixedHeight(w->sizeHint().height()); } void min_size(TQWidget *w) { - w->setMinimumSize(w->tqsizeHint()); + w->setMinimumSize(w->sizeHint()); } void fixed_size(TQWidget *w) { - w->setFixedSize(w->tqsizeHint()); + w->setFixedSize(w->sizeHint()); } KConfig *klock_config() diff --git a/kscreensaver/xsavers/mode.h b/kscreensaver/xsavers/mode.h index 10213f0a..c2bc7f1d 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 tqrepaint */ + ModeHook *refresh_hook; /* tells mode to repaint */ 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_tqgeometry; -extern ModeHook draw_tqgeometry; -extern ModeHook release_tqgeometry; -extern ModeHook refresh_tqgeometry; +extern ModeHook init_geometry; +extern ModeHook draw_geometry; +extern ModeHook release_geometry; +extern ModeHook refresh_geometry; 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_tqshape; -extern ModeHook draw_tqshape; -extern ModeHook release_tqshape; -extern ModeHook refresh_tqshape; -extern ModeSpecOpt tqshape_opts; +extern ModeHook init_shape; +extern ModeHook draw_shape; +extern ModeHook release_shape; +extern ModeHook refresh_shape; +extern ModeSpecOpt shape_opts; extern ModeHook init_slip; extern ModeHook draw_slip; diff --git a/kscreensaver/xsavers/space.cpp b/kscreensaver/xsavers/space.cpp index 99c7d10d..434b5802 100644 --- a/kscreensaver/xsavers/space.cpp +++ b/kscreensaver/xsavers/space.cpp @@ -50,7 +50,7 @@ //#define TQT_CLEAN_NAMESPACE #include -#include +#include #include #include #include @@ -275,7 +275,7 @@ static void Init(void) glDisable(GL_DITHER); } -void retqshape(int width, int height) +void reshape(int width, int height) { windW = (GLint)width; @@ -444,7 +444,7 @@ initSpace(Window window) glClearIndex(BlackPixel(display, screen)); } - retqshape(xwa.width, xwa.height); + reshape(xwa.width, xwa.height); Init(); } @@ -725,8 +725,8 @@ void main(int argc, char **argv) Init(); - tkExposeFunc(Retqshape); - tkRetqshapeFunc(Retqshape); + tkExposeFunc(Reshape); + tkReshapeFunc(Reshape); tkKeyDownFunc(Key); tkIdleFunc(Idle); tkExec(); diff --git a/kscreensaver/xsavers/swarm.cpp b/kscreensaver/xsavers/swarm.cpp index 5b2c8fae..c9ae3487 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 */ -// tqlayout management added 1998/04/19 by Mario Weilguni +// layout management added 1998/04/19 by Mario Weilguni #define MAXSPEED 100 #define MINSPEED 0 @@ -220,7 +220,7 @@ drawswarm(Window win, KRandomSequence &rnd) #include #include #include -#include +#include #include #include diff --git a/kscreensaver/xsavers/xlock.h b/kscreensaver/xsavers/xlock.h index ff309c63..77530a9f 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 *tqgeometry; +extern char *geometry; extern float saturation; extern int nicelevel; extern int delay; -- cgit v1.2.1