From 14ccee3153e25222c65d4bed3cda510c748b2d5e Mon Sep 17 00:00:00 2001 From: gigaherz Date: Sat, 11 Jul 2009 16:39:58 +0000 Subject: [PATCH] Renamed a few files so that they more clearly represent their meaning. This was goign to be part of a bigger change but I got annoyed before I had to chance to actually start working on it, so I'll drop this anyhow. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1486 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/CDVD/CDVD.cpp | 2 +- pcsx2/CDVD/{CDVDlib.h => IsoFScdvd.h} | 6 ++-- pcsx2/CDVD/{CDVDisodrv.cpp => IsoFSdrv.cpp} | 4 +-- pcsx2/CDVD/{CDVDisodrv.h => IsoFSdrv.h} | 8 ++--- pcsx2/CDVD/{CDVDiso.cpp => IsoFStools.cpp} | 4 +-- pcsx2/CDVD/{CDVDiso.h => IsoFStools.h} | 8 ++--- pcsx2/Elfheader.cpp | 2 +- pcsx2/Misc.cpp | 2 +- pcsx2/SaveState.cpp | 2 +- pcsx2/windows/VCprojects/pcsx2_2008.vcproj | 36 ++++++++++++--------- pcsx2_suite_2008.sln | 7 ---- 11 files changed, 39 insertions(+), 42 deletions(-) rename pcsx2/CDVD/{CDVDlib.h => IsoFScdvd.h} (98%) rename pcsx2/CDVD/{CDVDisodrv.cpp => IsoFSdrv.cpp} (99%) rename pcsx2/CDVD/{CDVDisodrv.h => IsoFSdrv.h} (92%) rename pcsx2/CDVD/{CDVDiso.cpp => IsoFStools.cpp} (99%) rename pcsx2/CDVD/{CDVDiso.h => IsoFStools.h} (97%) diff --git a/pcsx2/CDVD/CDVD.cpp b/pcsx2/CDVD/CDVD.cpp index 486c09af24..10d8722332 100644 --- a/pcsx2/CDVD/CDVD.cpp +++ b/pcsx2/CDVD/CDVD.cpp @@ -22,7 +22,7 @@ #include #include "IopCommon.h" -#include "CDVDiso.h" +#include "IsoFStools.h" #include "CDVD_internal.h" static cdvdStruct cdvd; diff --git a/pcsx2/CDVD/CDVDlib.h b/pcsx2/CDVD/IsoFScdvd.h similarity index 98% rename from pcsx2/CDVD/CDVDlib.h rename to pcsx2/CDVD/IsoFScdvd.h index b942055fbf..5fda507a93 100644 --- a/pcsx2/CDVD/CDVDlib.h +++ b/pcsx2/CDVD/IsoFScdvd.h @@ -21,8 +21,8 @@ * Modified by Florin for PCSX2 emu */ -#ifndef _CDVDLIB_H -#define _CDVDLIB_H +#ifndef _ISOFSCDVD_H +#define _ISOFSCDVD_H #include "Common.h" @@ -168,4 +168,4 @@ int CDVD_findfile(const char* fname, struct TocEntry* tocEntry); int CdRead(u32 lsn, u32 sectors, void *buf, CdRMode *mode); int DvdRead(u32 lsn, u32 sectors, void *buf, CdRMode *mode); -#endif // _CDVDLIB_H +#endif // _ISOFSCDVD_H diff --git a/pcsx2/CDVD/CDVDisodrv.cpp b/pcsx2/CDVD/IsoFSdrv.cpp similarity index 99% rename from pcsx2/CDVD/CDVDisodrv.cpp rename to pcsx2/CDVD/IsoFSdrv.cpp index aaf2dff0ef..d36b1c07f7 100644 --- a/pcsx2/CDVD/CDVDisodrv.cpp +++ b/pcsx2/CDVD/IsoFSdrv.cpp @@ -22,8 +22,8 @@ #include "PrecompiledHeader.h" -#include "CDVDiso.h" -#include "CDVDisodrv.h" +#include "IsoFStools.h" +#include "IsoFSdrv.h" CdRMode cdReadMode; diff --git a/pcsx2/CDVD/CDVDisodrv.h b/pcsx2/CDVD/IsoFSdrv.h similarity index 92% rename from pcsx2/CDVD/CDVDisodrv.h rename to pcsx2/CDVD/IsoFSdrv.h index 59286272dd..e93ea459f6 100644 --- a/pcsx2/CDVD/CDVDisodrv.h +++ b/pcsx2/CDVD/IsoFSdrv.h @@ -20,10 +20,10 @@ * Modified by Florin for PCSX2 emu */ -#ifndef __CDVDISODRV_H__ -#define __CDVDISODRV_H__ +#ifndef __ISOFSDRV_H__ +#define __ISOFSDRV_H__ -#include "CDVDlib.h" +#include "IsoFScdvd.h" extern CdRMode cdReadMode; @@ -35,4 +35,4 @@ int CDVDFS_read( int fd, char * buffer, int size ); int CDVDFS_write( int fd, char * buffer, int size ); int CDVDFS_close( int fd); -#endif//__CDVDISODRV_H__ +#endif//__ISOFSDRV_H__ diff --git a/pcsx2/CDVD/CDVDiso.cpp b/pcsx2/CDVD/IsoFStools.cpp similarity index 99% rename from pcsx2/CDVD/CDVDiso.cpp rename to pcsx2/CDVD/IsoFStools.cpp index 2eb1031d94..00ac6e76a1 100644 --- a/pcsx2/CDVD/CDVDiso.cpp +++ b/pcsx2/CDVD/IsoFStools.cpp @@ -24,8 +24,8 @@ #include -#include "CDVDiso.h" -#include "CDVDisodrv.h" +#include "IsoFStools.h" +#include "IsoFSdrv.h" struct dir_toc_data { diff --git a/pcsx2/CDVD/CDVDiso.h b/pcsx2/CDVD/IsoFStools.h similarity index 97% rename from pcsx2/CDVD/CDVDiso.h rename to pcsx2/CDVD/IsoFStools.h index 1a160f7b6e..665e043f44 100644 --- a/pcsx2/CDVD/CDVDiso.h +++ b/pcsx2/CDVD/IsoFStools.h @@ -20,10 +20,10 @@ * Modified by Florin for PCSX2 emu */ -#ifndef __CDVDISO_H__ -#define __CDVDISO_H__ +#ifndef __ISOFSTOOLS_H__ +#define __ISOFSTOOLS_H__ -#include "CDVDlib.h" +#include "IsoFScdvd.h" int CDVD_findfile(const char* fname, TocEntry* tocEntry); int CDVD_GetDir_RPC_request(char* pathname, char* extensions, unsigned int inc_dirs); @@ -146,4 +146,4 @@ struct dirTocEntry #pragma pack() #endif -#endif//__CDVDISO_H__ +#endif//__ISOFSTOOLS_H__ diff --git a/pcsx2/Elfheader.cpp b/pcsx2/Elfheader.cpp index d77d4b015f..5fa2b98093 100644 --- a/pcsx2/Elfheader.cpp +++ b/pcsx2/Elfheader.cpp @@ -19,7 +19,7 @@ #include "PrecompiledHeader.h" #include "Common.h" -#include "CDVD/CDVDisodrv.h" +#include "CDVD/IsoFSdrv.h" using namespace std; diff --git a/pcsx2/Misc.cpp b/pcsx2/Misc.cpp index a1a975c6fc..8e4fb22be0 100644 --- a/pcsx2/Misc.cpp +++ b/pcsx2/Misc.cpp @@ -29,7 +29,7 @@ #include "IopCommon.h" #include "HostGui.h" -#include "CDVD/CDVDisodrv.h" +#include "CDVD/IsoFSdrv.h" #include "VUmicro.h" #include "VU.h" #include "iCore.h" diff --git a/pcsx2/SaveState.cpp b/pcsx2/SaveState.cpp index ce42bf2577..aa676ff571 100644 --- a/pcsx2/SaveState.cpp +++ b/pcsx2/SaveState.cpp @@ -21,7 +21,7 @@ #include "IopCommon.h" #include "SaveState.h" -#include "CDVD/CDVDisodrv.h" +#include "CDVD/IsoFSdrv.h" #include "VUmicro.h" #include "VU.h" #include "iCore.h" diff --git a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj index e8c29e38f3..d598eb9059 100644 --- a/pcsx2/windows/VCprojects/pcsx2_2008.vcproj +++ b/pcsx2/windows/VCprojects/pcsx2_2008.vcproj @@ -2449,22 +2449,6 @@ - - - - - - - - @@ -2473,6 +2457,26 @@ RelativePath="..\..\Elfheader.h" > + + + + + + + + + +