Rename some headers to fix doxygen warnings.

include/Makefile.am

@@ -2,16 +2,16 @@
 AUTOMAKE_OPTIONS=	foreign
 SUBDIRS = QF
 EXTRA_DIST = asm_i386.h alsa_funcs_list.h adivtab.h anorm_dots.h anorms.h \
-	asm_draw.h block16.h block8.h buildnum.h compat.h context_sdl.h \
+	asm_draw.h block16.h block8.h buildnum.h clview.h compat.h context_sdl.h \
 	context_x11.h d_iface.h d_ifacea.h d_local.h dga_check.h exp.h fbset.h \
-	garbage.h getopt.h gib_buffer.h gib_builtin.h gib_classes.h gib_execute.h gib_function.h \
+	garbage.h getopt.h gib_buffer.h gib_builtin.h gib_classes.h gib_execute.h \
-	gib_handle.h gib_object.h gib_parse.h gib_process.h gib_regex.h gib_semantics.h \
+	gib_function.h gib_handle.h gib_object.h gib_parse.h gib_process.h \
-	gib_thread.h gib_tree.h gib_vars.h gl_draw.h gl_warp_sin.h in_win.h \
+	gib_regex.h gib_semantics.h gib_thread.h gib_tree.h gib_vars.h gl_draw.h \
-	logos.h net_dgrm.h net_loop.h net_udp.h net_vcr.h net_wins.h netchan.h \
+	gl_warp_sin.h in_win.h logos.h net_dgrm.h net_loop.h net_udp.h net_vcr.h \
-	netmain.h old_keys.h ops.h qstring.h quakeasm.h regex.h r_cvar.h \
+	net_wins.h netchan.h netmain.h old_keys.h ops.h qstring.h quakeasm.h \
-	r_dynamic.h r_local.h r_screen.h r_shared.h rua_internal.h sbar.h \
+	regex.h r_cvar.h r_dynamic.h r_local.h r_screen.h r_shared.h \
-	skin_stencil.h snd_render.h sv_console.h varrays.h vgamodes.h view.h \
+	rua_internal.h sbar.h skin_stencil.h snd_internal.h sv_console.h \
-	vregset.h winquake.h world.h \
+	varrays.h vgamodes.h vregset.h winquake.h world.h \
 	\
 	qw/bothdefs.h qw/msg_backbuf.h qw/msg_ucmd.h qw/pmove.h qw/protocol.h \
 	\

include/clview.h

@@ -1,5 +1,5 @@
 /*
-	view.h
+	clview.h
 
 	(description)
 
@@ -27,8 +27,8 @@
 */
 // view.h
 
-#ifndef __view_h_
+#ifndef __clview_h_
-#define __view_h_
+#define __clview_h_
 
 #include "QF/mathlib.h"
 
@@ -53,4 +53,4 @@ void V_CalcBlend (void);
 
 extern float	v_blend[4];
 
-#endif // __view_h_
+#endif // __clview_h_

include/snd_internal.h

@@ -1,5 +1,5 @@
 /*
-	snd_render.h
+	snd_internal.h
 
 	Sound renderer plugin stuff
 
@@ -29,8 +29,8 @@
 	$Id$
 */
 
-#ifndef __snd_render_h
+#ifndef __snd_internal_h
-#define __snd_render_h
+#define __snd_internal_h
 
 
 /** \defgroup sound_render Sound rendering sub-system.
@@ -571,4 +571,4 @@ sfxbuffer_t *SND_GetCache (long samples, int rate, int channels,
 						   sfxblock_t *block, cache_allocator_t allocator);
 //@}
 
-#endif//__snd_render_h
+#endif//__snd_internal_h

libs/audio/cd_file.c

@@ -66,7 +66,7 @@ static __attribute__ ((used)) const char  rcsid[] =
 #include "QF/va.h"
 
 #include "compat.h"
-#include "snd_render.h"
+#include "snd_internal.h"
 
 /* Generic plugin structures */
 static general_data_t plugin_info_general_data;

libs/audio/renderer/flac.c

@@ -64,7 +64,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/sound.h"
 #include "QF/sys.h"
 
-#include "snd_render.h"
+#include "snd_internal.h"
 
 #ifdef LEGACY_FLAC
 #define FLAC__StreamDecoder FLAC__SeekableStreamDecoder

libs/audio/renderer/midi.c

@@ -45,7 +45,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/sys.h"
 #include "QF/quakefs.h"
 
-#include "snd_render.h"
+#include "snd_internal.h"
 
 #define FRAMES 1024
 #define CHANNELS 2

libs/audio/renderer/snd_channels.c

@@ -50,7 +50,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/quakefs.h"
 #include "QF/sys.h"
 
-#include "snd_render.h"
+#include "snd_internal.h"
 
 static channel_t *free_channels;
 channel_t       snd_channels[MAX_CHANNELS];

libs/audio/renderer/snd_dma.c

@@ -53,7 +53,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/va.h"
 #include "QF/quakefs.h"
 
-#include "snd_render.h"
+#include "snd_internal.h"
 
 static qboolean snd_initialized = false;
 static int      snd_blocked = 0;

libs/audio/renderer/snd_jack.c

@@ -48,7 +48,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "snd_render.h"
+#include "snd_internal.h"
 
 static int sound_started = 0;
 static int snd_blocked = 0;

libs/audio/renderer/snd_mem.c

@@ -50,7 +50,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/quakefs.h"
 
 #include "compat.h"
-#include "snd_render.h"
+#include "snd_internal.h"
 
 #define SAMPLE_GAP	4
 

libs/audio/renderer/snd_mix.c

@@ -45,7 +45,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/sys.h"
 
 #include "compat.h"
-#include "snd_render.h"
+#include "snd_internal.h"
 
 #define VOLSCALE 512.0				// so mixing is less likely to overflow
 									// note: must be >= 255 due to the channel

libs/audio/renderer/snd_resample.c

@@ -48,7 +48,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/quakefs.h"
 
 #include "compat.h"
-#include "snd_render.h"
+#include "snd_internal.h"
 
 typedef struct {
 	float      *data;

libs/audio/renderer/snd_sfx.c

@@ -49,7 +49,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/sys.h"
 #include "QF/va.h"
 
-#include "snd_render.h"
+#include "snd_internal.h"
 
 #define MAX_SFX		512
 static sfx_t    snd_sfx[MAX_SFX];

libs/audio/renderer/vorbis.c

@@ -49,7 +49,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/sound.h"
 #include "QF/sys.h"
 
-#include "snd_render.h"
+#include "snd_internal.h"
 
 #define FRAMES 1024
 

libs/audio/renderer/wav.c

@@ -46,7 +46,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/quakefs.h"
 #include "QF/riff.h"
 
-#include "snd_render.h"
+#include "snd_internal.h"
 
 #define FRAMES 1024
 

libs/audio/targets/snd_alsa.c

@@ -41,7 +41,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/qargs.h"
 #include "QF/sys.h"
 
-#include "snd_render.h"
+#include "snd_internal.h"
 
 static int			snd_inited;
 static int			snd_blocked = 0;

libs/audio/targets/snd_disk.c

@@ -52,7 +52,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/qargs.h"
 #include "QF/sys.h"
 
-#include "snd_render.h"
+#include "snd_internal.h"
 
 static int  snd_inited;
 static QFile      *snd_file;

libs/audio/targets/snd_dx.c

@@ -40,7 +40,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/qargs.h"
 #include "QF/sys.h"
 
-#include "snd_render.h"
+#include "snd_internal.h"
 
 #define iDirectSoundCreate(a,b,c)	pDirectSoundCreate(a,b,c)
 

libs/audio/targets/snd_oss.c

@@ -72,7 +72,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/qargs.h"
 #include "QF/sys.h"
 
-#include "snd_render.h"
+#include "snd_internal.h"
 
 #ifndef MAP_FAILED
 # define MAP_FAILED ((void *) -1)

libs/audio/targets/snd_sdl.c

@@ -49,7 +49,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/qargs.h"
 #include "QF/sys.h"
 
-#include "snd_render.h"
+#include "snd_internal.h"
 
 static dma_t sn;
 static int snd_inited;

libs/audio/targets/snd_sgi.c

@@ -42,7 +42,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/qtypes.h"
 #include "QF/sys.h"
 
-#include "snd_render.h"
+#include "snd_internal.h"
 
 static int  snd_inited = 0;
 static ALconfig alc;

libs/audio/targets/snd_sun.c

@@ -53,7 +53,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/qtypes.h"
 #include "QF/sys.h"
 
-#include "snd_render.h"
+#include "snd_internal.h"
 
 static int		audio_fd;
 static int		snd_inited;

libs/audio/targets/snd_win.c

@@ -39,7 +39,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/qargs.h"
 #include "QF/sys.h"
 
-#include "snd_render.h"
+#include "snd_internal.h"
 
 // 64K is > 1 second at 16-bit, 22050 Hz
 #define	WAV_BUFFERS				64

libs/video/renderer/gl/gl_mod_alias.c

@@ -62,7 +62,6 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "r_cvar.h"
 #include "r_dynamic.h"
 #include "r_local.h"
-#include "view.h"
 
 typedef struct {
 	vec3_t      normal;

libs/video/renderer/gl/gl_rmain.c

@@ -65,7 +65,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "r_dynamic.h"
 #include "r_local.h"
 #include "varrays.h"
-#include "view.h"
+#include "clview.h"		//FIXME
 
 entity_t    r_worldentity;
 

libs/video/renderer/gl/gl_screen.c

@@ -62,7 +62,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "r_local.h"
 #include "r_screen.h"
 #include "sbar.h"
-#include "view.h"
+#include "clview.h"	//FIXME
 
 /* SCREEN SHOTS */
 

libs/video/renderer/gl/gl_sky.c

@@ -55,7 +55,6 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "compat.h"
 #include "r_cvar.h"
 #include "r_shared.h"
-#include "view.h"
 
 const char *suf[6] = { "rt", "bk", "lf", "ft", "up", "dn" };
 int         solidskytexture;

libs/video/renderer/gl/gl_sky_clip.c

@@ -59,7 +59,6 @@ static __attribute__ ((used)) const char rcsid[] =
 
 #include "r_cvar.h"
 #include "r_shared.h"
-#include "view.h"
 
 #include "compat.h"
 

libs/video/renderer/sw/screen.c

@@ -56,7 +56,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "r_local.h"
 #include "r_screen.h"
 #include "sbar.h"
-#include "view.h"
+#include "clview.h"	//FIXME
 
 static void
 SCR_ApplyBlend (void)		// Used to be V_UpdatePalette

libs/video/renderer/sw/sw_rmain.c

@@ -56,7 +56,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "r_cvar.h"
 #include "r_dynamic.h"
 #include "r_local.h"
-#include "view.h"
+#include "clview.h"	//FIXME
 
 #ifdef PIC
 # undef USE_INTEL_ASM //XXX asm pic hack

libs/video/targets/vid.c

@@ -47,7 +47,6 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "QF/vid.h"
 
 #include "compat.h"
-#include "view.h"
 
 /* Software and hardware gamma support */
 VISIBLE byte		gammatable[256];

nq/source/cl_view.c

@@ -43,7 +43,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "compat.h"
 #include "host.h"
 #include "r_local.h"
-#include "view.h"
+#include "clview.h"
 
 /*
 	The view is allowed to move slightly from it's true position for bobbing,

nq/source/host.c

@@ -62,7 +62,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "sbar.h"
 #include "server.h"
 #include "sv_progs.h"
-#include "view.h"
+#include "clview.h"
 
 
 /*

nq/source/sv_ded.c

@@ -52,7 +52,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "r_dynamic.h"
 #include "sbar.h"
 #include "server.h"
-#include "view.h"
+#include "clview.h"	//FIXME
 
 client_state_t cl;
 client_static_t cls;

nq/source/sv_user.c

@@ -48,7 +48,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "host.h"
 #include "server.h"
 #include "sv_progs.h"
-#include "view.h"
+#include "clview.h"	//FIXME
 #include "world.h"
 
 extern cvar_t *cl_rollangle;	//FIXME

qw/source/cl_ents.c

@@ -60,7 +60,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "qw/pmove.h"
 #include "r_cvar.h"
 #include "r_dynamic.h"
-#include "view.h"
+#include "clview.h"
 
 static struct predicted_player {
 	int         flags;

qw/source/cl_input.c

@@ -57,7 +57,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "client.h"
 #include "compat.h"
 #include "host.h"
-#include "view.h"
+#include "clview.h"
 
 cvar_t     *cl_nodelta;
 cvar_t     *cl_maxnetfps;

qw/source/cl_main.c

@@ -112,7 +112,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "r_cvar.h"
 #include "r_dynamic.h"
 #include "sbar.h"
-#include "view.h"
+#include "clview.h"
 
 CLIENT_PLUGIN_PROTOS
 static plugin_list_t client_plugin_list[] = {

qw/source/cl_parse.c

@@ -79,7 +79,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "qw/pmove.h"
 #include "qw/protocol.h"
 #include "sbar.h"
-#include "view.h"
+#include "clview.h"
 
 const char *svc_strings[] = {
 	"svc_bad",

qw/source/cl_view.c

@@ -46,7 +46,7 @@ static __attribute__ ((used)) const char rcsid[] =
 #include "compat.h"
 #include "host.h"
 #include "qw/pmove.h"
-#include "view.h"
+#include "clview.h"
 
 /*
 	The view is allowed to move slightly from it's true position for bobbing,