From 5878ea60180ae526b6587d0314cc7dbede4a89f4 Mon Sep 17 00:00:00 2001 From: ehouse Date: Sat, 26 May 2007 14:14:01 +0000 Subject: [PATCH] type name change only --- common/util.h | 6 +++--- linux/cursesmain.c | 4 ++-- linux/gtkmain.c | 4 ++-- linux/linuxmain.c | 5 +++-- linux/main.h | 5 +++-- palm/palmmain.c | 8 ++++---- palm/palmmain.h | 2 +- wince/cemain.c | 6 +++--- wince/cemain.h | 2 +- 9 files changed, 22 insertions(+), 20 deletions(-) diff --git a/common/util.h b/common/util.h index dd7372d23..bc014b23a 100644 --- a/common/util.h +++ b/common/util.h @@ -1,6 +1,6 @@ /* -*-mode: C; fill-column: 78; c-basic-offset: 4; -*- */ /* - * Copyright 1997 - 2000 by Eric House (xwords@eehouse.org). All rights reserved. + * Copyright 1997 - 2007 by Eric House (xwords@eehouse.org). All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -88,7 +88,7 @@ typedef struct BadWordInfo { XP_UCHAR* words[MAX_TRAY_TILES+1]; /* can form in both directions */ } BadWordInfo; -typedef void (*TimerProc)( void* closure, XWTimerReason why ); +typedef void (*XWTimerProc)( void* closure, XWTimerReason why ); /* Platform-specific utility functions that need to be */ @@ -129,7 +129,7 @@ typedef struct UtilVtable { XP_Bool (*m_util_engineProgressCallback)( XW_UtilCtxt* uc ); void (*m_util_setTimer)( XW_UtilCtxt* uc, XWTimerReason why, XP_U16 when, - TimerProc proc, void* closure ); + XWTimerProc proc, void* closure ); void (*m_util_requestTime)( XW_UtilCtxt* uc ); diff --git a/linux/cursesmain.c b/linux/cursesmain.c index fafe51a38..148185632 100644 --- a/linux/cursesmain.c +++ b/linux/cursesmain.c @@ -1,6 +1,6 @@ /* -*-mode: C; fill-column: 78; c-basic-offset: 4; compile-command: "make MEMDEBUG=TRUE"; -*- */ /* - * Copyright 2000-2006 by Eric House (xwords@eehouse.org). All rights + * Copyright 2000-2007 by Eric House (xwords@eehouse.org). All rights * reserved. * * This program is free software; you can redistribute it and/or @@ -231,7 +231,7 @@ curses_util_engineProgressCallback( XW_UtilCtxt* XP_UNUSED(uc) ) static void curses_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why, XP_U16 when, - TimerProc proc, void* closure ) + XWTimerProc proc, void* closure ) { CursesAppGlobals* globals = (CursesAppGlobals*)uc->closure; diff --git a/linux/gtkmain.c b/linux/gtkmain.c index 1227a8b59..9aaf7b678 100644 --- a/linux/gtkmain.c +++ b/linux/gtkmain.c @@ -1,6 +1,6 @@ /* -*-mode: C; fill-column: 78; c-basic-offset: 4; compile-command: "make MEMDEBUG=TRUE"; -*- */ /* - * Copyright 2000-2003 by Eric House (xwords@eehouse.org). All rights reserved. + * Copyright 2000-2007 by Eric House (xwords@eehouse.org). All rights reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -1216,7 +1216,7 @@ heartbeat_timer_func( gpointer data ) static void gtk_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why, XP_U16 XP_UNUSED_RELAY(when), - TimerProc proc, void* closure ) + XWTimerProc proc, void* closure ) { GtkAppGlobals* globals = (GtkAppGlobals*)uc->closure; guint newSrc; diff --git a/linux/linuxmain.c b/linux/linuxmain.c index a31a1e1c6..5bde4e54e 100644 --- a/linux/linuxmain.c +++ b/linux/linuxmain.c @@ -1,6 +1,7 @@ /* -*-mode: C; fill-column: 78; c-basic-offset: 4; compile-command: "make MEMDEBUG=TRUE"; -*- */ /* - * Copyright 2000 by Eric House (xwords@eehouse.org). All rights reserved. + * Copyright 2000-2007 by Eric House (xwords@eehouse.org). All rights + * reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -532,7 +533,7 @@ linux_util_makeStreamFromAddr( XW_UtilCtxt* uctx, XP_U16 channelNo ) void linuxFireTimer( CommonGlobals* cGlobals, XWTimerReason why ) { - TimerProc proc = cGlobals->timerProcs[why]; + XWTimerProc proc = cGlobals->timerProcs[why]; void* closure = cGlobals->timerClosures[why]; cGlobals->timerProcs[why] = NULL; diff --git a/linux/main.h b/linux/main.h index a4d9151f6..975c8f4ab 100644 --- a/linux/main.h +++ b/linux/main.h @@ -1,6 +1,7 @@ /* -*-mode: C; fill-column: 78; c-basic-offset: 4; -*- */ /* - * Copyright 2001 by Eric House (xwords@eehouse.org). All rights reserved. + * Copyright 2001-2007 by Eric House (xwords@eehouse.org). All rights + * reserved. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -114,7 +115,7 @@ struct CommonGlobals { /* Used only for bluetooth case */ struct LinBtStuff* btStuff; - TimerProc timerProcs[NUM_TIMERS_PLUS_ONE]; + XWTimerProc timerProcs[NUM_TIMERS_PLUS_ONE]; void* timerClosures[NUM_TIMERS_PLUS_ONE]; MPSLOT diff --git a/palm/palmmain.c b/palm/palmmain.c index 843841416..565757df5 100644 --- a/palm/palmmain.c +++ b/palm/palmmain.c @@ -116,7 +116,7 @@ static XP_Bool palm_util_hiliteCell( XW_UtilCtxt* uc, XP_U16 col, XP_U16 row ); static XP_Bool palm_util_engineProgressCallback( XW_UtilCtxt* uc ); static void palm_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why, XP_U16 when, - TimerProc proc, void* closure ); + XWTimerProc proc, void* closure ); static XP_U32 palm_util_getCurSeconds( XW_UtilCtxt* uc ); static void palm_util_requestTime( XW_UtilCtxt* uc ); static DictionaryCtxt* palm_util_makeEmptyDict( XW_UtilCtxt* uc ); @@ -1543,7 +1543,7 @@ destroy_on_close( XWStreamCtxt* p_stream ) static void palmFireTimer( PalmAppGlobals* globals, XWTimerReason why ) { - TimerProc proc = globals->timerProcs[why]; + XWTimerProc proc = globals->timerProcs[why]; void* closure = globals->timerClosures[why]; XP_ASSERT( TimGetTicks() >= globals->timerFireAt[why] ); globals->timerProcs[why] = NULL; @@ -3769,8 +3769,8 @@ palm_util_engineProgressCallback( XW_UtilCtxt* uc ) static void palm_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why, - XP_U16 XP_UNUSED_IR(secsFromNow), - TimerProc proc, void* closure ) + XP_U16 secsFromNow, + XWTimerProc proc, void* closure ) { PalmAppGlobals* globals = (PalmAppGlobals*)uc->closure; XP_U32 now = TimGetTicks(); diff --git a/palm/palmmain.h b/palm/palmmain.h index 1f0f14c99..5ec5b919f 100644 --- a/palm/palmmain.h +++ b/palm/palmmain.h @@ -324,7 +324,7 @@ struct PalmAppGlobals { struct ConnsDlgState* connState; - TimerProc timerProcs[NUM_TIMERS_PLUS_ONE]; + XWTimerProc timerProcs[NUM_TIMERS_PLUS_ONE]; void* timerClosures[NUM_TIMERS_PLUS_ONE]; XP_U32 timerFireAt[NUM_TIMERS_PLUS_ONE]; diff --git a/wince/cemain.c b/wince/cemain.c index 42bfde26c..7bfa0268a 100755 --- a/wince/cemain.c +++ b/wince/cemain.c @@ -109,7 +109,7 @@ static XP_Bool ce_util_hiliteCell( XW_UtilCtxt* uc, XP_U16 col, XP_U16 row ); static XP_Bool ce_util_engineProgressCallback( XW_UtilCtxt* uc ); static void ce_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why, XP_U16 when, - TimerProc proc, void* closure); + XWTimerProc proc, void* closure); static void ce_util_requestTime( XW_UtilCtxt* uc ); static XP_U32 ce_util_getCurSeconds( XW_UtilCtxt* uc ); static DictionaryCtxt* ce_util_makeEmptyDict( XW_UtilCtxt* uc ); @@ -1776,7 +1776,7 @@ handleScroll( CEAppGlobals* globals, XP_S16 pos, /* only valid for THUMB* */ static void ceFireTimer( CEAppGlobals* globals, XWTimerReason why ) { - TimerProc proc; + XWTimerProc proc; void* closure; proc = globals->timerProcs[why]; @@ -2727,7 +2727,7 @@ ce_util_engineProgressCallback( XW_UtilCtxt* XP_UNUSED(uc) ) static void ce_util_setTimer( XW_UtilCtxt* uc, XWTimerReason why, XP_U16 XP_UNUSED_RELAY(when), - TimerProc proc, void* closure) + XWTimerProc proc, void* closure) { CEAppGlobals* globals = (CEAppGlobals*)uc->closure; XP_U32 timerID; diff --git a/wince/cemain.h b/wince/cemain.h index aa5298dd5..e409c7531 100755 --- a/wince/cemain.h +++ b/wince/cemain.h @@ -84,7 +84,7 @@ typedef struct CEAppGlobals { wchar_t* lastDefaultDir; XP_U32 timerIDs[NUM_TIMERS_PLUS_ONE]; - TimerProc timerProcs[NUM_TIMERS_PLUS_ONE]; + XWTimerProc timerProcs[NUM_TIMERS_PLUS_ONE]; void* timerClosures[NUM_TIMERS_PLUS_ONE]; XP_U16 flags; /* bits defined below */