Mercurial > hg > openttd
changeset 9581:9a3e1ee617ce draft
(svn r13618) -Codechange: move tar-specific declarations to separate file
Removes indirect dependency on <string> and <map> for over 40 files
author | smatz <smatz@openttd.org> |
---|---|
date | Tue, 24 Jun 2008 09:05:24 +0000 |
parents | 5ef52e2f0601 |
children | ba34409f63ae |
files | projects/openttd_vs80.vcproj projects/openttd_vs90.vcproj source.list src/fileio.cpp src/fileio.h src/newgrf_config.cpp src/settings_gui.cpp src/tar_type.h src/town_cmd.cpp |
diffstat | 9 files changed, 44 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -1456,6 +1456,10 @@ > </File> <File + RelativePath=".\..\src\tar_type.h" + > + </File> + <File RelativePath=".\..\src\terraform_gui.h" > </File>
--- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -1453,6 +1453,10 @@ > </File> <File + RelativePath=".\..\src\tar_type.h" + > + </File> + <File RelativePath=".\..\src\terraform_gui.h" > </File>
--- a/source.list +++ b/source.list @@ -289,6 +289,7 @@ string_type.h strings_func.h strings_type.h +tar_type.h terraform_gui.h textbuf_gui.h texteff.hpp
--- a/src/fileio.cpp +++ b/src/fileio.cpp @@ -11,6 +11,7 @@ #include "core/alloc_func.hpp" #include "core/math_func.hpp" #include "string_func.h" +#include "tar_type.h" #ifdef WIN32 #include <windows.h> #else
--- a/src/fileio.h +++ b/src/fileio.h @@ -5,8 +5,6 @@ #ifndef FILEIO_H #define FILEIO_H -#include <map> -#include <string> #include "core/enum_type.hpp" void FioSeekTo(size_t pos, int mode); @@ -63,22 +61,6 @@ extern const char *_searchpaths[NUM_SEARCHPATHS]; /** - * The define of a TarList. - */ -struct TarListEntry { - const char *filename; -}; -struct TarFileListEntry { - TarListEntry *tar; - size_t size; - size_t position; -}; -typedef std::map<std::string, TarListEntry *> TarList; -typedef std::map<std::string, TarFileListEntry> TarFileList; -extern TarList _tar_list; -extern TarFileList _tar_filelist; - -/** * Checks whether the given search path is a valid search path * @param sp the search path to check * @return true if the search path is valid @@ -90,10 +72,6 @@ /** Iterator for all the search paths */ #define FOR_ALL_SEARCHPATHS(sp) for (sp = SP_FIRST_DIR; sp < NUM_SEARCHPATHS; sp++) if (IsValidSearchPath(sp)) -#define FOR_ALL_TARS(tar) for (tar = _tar_filelist.begin(); tar != _tar_filelist.end(); tar++) - -typedef bool FioTarFileListCallback(const char *filename, int size, void *userdata); -FILE *FioTarFileList(const char *tar, const char *mode, size_t *filesize, FioTarFileListCallback *callback, void *userdata); void FioFCloseFile(FILE *f); FILE *FioFOpenFile(const char *filename, const char *mode = "rb", Subdirectory subdir = DATA_DIR, size_t *filesize = NULL);
--- a/src/newgrf_config.cpp +++ b/src/newgrf_config.cpp @@ -15,6 +15,7 @@ #include "gamelog.h" #include "network/network_type.h" +#include "tar_type.h" #include "fileio.h" #include "fios.h" #include <sys/stat.h>
--- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -27,6 +27,7 @@ #include "widgets/dropdown_type.h" #include "widgets/dropdown_func.h" #include "station_func.h" +#include <map> #include "table/sprites.h" #include "table/strings.h"
new file mode 100644 --- /dev/null +++ b/src/tar_type.h @@ -0,0 +1,31 @@ +/* $Id$ */ + +#ifndef TAR_TYPE_H + +/** @file tar_type.h Structs, typedefs and macros used for TAR file handling. */ + +#include <map> +#include <string> + +/** The define of a TarList. */ +struct TarListEntry { + const char *filename; +}; + +struct TarFileListEntry { + TarListEntry *tar; + size_t size; + size_t position; +}; + +typedef std::map<std::string, TarListEntry *> TarList; +typedef std::map<std::string, TarFileListEntry> TarFileList; +extern TarList _tar_list; +extern TarFileList _tar_filelist; + +#define FOR_ALL_TARS(tar) for (tar = _tar_filelist.begin(); tar != _tar_filelist.end(); tar++) + +typedef bool FioTarFileListCallback(const char *filename, int size, void *userdata); +FILE *FioTarFileList(const char *tar, const char *mode, size_t *filesize, FioTarFileListCallback *callback, void *userdata); + +#endif /* TAR_TYPE_H */