Cayleb-Ordo/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

refactor headers: path_util -> path, native_path -> os_path, remove where unnecessary

Browse Source 
This was SVN commit r9108.
This commit is contained in:
janwas 2011-03-23 14:43:35 +00:00
parent dcd192cb60
commit 64a02932e3
58 changed files with 38 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/graphics/TerrainTextureEntry.cpp
View File

@ -21,7 +21,6 @@
#include "lib/utf8.h"
#include "lib/ogl.h"
#include "lib/path_util.h"
#include "lib/res/graphics/ogl_tex.h"
#include "TerrainTextureEntry.h"

1
source/graphics/tests/test_TextureManager.h
View File

@ -19,7 +19,6 @@
#include "graphics/TextureManager.h"
#include "lib/external_libraries/sdl.h"
#include "lib/path_util.h"
#include "lib/file/vfs/vfs.h"
#include "lib/res/h_mgr.h"
#include "lib/tex/tex.h"

1
source/lib/app_hooks.cpp
View File

@ -27,7 +27,6 @@
#include "precompiled.h"
#include "lib/app_hooks.h"
#include "lib/path_util.h"
#include "lib/sysdep/sysdep.h"
#include <cstdio>

2
source/lib/app_hooks.h
View File

@ -91,7 +91,7 @@ extern const wchar_t*, translate, (const wchar_t* text), (text), return)
#ifndef INCLUDED_APP_HOOKS
#define INCLUDED_APP_HOOKS
#include "lib/native_path.h"
#include "lib/os_path.h"
// trampolines for user code to call the hooks. they encapsulate
// the details of how exactly to do this.

1
source/lib/debug.cpp
View File

@ -32,7 +32,6 @@
#include <cstdio>
#include "lib/app_hooks.h"
#include "lib/path_util.h"
#include "lib/allocators/allocators.h" // page_aligned_alloc
#include "lib/fnv_hash.h"
#include "lib/sysdep/cpu.h" // cpu_CAS

1
source/lib/external_libraries/dbghelp.cpp
View File

@ -24,7 +24,6 @@
#if OS_WIN
#include "lib/path_util.h"
#include "lib/sysdep/os/win/wutil.h"
#include "lib/external_libraries/dbghelp.h"

2
source/lib/file/common/file_loader.h
View File

@ -23,7 +23,7 @@
#ifndef INCLUDED_FILE_LOADER
#define INCLUDED_FILE_LOADER
#include "lib/native_path.h"
#include "lib/os_path.h"
struct IFileLoader
{

2
source/lib/file/common/trace.h
View File

@ -35,7 +35,7 @@
#ifndef INCLUDED_TRACE
#define INCLUDED_TRACE
#include "lib/native_path.h"
#include "lib/os_path.h"
// stores information about an IO event.
class TraceEntry

2
source/lib/file/file.cpp
View File

@ -27,7 +27,7 @@
#include "precompiled.h"
#include "lib/file/file.h"
#include "lib/posix/posix_filesystem.h"
#include "lib/sysdep/filesystem.h" // O_*, S_*
#include "lib/posix/posix_aio.h"
#include "lib/file/common/file_stats.h"

2
source/lib/file/file.h
View File

@ -29,7 +29,7 @@
struct aiocb;
#include "lib/native_path.h"
#include "lib/os_path.h"
namespace ERR
{

4
source/lib/file/file_system.cpp
View File

@ -27,9 +27,7 @@
#include <algorithm>
#include <string>
#include "lib/path_util.h"
#include "lib/posix/posix_filesystem.h"
#include "lib/sysdep/filesystem.h"
struct DirDeleter
{

4
source/lib/file/file_system.h
View File

@ -23,8 +23,8 @@
#ifndef INCLUDED_FILE_SYSTEM
#define INCLUDED_FILE_SYSTEM
#include "lib/native_path.h"
#include "lib/posix/posix_filesystem.h"
#include "lib/os_path.h"
#include "lib/posix/posix_filesystem.h" // mode_t
// (bundling size and mtime avoids a second expensive call to stat())
class FileInfo

2
source/lib/file/file_system_util.h
View File

@ -27,7 +27,7 @@
#ifndef INCLUDED_FILE_SYSTEM_UTIL
#define INCLUDED_FILE_SYSTEM_UTIL
#include "lib/native_path.h"
#include "lib/os_path.h"
#include "lib/file/vfs/vfs.h"
namespace fs_util {

2
source/lib/file/io/block_cache.h
View File

@ -27,7 +27,7 @@
#ifndef INCLUDED_BLOCK_CACHE
#define INCLUDED_BLOCK_CACHE
#include "lib/native_path.h"
#include "lib/os_path.h"
/**
* ID that uniquely identifies a block within a file

2
source/lib/file/vfs/vfs_path.h
View File

@ -23,7 +23,7 @@
#ifndef INCLUDED_VFS_PATH
#define INCLUDED_VFS_PATH
#include "lib/path_util.h"
#include "lib/path.h"
/**
* VFS path of the form "(dir/)*file?"

1
source/lib/file/vfs/vfs_populate.cpp
View File

@ -27,7 +27,6 @@
#include "precompiled.h"
#include "lib/file/vfs/vfs_populate.h"
#include "lib/path_util.h"
#include "lib/file/archive/archive_zip.h"
#include "lib/file/vfs/vfs_tree.h"
#include "lib/file/vfs/vfs_lookup.h"

8
source/lib/native_path.h → source/lib/os_path.h
View File

@ -20,10 +20,10 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#ifndef INCLUDED_NATIVE_PATH
#define INCLUDED_NATIVE_PATH
#ifndef INCLUDED_OS_PATH
#define INCLUDED_OS_PATH
#include "lib/path_util.h"
#include "lib/path.h"
// rationale:
// users are responsible for ensuring the path doesn't contain any forbidden
@ -53,4 +53,4 @@ static inline std::string OsString(const OsPath& path)
#endif
#endif // #ifndef INCLUDED_NATIVE_PATH
#endif // #ifndef INCLUDED_OS_PATH

2
source/lib/path_util.cpp → source/lib/path.cpp
View File

@ -25,7 +25,7 @@
*/
#include "precompiled.h"
#include "lib/path_util.h"
#include "lib/path.h"
#include <cstring>
#include <cerrno>

8
source/lib/path_util.h → source/lib/path.h
View File

@ -21,7 +21,7 @@
*/
/*
* helper functions for path strings.
* Path string class, similar to boost::filesystem::basic_path.
*/
// notes:
@ -34,8 +34,8 @@
// native and VFS paths.
// when reading, both '/' and SYS_DIR_SEP are accepted; '/' is written.
#ifndef INCLUDED_PATH_UTIL
#define INCLUDED_PATH_UTIL
#ifndef INCLUDED_PATH
#define INCLUDED_PATH
#if CONFIG_ENABLE_BOOST
# include "boost/functional/hash.hpp"
@ -221,4 +221,4 @@ struct hash<Path> : std::unary_function<Path, std::size_t>
#endif // #if CONFIG_ENABLE_BOOST
#endif // #ifndef INCLUDED_PATH_UTIL
#endif // #ifndef INCLUDED_PATH

2
source/lib/posix/posix_filesystem.h
View File

@ -31,5 +31,3 @@
#endif
#include "lib/posix/posix_errno.h" // for user convenience
#include "lib/sysdep/filesystem.h" // wchar_t API

1
source/lib/res/graphics/cursor.cpp
View File

@ -32,7 +32,6 @@
#include <sstream>
#include "lib/ogl.h"
#include "lib/path_util.h"
#include "lib/sysdep/cursor.h"
#include "ogl_tex.h"
#include "lib/res/h_mgr.h"

1
source/lib/res/graphics/unifont.cpp
View File

@ -33,7 +33,6 @@
#include <map>
#include "ogl_tex.h"
#include "lib/path_util.h"
#include "lib/res/h_mgr.h"
struct GlyphData

1
source/lib/res/sound/snd_mgr.cpp
View File

@ -37,7 +37,6 @@
#include <cstdio>
#include <cfloat>
#include "lib/path_util.h"
#include "lib/res/h_mgr.h"
#include "lib/file/vfs/vfs.h"

2
source/lib/self_test.h
View File

@ -183,7 +183,7 @@ extern bool self_test_active;
// for convenience, to avoid having to include all of these manually
#include "lib/lib_errors.h"
#include "lib/native_path.h"
#include "lib/os_path.h"
#include "lib/posix/posix.h"
#define CXXTEST_HAVE_EH

2
source/lib/sysdep/dir_watch.h
View File

@ -27,7 +27,7 @@
#ifndef INCLUDED_DIR_WATCH
#define INCLUDED_DIR_WATCH
#include "lib/native_path.h"
#include "lib/os_path.h"
struct DirWatch;
typedef shared_ptr<DirWatch> PDirWatch;

2
source/lib/sysdep/filesystem.h
View File

@ -27,7 +27,7 @@
#ifndef INCLUDED_FILESYSTEM
#define INCLUDED_FILESYSTEM
#include "lib/native_path.h"
#include "lib/os_path.h"
#include "lib/posix/posix_filesystem.h" // mode_t

1
source/lib/sysdep/os/linux/dir_watch_fam.cpp
View File

@ -25,7 +25,6 @@
#include <string>
#include "lib/sysdep/sysdep.h"
#include "lib/path_util.h"
#include "lib/sysdep/dir_watch.h"
#include "ps/CLogger.h"

4
source/lib/sysdep/os/unix/ufilesystem.cpp
View File

@ -25,9 +25,9 @@
*/
#include "precompiled.h"
#include "lib/posix/posix_filesystem.h"
#include "lib/sysdep/filesystem.h"
#include "lib/path_util.h"
#include "lib/path.h"
#include <cstdio>

1
source/lib/sysdep/os/win/mahaf.cpp
View File

@ -27,7 +27,6 @@
#include "precompiled.h"
#include "lib/sysdep/os/win/mahaf.h"
#include "lib/path_util.h"
#include "lib/module_init.h"
#include "lib/sysdep/os/win/wutil.h"

1
source/lib/sysdep/os/win/wdbg_sym.cpp
View File

@ -36,7 +36,6 @@
#include "lib/sysdep/cpu.h"
#include "lib/debug_stl.h"
#include "lib/app_hooks.h"
#include "lib/path_util.h"
#if ARCH_IA32
# include "lib/sysdep/arch/ia32/ia32.h"
# include "lib/sysdep/arch/ia32/ia32_asm.h"

2
source/lib/sysdep/os/win/wdir_watch.cpp
View File

@ -28,7 +28,7 @@
#include "lib/sysdep/dir_watch.h"
#include "lib/allocators/shared_ptr.h"
#include "lib/path_util.h" // path_is_subpath
#include "lib/path.h" // path_is_subpath
#include "lib/sysdep/os/win/win.h"
#include "lib/sysdep/os/win/winit.h"
#include "lib/sysdep/os/win/wutil.h"

1
source/lib/sysdep/os/win/wdll_ver.cpp
View File

@ -30,7 +30,6 @@
#include <stdio.h>
#include <stdlib.h>
#include "lib/path_util.h"
#include "lib/sysdep/os/win/win.h"
#include "lib/sysdep/os/win/wutil.h"

2
source/lib/sysdep/os/win/wdll_ver.h
View File

@ -27,7 +27,7 @@
#ifndef INCLUDED_WDLL_VER
#define INCLUDED_WDLL_VER
#include "lib/native_path.h"
#include "lib/os_path.h"
typedef std::wstring VersionList;

6
source/lib/sysdep/os/win/wposix/waio.cpp
View File

@ -30,13 +30,11 @@
#include <map>
#include "lib/sysdep/os/win/wposix/crt_posix.h" // correct definitions of _open() etc.
#include "lib/posix/posix_filesystem.h"
#include "lib/sysdep/filesystem.h" // O_NO_AIO_NP
#include "lib/bits.h" // IsAligned
#include "lib/sysdep/os/win/wposix/wposix_internal.h"
#include "lib/sysdep/os/win/wposix/wfilesystem.h" // mode_t
#include "lib/sysdep/os/win/wposix/wtime.h" // timespec
#include "lib/sysdep/cpu.h"
#include "lib/bits.h"
WINIT_REGISTER_MAIN_INIT(waio_Init);

2
source/lib/sysdep/os/win/wposix/waio.h
View File

@ -28,7 +28,7 @@
#define INCLUDED_WAIO
#include "lib/lib_errors.h"
#include "lib/native_path.h"
#include "lib/os_path.h"
#include "lib/sysdep/os/win/wposix/wposix_types.h"
#include "lib/sysdep/os/win/wposix/no_crt_posix.h"

2
source/lib/sysdep/os/win/wposix/wdlfcn.cpp
View File

@ -23,8 +23,6 @@
#include "precompiled.h"
#include "lib/sysdep/os/win/wposix/wdlfcn.h"
#include "lib/utf8.h"
#include "lib/path_util.h"
#include "lib/sysdep/os/win/wposix/wposix_internal.h"

2
source/lib/sysdep/os/win/wposix/wfilesystem.cpp
View File

@ -21,7 +21,7 @@
*/
#include "precompiled.h"
#include "lib/posix/posix_filesystem.h" // includes wfilesystem.h
#include "lib/sysdep/filesystem.h"
#include "lib/allocators/allocators.h" // single_calloc
#include "lib/sysdep/os/win/wposix/wposix_internal.h"

1
source/lib/sysdep/os/win/wsdl.cpp
View File

@ -39,7 +39,6 @@
#include <WindowsX.h> // message crackers
#include "lib/module_init.h"
#include "lib/path_util.h"
#include "lib/posix/posix_pthread.h"
#include "lib/sysdep/os/win/wutil.h"
#include "lib/sysdep/os/win/winit.h"

1
source/lib/sysdep/os/win/wsnd.cpp
View File

@ -32,7 +32,6 @@
#include <string>
#include <set>
#include "lib/path_util.h"
#include "lib/file/file_system.h"
#include "lib/sysdep/os/win/wdll_ver.h"
#include "lib/sysdep/os/win/wversion.h"

1
source/lib/sysdep/os/win/wutil.cpp
View File

@ -30,7 +30,6 @@
#include <stdio.h>
#include <stdlib.h> // __argc
#include "lib/path_util.h"
#include "lib/file/file.h"
#include "lib/file/vfs/vfs.h"
#include "lib/posix/posix.h"

2
source/lib/sysdep/os/win/wutil.h
View File

@ -27,7 +27,7 @@
#ifndef INCLUDED_WUTIL
#define INCLUDED_WUTIL
#include "lib/native_path.h"
#include "lib/os_path.h"
#include "lib/sysdep/os/win/win.h"
template<typename H>

2
source/lib/sysdep/sysdep.h
View File

@ -28,7 +28,7 @@
#define INCLUDED_SYSDEP
#include "lib/debug.h" // ErrorReactionInternal
#include "lib/native_path.h"
#include "lib/os_path.h"
#include <cstdarg> // needed for sys_vswprintf

1
source/lib/sysdep/tests/test_sysdep.h
View File

@ -23,7 +23,6 @@
#include "lib/self_test.h"
#include "lib/lib.h"
#include "lib/path_util.h"
#include "lib/secure_crt.h"
#include "lib/utf8.h"
#include "lib/sysdep/cpu.h"

2
source/lib/tests/test_path_util.h
View File

@ -23,7 +23,7 @@
#include "lib/lib.h"
#include "lib/self_test.h"
#include "lib/path_util.h"
#include "lib/path.h"
// Macros, not functions, to get proper line number reports when tests fail

1
source/lib/tex/tex.cpp
View File

@ -33,7 +33,6 @@
#include "lib/timer.h"
#include "lib/bits.h"
#include "lib/path_util.h"
#include "lib/sysdep/cpu.h"
#include "tex_codec.h"

2
source/lib/tex/tex.h
View File

@ -105,7 +105,7 @@ library and IO layer. Read and write are zero-copy.
#define INCLUDED_TEX
#include "lib/res/handle.h"
#include "lib/native_path.h"
#include "lib/os_path.h"
#include "lib/file/vfs/vfs_path.h"
#include "lib/allocators/dynarray.h"

1
source/lib/tex/tex_codec.cpp
View File

@ -31,7 +31,6 @@
#include <stdlib.h>
#include "lib/allocators/shared_ptr.h" // ArrayDeleter
#include "lib/path_util.h"
#include "tex.h"
static const TexCodecVTbl* codecs;

1
source/network/NetTurnManager.cpp
View File

@ -23,7 +23,6 @@
#include "network/NetClient.h"
#include "network/NetMessage.h"
#include "lib/path_util.h"
#include "gui/GUIManager.h"
#include "maths/MathUtil.h"
#include "ps/Profile.h"

1
source/ps/ArchiveBuilder.cpp
View File

@ -20,7 +20,6 @@
#include "ArchiveBuilder.h"
#include "graphics/TextureManager.h"
#include "lib/path_util.h"
#include "lib/tex/tex_codec.h"
#include "lib/file/archive/archive_zip.h"
#include "ps/XML/Xeromyces.h"

1
source/ps/CLogger.cpp
View File

@ -21,7 +21,6 @@
#include "CConsole.h"
#include "ConfigDB.h"
#include "lib/ogl.h"
#include "lib/path_util.h"
#include "lib/timer.h"
#include "lib/utf8.h"
#include "lib/res/graphics/unifont.h"

1
source/ps/CacheLoader.cpp
View File

@ -19,7 +19,6 @@
#include "CacheLoader.h"
#include "lib/path_util.h"
#include "ps/CLogger.h"
#include "maths/MD5.h"

1
source/ps/Filesystem.h
View File

@ -18,7 +18,6 @@
#ifndef INCLUDED_PS_FILESYSTEM
#define INCLUDED_PS_FILESYSTEM
#include "lib/path_util.h"
#include "lib/file/file.h"
#include "lib/file/io/io.h"
#include "lib/file/vfs/vfs.h"

2
source/ps/GameSetup/Paths.cpp
View File

@ -18,9 +18,9 @@
#include "precompiled.h"
#include "Paths.h"
#include "lib/path_util.h"
#include "lib/file/file_system_util.h"
#include "lib/sysdep/sysdep.h" // sys_get_executable_name
#include "lib/sysdep/filesystem.h" // wrealpath
#if OS_WIN
# include "lib/sysdep/os/win/wutil.h" // wutil_AppdataPath
#endif

2
source/ps/GameSetup/Paths.h
View File

@ -18,7 +18,7 @@
#ifndef INCLUDED_PS_GAMESETUP_PATHS
#define INCLUDED_PS_GAMESETUP_PATHS
#include "lib/native_path.h"
#include "lib/os_path.h"
#include "CmdLineArgs.h"
class Paths

1
source/ps/Pyrogenesis.cpp
View File

@ -22,7 +22,6 @@
#include "Pyrogenesis.h"
#include "lib/sysdep/sysdep.h"
#include "lib/path_util.h"
#include "lib/svn_revision.h"
static const wchar_t* translate_no_mem = L"(no mem)";

2
source/ps/Pyrogenesis.h
View File

@ -24,7 +24,7 @@ Standard declarations which are included in all projects.
#ifndef INCLUDED_PYROGENESIS
#define INCLUDED_PYROGENESIS
#include "lib/native_path.h"
#include "lib/os_path.h"
// overrides ah_translate. registered in GameSetup.cpp
extern const wchar_t* psTranslate(const wchar_t* text);

1
source/ps/Replay.cpp
View File

@ -21,7 +21,6 @@
#include "graphics/TerrainTextureManager.h"
#include "lib/timer.h"
#include "lib/path_util.h"
#include "lib/utf8.h"
#include "lib/file/file_system.h"
#include "lib/tex/tex.h"

1
source/test_setup.cpp
View File

@ -27,7 +27,6 @@
#include <fstream>
#include "lib/self_test.h"
#include "lib/path_util.h"
#include <cxxtest/GlobalFixture.h>
#if OS_WIN