From 9c289c7cc0e5fdf89eed1e28200166714789c92f Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 28 Mar 2017 17:20:19 +0300 Subject: Rename some left functions from physfs to virtfs. --- src/fs/files.cpp | 12 ++++++------ src/fs/files.h | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/fs') diff --git a/src/fs/files.cpp b/src/fs/files.cpp index b525b2c59..dca24aec1 100644 --- a/src/fs/files.cpp +++ b/src/fs/files.cpp @@ -60,7 +60,7 @@ void Files::extractLocale() const std::string localFile = localDir + moFile; const std::string localDir2 = localDir + dir + "/LC_MESSAGES"; mkdir_r(localDir2.c_str()); - copyPhysFsFile(moFile, localFile); + copyVirtFsFile(moFile, localFile); } } } @@ -86,7 +86,7 @@ void Files::setCopyCallBack(Files::CopyFileCallbackPtr callback) mCallbackPtr = callback; } -void Files::copyPhysFsFile(const std::string &restrict inFile, +void Files::copyVirtFsFile(const std::string &restrict inFile, const std::string &restrict outFile) { int size = 0; @@ -104,7 +104,7 @@ void Files::copyPhysFsFile(const std::string &restrict inFile, #endif // ANDROID } -void Files::copyPhysFsDir(const std::string &restrict inDir, +void Files::copyVirtFsDir(const std::string &restrict inDir, const std::string &restrict outDir) { mkdir_r(outDir.c_str()); @@ -114,9 +114,9 @@ void Files::copyPhysFsDir(const std::string &restrict inDir, const std::string file = std::string(inDir).append("/").append(*i); const std::string outDir2 = std::string(outDir).append("/").append(*i); if (VirtFs::isDirectory(file)) - copyPhysFsDir(file, outDir2); + copyVirtFsDir(file, outDir2); else - copyPhysFsFile(file, outDir2); + copyVirtFsFile(file, outDir2); } VirtFs::freeList(files); } @@ -126,7 +126,7 @@ void Files::extractZip(const std::string &restrict zipName, const std::string &restrict outDir) { VirtFs::mountZip(zipName, Append_false); - copyPhysFsDir(inDir, outDir); + copyVirtFsDir(inDir, outDir); VirtFs::unmountZip(zipName); remove(zipName.c_str()); } diff --git a/src/fs/files.h b/src/fs/files.h index 65b2f6325..4b55292de 100644 --- a/src/fs/files.h +++ b/src/fs/files.h @@ -36,10 +36,10 @@ namespace Files void setCopyCallBack(CopyFileCallbackPtr callback); - void copyPhysFsFile(const std::string &restrict inFile, + void copyVirtFsFile(const std::string &restrict inFile, const std::string &restrict outFile); - void copyPhysFsDir(const std::string &restrict inDir, + void copyVirtFsDir(const std::string &restrict inDir, const std::string &restrict outDir); void extractZip(const std::string &restrict zipName, -- cgit v1.2.3-60-g2f50