hyzboy/CMCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MergeFilename改名为Combine

Browse Source
This commit is contained in:
hyzboy
2025-03-27 23:07:32 +08:00
parent 3b3f6e7e12
commit 54f484c442
7 changed files with 149 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@@ -208,7 +208,9 @@ SET(FILESYSTEM_INCLUDE_PATH ${CMCORE_ROOT_INCLUDE_PATH}/hgl/filesystem)
SET(FILESYSTEM_HEADER_FILES ${FILESYSTEM_INCLUDE_PATH}/EnumFile.h
${FILESYSTEM_INCLUDE_PATH}/EnumVolume.h
${FILESYSTEM_INCLUDE_PATH}/FileSystem.h)
${FILESYSTEM_INCLUDE_PATH}/FileSystem.h
${FILESYSTEM_INCLUDE_PATH}/Filename.h
)
SET(FILESYSTEM_SOURCE_FILES FileSystem/FileSystem.cpp
FileSystem/EnumFile.cpp)

4
src/FileSystem/FileSystem.cpp
View File

@@ -397,7 +397,7 @@ namespace hgl
for(const OSString *pn:paths)
{
full_filename=MergeFilename(*pn,filename);
full_filename=Combine(*pn,filename);
exist=FileExist(full_filename);
@@ -431,7 +431,7 @@ namespace hgl
{
for(const OSString *fn:filenames)
{
full_filename=MergeFilename(*pn,*fn);
full_filename=Combine(*pn,*fn);
exist=FileExist(full_filename);

4
src/Log/LogFile.cpp
View File

@@ -41,12 +41,12 @@ namespace hgl
if(!GetLocalAppdataPath(local_app_data_path))
return(false);
cmgdk_path=filesystem::MergeFilename(local_app_data_path,OS_TEXT(".cmgdk"));
cmgdk_path=filesystem::Combine(local_app_data_path,OS_TEXT(".cmgdk"));
if(!filesystem::MakePath(cmgdk_path))
return(false);
fn=filesystem::MergeFilename(cmgdk_path,project_code);
fn=filesystem::Combine(cmgdk_path,project_code);
for(uint i=0;i<=0xFFFF;i++)
{

6
src/PlugIn/PlugInManage.cpp
View File

@@ -15,7 +15,7 @@ namespace hgl
{
AddFindPath(pn);
pn=MergeFilename(pn,OS_TEXT("Plug-ins"));
pn=Combine(pn,OS_TEXT("Plug-ins"));
AddFindPath(pn);
}
@@ -23,7 +23,7 @@ namespace hgl
{
AddFindPath(pn);
pn=MergeFilename(pn,OS_TEXT("Plug-ins"));
pn=Combine(pn,OS_TEXT("Plug-ins"));
AddFindPath(pn);
}
}
@@ -105,7 +105,7 @@ namespace hgl
for(uint i=0;i<fp_count;i++)
{
pi_fullfilename=MergeFilename(findpath[i],pi_filename);
pi_fullfilename=Combine(findpath[i],pi_filename);
if(!FileExist(pi_fullfilename))continue;