mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-24 18:08:44 +00:00
Merge with develop
This commit is contained in:
parent
c91f9051e7
commit
335d0c00d6
2 changed files with 6 additions and 6 deletions
|
@ -61,19 +61,19 @@ namespace STAT_GLOBALS
|
|||
NLMISC::CSString getInputFilePath(const NLMISC::CSString& path)
|
||||
{
|
||||
NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(InputFileDirectory.get());
|
||||
return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path;
|
||||
return path.left((uint)pathRoot.size()) == pathRoot ? path : CSString(pathRoot+path);
|
||||
}
|
||||
|
||||
NLMISC::CSString getScriptFilePath(const NLMISC::CSString& path)
|
||||
{
|
||||
NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(ScriptDirectory.get());
|
||||
return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path;
|
||||
return path.left((uint)pathRoot.size()) == pathRoot ? path : CSString(pathRoot+path);
|
||||
}
|
||||
|
||||
NLMISC::CSString getOutputFilePath(const NLMISC::CSString& path)
|
||||
{
|
||||
NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(OutputDirectory.get());
|
||||
return (path.left((uint)pathRoot.size())==pathRoot)? path: pathRoot+path;
|
||||
return path.left((uint)pathRoot.size()) == pathRoot ? path : CSString(pathRoot+path);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -61,19 +61,19 @@ namespace STAT_GLOBALS
|
|||
NLMISC::CSString getInputFilePath(const NLMISC::CSString& path)
|
||||
{
|
||||
NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(InputFileDirectory.get());
|
||||
return path.left((uint)pathRoot.size()) == pathRoot ? path:pathRoot+path;
|
||||
return path.left((uint)pathRoot.size()) == pathRoot ? path : CSString(pathRoot+path);
|
||||
}
|
||||
|
||||
NLMISC::CSString getScriptFilePath(const NLMISC::CSString& path)
|
||||
{
|
||||
NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(ScriptDirectory.get());
|
||||
return path.left((uint)pathRoot.size()) == pathRoot ? path:pathRoot+path;
|
||||
return path.left((uint)pathRoot.size()) == pathRoot ? path : CSString(pathRoot+path);
|
||||
}
|
||||
|
||||
NLMISC::CSString getOutputFilePath(const NLMISC::CSString& path)
|
||||
{
|
||||
NLMISC::CSString pathRoot= NLMISC::CPath::standardizePath(OutputDirectory.get());
|
||||
return path.left((uint)pathRoot.size()) == pathRoot ? path:pathRoot+path;
|
||||
return path.left((uint)pathRoot.size()) == pathRoot ? path : CSString(pathRoot+path);
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue