CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1065 Normalize usage of directory vs folder

Browse Source
This commit is contained in:
Tim Flynn
2017-01-16 16:42:22 -05:00
committed by Petr Mrázek
parent 944ff256b2
commit 98e17998fe
6 changed files with 18 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api/logic/FileSystem.cpp
View File

@ -15,7 +15,7 @@ void ensureExists(const QDir &dir)
{
if (!QDir().mkpath(dir.absolutePath()))
{
throw FileSystemException("Unable to create directory " + dir.dirName() + " (" +
throw FileSystemException("Unable to create folder " + dir.dirName() + " (" +
dir.absolutePath() + ")");
}
}
@ -265,7 +265,7 @@ QString ResolveExecutable(QString path)
/**
* Normalize path
*
* Any paths inside the current directory will be normalized to relative paths (to current)
* Any paths inside the current folder will be normalized to relative paths (to current)
* Other paths will be made absolute
*/
QString NormalizePath(QString path)
@ -324,7 +324,7 @@ QString DirNameFromString(QString string, QString inDir)
return dirName;
}
// Does the directory path contain any '!'? If yes, return true, otherwise false.
// Does the folder path contain any '!'? If yes, return true, otherwise false.
// (This is a problem for Java)
bool checkProblemticPathJava(QDir folder)
{