From da60a2a6315a24cdd932e9a8ca9fed79a26d05fd Mon Sep 17 00:00:00 2001 From: dhewg Date: Sun, 18 Dec 2011 17:20:00 +0100 Subject: [PATCH] Adapt structs for easy forward declarations Get rid of the tag namespace. --- neo/framework/Console.h | 2 +- neo/framework/FileSystem.h | 6 +++--- neo/sys/sys_public.h | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/neo/framework/Console.h b/neo/framework/Console.h index 81aee957..8f183519 100644 --- a/neo/framework/Console.h +++ b/neo/framework/Console.h @@ -52,7 +52,7 @@ public: // can't be combined with Init, because Init happens before renderer is started virtual void LoadGraphics() = 0; - virtual bool ProcessEvent( const struct sysEvent_s *event, bool forceAccept ) = 0; + virtual bool ProcessEvent( const sysEvent_t *event, bool forceAccept ) = 0; // the system code can release the mouse pointer when the console is active virtual bool Active( void ) = 0; diff --git a/neo/framework/FileSystem.h b/neo/framework/FileSystem.h index 48466a5d..d00ed858 100644 --- a/neo/framework/FileSystem.h +++ b/neo/framework/FileSystem.h @@ -109,14 +109,14 @@ typedef struct fileDownload_s { void * buffer; } fileDownload_t; -typedef struct backgroundDownload_s { - struct backgroundDownload_s *next; // set by the fileSystem +struct backgroundDownload_t { + backgroundDownload_t *next; // set by the fileSystem dlType_t opcode; idFile * f; fileDownload_t file; urlDownload_t url; volatile bool completed; -} backgroundDownload_t; +}; // file list for directory listings class idFileList { diff --git a/neo/sys/sys_public.h b/neo/sys/sys_public.h index 2c844d7d..6813baee 100644 --- a/neo/sys/sys_public.h +++ b/neo/sys/sys_public.h @@ -102,15 +102,15 @@ typedef enum { M_DELTAZ } sys_mEvents; -typedef struct sysEvent_s { +struct sysEvent_t { sysEventType_t evType; int evValue; int evValue2; int evPtrLength; // bytes of data pointed to by evPtr, for journaling void * evPtr; // this must be manually freed if not NULL -} sysEvent_t; +}; -typedef struct sysMemoryStats_s { +struct sysMemoryStats_t { int memoryLoad; int totalPhysical; int availPhysical; @@ -119,7 +119,7 @@ typedef struct sysMemoryStats_s { int totalVirtual; int availVirtual; int availExtendedVirtual; -} sysMemoryStats_t; +}; template class idList; // for Sys_ListFiles