scripted fixups for the QF include move

include/QF/checksum.h

@@ -29,7 +29,7 @@
 #ifndef __checksum_h
 #define __checksum_h
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 unsigned int Com_BlockChecksum (void *buffer, int length);
 void Com_BlockFullChecksum (void *buffer, int len, unsigned char *outbuf);

include/QF/cmd.h

@@ -29,7 +29,7 @@
 #ifndef __cmd_h
 #define __cmd_h
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 //===========================================================================
 

include/QF/console.h

@@ -32,8 +32,8 @@
 // console
 //
 
-#include "qtypes.h"
-#include "gcc_attr.h"
+#include "QF/qtypes.h"
+#include "QF/gcc_attr.h"
 
 #define		CON_TEXTSIZE	16384
 typedef struct

include/QF/crc.h

@@ -29,7 +29,7 @@
 #ifndef __crc_h
 #define __crc_h
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 void CRC_Init(unsigned short *crcvalue);
 void CRC_ProcessByte(unsigned short *crcvalue, byte data);

include/QF/cvar.h

@@ -29,8 +29,8 @@
 #ifndef __cvar_h
 #define __cvar_h
 
-#include "qtypes.h"
-#include "quakeio.h"
+#include "QF/qtypes.h"
+#include "QF/quakeio.h"
 
 typedef struct cvar_s
 {

include/QF/keys.h

@@ -30,7 +30,7 @@
 #ifndef _KEYS_H
 #define _KEYS_H
 
-#include "quakeio.h"
+#include "QF/quakeio.h"
 
 // these are the key numbers that should be passed to Key_Event
 

include/QF/mathlib.h

@@ -30,7 +30,7 @@
 #define __mathlib_h
 
 #include <math.h>
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 #ifndef M_PI
 # define M_PI	    3.14159265358979323846  // matches value in gcc v2 math.h

include/QF/mdfour.h

@@ -30,7 +30,7 @@
 #ifndef __mdfour_h
 #define __mdfour_h
 
-#include "uint32.h"
+#include "QF/uint32.h"
 
 #define MDFOUR_DIGEST_BYTES 16
 

include/QF/msg.h

@@ -28,7 +28,7 @@
 #ifndef _MSG_H
 #define _MSG_H
 
-#include "sizebuf.h"
+#include "QF/sizebuf.h"
 
 void MSG_WriteChar (sizebuf_t *sb, int c);
 void MSG_WriteByte (sizebuf_t *sb, int c);

include/QF/pr_comp.h

@@ -31,7 +31,7 @@
 #ifndef _PR_COMP_H
 #define _PR_COMP_H
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 typedef enum {
 	ev_void,

include/QF/progs.h

@@ -29,9 +29,9 @@
 #ifndef _PROGS_H
 #define _PROGS_H
 
-#include "link.h"
-#include "quakeio.h"
-#include "pr_comp.h"
+#include "QF/link.h"
+#include "QF/quakeio.h"
+#include "QF/pr_comp.h"
 
 typedef union eval_s
 {

include/QF/qargs.h

@@ -31,7 +31,7 @@
 #ifndef __qargs_h
 #define __qargs_h
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 extern	int		com_argc;
 extern	char	**com_argv;

include/QF/qendian.h

@@ -31,7 +31,7 @@
 #ifndef __qendian_h
 #define __qendian_h
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 #ifndef NULL
 # define NULL ((void *)0)

include/QF/qfplist.h

@@ -29,7 +29,7 @@
 #ifndef __qfplist_h_
 #define __qfplist_h_
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 //	Ugly defines for fast checking and conversion from char to number
 #define inrange(ch,min,max) ((ch) >= (min) && (ch) <= (max))

include/QF/qtypes.h

@@ -34,8 +34,8 @@
 #include <stdio.h>
 #include <sys/types.h>
 
-#include "qdefs.h"
-#include "compat.h"
+#include "QF/qdefs.h"
+#include "QF/compat.h"
 
 #define MAX_QPATH	64
 

include/QF/quakefs.h

@@ -31,9 +31,9 @@
 #ifndef __quakefs_h
 #define __quakefs_h
 
-#include "qtypes.h"
-#include "quakeio.h"
-#include "cvar.h"
+#include "QF/qtypes.h"
+#include "QF/quakeio.h"
+#include "QF/cvar.h"
 
 //============================================================================
 

include/QF/quakeio.h

@@ -40,7 +40,7 @@
 # include <zlib.h>
 #endif
 
-#include "gcc_attr.h"
+#include "QF/gcc_attr.h"
 
 typedef struct {
 	FILE *file;

include/QF/sizebuf.h

@@ -28,7 +28,7 @@
 #ifndef __sizebuf_h
 #define __sizebuf_h
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 typedef struct sizebuf_s
 {

include/QF/sys.h

@@ -29,7 +29,7 @@
 #ifndef __sys_h
 #define __sys_h
 
-#include "gcc_attr.h"
+#include "QF/gcc_attr.h"
 
 //
 // file IO

include/QF/va.h

@@ -34,7 +34,7 @@
 # include "config.h"
 #endif
 
-#include "gcc_attr.h"
+#include "QF/gcc_attr.h"
 
 char	*va(char *format, ...) __attribute__((format(printf,1,2)));
 // does a varargs printf into a temp buffer

nq/include/modelgen.h

@@ -44,7 +44,7 @@
 #include "scriplib.h"
 #include "trilib.h"
 #include "lbmlib.h"
-#include "mathlib.h"
+#include "QF/mathlib.h"
 
 #endif
 

nq/include/spritegn.h

@@ -60,7 +60,7 @@
 #include "dictlib.h"
 #include "trilib.h"
 #include "lbmlib.h"
-#include "mathlib.h"
+#include "QF/mathlib.h"
 
 #endif
 

nq/source/d_vars.c

@@ -32,7 +32,7 @@
 
 #ifndef	USE_INTEL_ASM
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 // all global and static refresh variables are collected in a contiguous block
 // to avoid cache conflicts.

nq/source/in_win.c

@@ -39,10 +39,10 @@
 #include "winquake.h"
 #include <dinput.h>
 #include "client.h"
-#include "keys.h"
-#include "console.h"
-#include "qargs.h"
-#include "cmd.h"
+#include "QF/keys.h"
+#include "QF/console.h"
+#include "QF/qargs.h"
+#include "QF/cmd.h"
 #include "input.h"
 //#include "dosisms.h"
 

nq/source/joy_null.c

@@ -30,10 +30,10 @@
 # include "config.h"
 #endif
 
-#include "console.h"
-#include "cvar.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
 #include "protocol.h"
-#include "qtypes.h"
+#include "QF/qtypes.h"
 #include "client.h"
 
 // Joystick variables and structures

nq/source/net_ser.c

@@ -33,7 +33,7 @@
 
 #include "net_ser.h"
 #include "dosisms.h"
-#include "crc.h"
+#include "QF/crc.h"
 
 #include "net_comx.c"
 

nq/source/sv_ded.c

@@ -33,9 +33,9 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "cvar.h"
-#include "host.h"
-#include "keys.h"
+#include "QF/cvar.h"
+#include "QF/host.h"
+#include "QF/keys.h"
 #include "client.h"
 
 int         m_return_state;

nq/source/sys_unixd.c

@@ -50,10 +50,10 @@
 #include <time.h>
 
 #include "client.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "host.h"
-#include "qtypes.h"
-#include "qargs.h"
+#include "QF/qtypes.h"
+#include "QF/qargs.h"
 
 qboolean    isDedicated;
 

nq/source/vid_mgl.c

@@ -33,22 +33,22 @@
 #include <stdlib.h>
 
 #include "quakedef.h"
-#include "va.h"
+#include "QF/va.h"
 #include "winquake.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "d_local.h"
 #include "resource.h"
 #include "in_win.h"
-#include "keys.h"
+#include "QF/keys.h"
 #include "screen.h"
 #include "wad.h"
-#include "cmd.h"
-#include "qendian.h"
+#include "QF/cmd.h"
+#include "QF/qendian.h"
 #include "draw.h"
-#include "console.h"
+#include "QF/console.h"
 #include "sound.h"
 #include "cdaudio.h"
-#include "qargs.h"
+#include "QF/qargs.h"
 
 #define	MINIMUM_MEMORY	0x550000
 

nq/source/vid_wgl.c

@@ -31,21 +31,21 @@
 # include "config.h"
 #endif
 #include "quakedef.h"
-#include "va.h"
+#include "QF/va.h"
 #include "winquake.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "resource.h"
 #include "glquake.h"
 #include "in_win.h"
 #include <commctrl.h>
 #include "screen.h"
-#include "keys.h"
-#include "qargs.h"
-#include "cmd.h"
-#include "qendian.h"
+#include "QF/keys.h"
+#include "QF/qargs.h"
+#include "QF/cmd.h"
+#include "QF/qendian.h"
 #include "draw.h"
 #include "cdaudio.h"
-#include "console.h"
+#include "QF/console.h"
 #include "sbar.h"
 
 extern void (*vid_menudrawfn) (void);

qw/include/hl.h

@@ -30,7 +30,7 @@
 #ifndef _HL_BSP_H
 #define _HL_BSP_H
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 extern void CL_ParseEntityLump(char *entdata);
 extern void HL_Mod_LoadLighting (lump_t *l);

qw/include/winquake.h

@@ -43,7 +43,7 @@
 # include <mgraph.h>
 #endif
 
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 #ifndef WM_MOUSEWHEEL
 # define WM_MOUSEWHEEL                   0x020A

qw/source/cd_sdl.c

@@ -41,9 +41,9 @@
 #include <SDL.h>
 
 #include "cdaudio.h"
-#include "cmd.h"
-#include "console.h"
-#include "qargs.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/qargs.h"
 #include "sound.h"
 
 static qboolean cdValid = false;

qw/source/cd_sgi.c

@@ -36,9 +36,9 @@
 #include <dmedia/cdaudio.h>
 
 #include "cdaudio.h"
-#include "cmd.h"
-#include "console.h"
-#include "qargs.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/qargs.h"
 #include "sound.h"
 
 static qboolean initialized = false;

qw/source/cd_win.c

@@ -33,10 +33,10 @@
 #include <windows.h>
 
 #include "cdaudio.h"
-#include "cmd.h"
-#include "console.h"
-#include "cvar.h"
-#include "qargs.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
+#include "QF/qargs.h"
 #include "sound.h"
 
 extern HWND mainwindow;

qw/source/cl_sys_sdl.c

@@ -56,9 +56,9 @@
 #include <SDL.H>
 #include <SDL_main.H>
 
-#include "sys.h"
-#include "qargs.h"
-#include "qargs.h"
+#include "QF/sys.h"
+#include "QF/qargs.h"
+#include "QF/qargs.h"
 #include "client.h"
 #include "host.h"
 

qw/source/cl_sys_win.c

@@ -39,13 +39,13 @@
 #include <windows.h>
 
 #include "client.h"
-#include "console.h"
+#include "QF/console.h"
 #include "host.h"
-#include "qargs.h"
+#include "QF/qargs.h"
 #include "resource.h"
 #include "screen.h"
 #include "sound.h"
-#include "sys.h"
+#include "QF/sys.h"
 #include "vid.h"
 
 qboolean    is_server = false;

qw/source/in_fbdev.c

@@ -38,8 +38,8 @@
 #include <sys/ioctl.h>
 
 #include "protocol.h"
-#include "cvar.h"
-#include "keys.h"
+#include "QF/cvar.h"
+#include "QF/keys.h"
 
 cvar_t		*_windowed_mouse;
 

qw/source/in_win.c

@@ -35,10 +35,10 @@
 #include "winquake.h"
 #include <dinput.h>
 #include "client.h"
-#include "keys.h"
-#include "console.h"
-#include "qargs.h"
-#include "cmd.h"
+#include "QF/keys.h"
+#include "QF/console.h"
+#include "QF/qargs.h"
+#include "QF/cmd.h"
 #include "input.h"
 #include "cl_input.h"
 #include "view.h"

qw/source/joy_null.c

@@ -30,10 +30,10 @@
 # include "config.h"
 #endif
 
-#include "console.h"
-#include "cvar.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
 #include "protocol.h"
-#include "qtypes.h"
+#include "QF/qtypes.h"
 
 // Joystick variables and structures
 cvar_t     *joy_device;					// Joystick device name

qw/source/joy_win.c

@@ -42,14 +42,14 @@
 
 #include "cl_input.h"
 #include "client.h"
-#include "cmd.h"
-#include "console.h"
-#include "cvar.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
 #include "host.h"
 #include "input.h"
-#include "keys.h"
+#include "QF/keys.h"
 #include "protocol.h"
-#include "qargs.h"
+#include "QF/qargs.h"
 #include "view.h"
 
 // Joystick variables and structures

qw/source/net_packetlog.c

@@ -38,12 +38,12 @@
 #include <ctype.h>
 #include <stdarg.h>
 
-#include "msg.h"
+#include "QF/msg.h"
 #include "net.h"
 #include "protocol.h"
-#include "quakefs.h"
+#include "QF/quakefs.h"
 #include "server.h"
-#include "va.h"
+#include "QF/va.h"
 
 cvar_t     *netlogger;
 cvar_t     *netloglevel;

qw/source/net_udp6.c

@@ -93,12 +93,12 @@
 # include <libc.h>
 #endif
 
-#include "console.h"
-#include "msg.h"
+#include "QF/console.h"
+#include "QF/msg.h"
 #include "net.h"
-#include "qargs.h"
-#include "qtypes.h"
-#include "sys.h"
+#include "QF/qargs.h"
+#include "QF/qtypes.h"
+#include "QF/sys.h"
 
 #ifndef MAXHOSTNAMELEN
 # define MAXHOSTNAMELEN	512

qw/source/sv_sys_win.c

@@ -35,10 +35,10 @@
 #include <winsock.h>
 #include <conio.h>
 
-#include "qargs.h"
-#include "cvar.h"
+#include "QF/qargs.h"
+#include "QF/cvar.h"
 #include "server.h"
-#include "sys.h"
+#include "QF/sys.h"
 
 
 qboolean    is_server = true;

qw/source/vid_fbdev.c

@@ -57,15 +57,15 @@
 #include <linux/kd.h>
 #include <linux/vt.h>
 
-#include "cmd.h"
-#include "console.h"
-#include "cvar.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
+#include "QF/cvar.h"
 #include "d_local.h"
 #include "host.h"
 #include "input.h"
-#include "qargs.h"
-#include "qendian.h"
-#include "sys.h"
+#include "QF/qargs.h"
+#include "QF/qendian.h"
+#include "QF/sys.h"
 
 #include "fbset.h"
 

qw/source/vid_mgl.c

@@ -33,20 +33,20 @@
 #include <stdlib.h>
 
 #include "cdaudio.h"
-#include "cmd.h"
-#include "console.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
 #include "d_local.h"
 #include "draw.h"
 #include "host.h"
 #include "in_win.h"
-#include "keys.h"
-#include "qargs.h"
-#include "qendian.h"
+#include "QF/keys.h"
+#include "QF/qargs.h"
+#include "QF/qendian.h"
 #include "resource.h"
 #include "screen.h"
 #include "sound.h"
-#include "sys.h"
-#include "va.h"
+#include "QF/sys.h"
+#include "QF/va.h"
 #include "wad.h"
 #include "winquake.h"
 

qw/source/vid_wgl.c

@@ -31,21 +31,21 @@
 #endif
 
 #include "cdaudio.h"
-#include "cmd.h"
-#include "console.h"
+#include "QF/cmd.h"
+#include "QF/console.h"
 #include "draw.h"
 #include "glquake.h"
 #include "host.h"
 #include "in_win.h"
-#include "keys.h"
-#include "qargs.h"
-#include "qendian.h"
+#include "QF/keys.h"
+#include "QF/qargs.h"
+#include "QF/qendian.h"
 #include "resource.h"
 #include "sbar.h"
 #include "screen.h"
 #include "sound.h"
-#include "sys.h"
-#include "va.h"
+#include "QF/sys.h"
+#include "QF/va.h"
 #include "winquake.h"
 
 extern void (*vid_menudrawfn) (void);