Skip to content

Commit 02ce71b

Browse files
andreasdrandreasdr
committed
folder -> path
1 parent 2a397ef commit 02ce71b

13 files changed

+101
-101
lines changed

‎src/tdme/engine/fileio/prototypes/PrototypeReader.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ class tdme::engine::fileio::prototypes::PrototypeReader final
8383

8484
/**
8585
* Get resource path name
86-
* @param pathName path name within a TDME2 resource folder where parent resource was loaded from
87-
* @param fileName file name containing a path and file in a TDME2 resource folder
86+
* @param pathName path name within a TDME2 resource path where parent resource was loaded from
87+
* @param fileName file name containing a path and file in a TDME2 resource path
8888
* @return model path name
8989
*/
9090
static const string getResourcePathName(const string& pathName, const string& fileName);

‎src/tdme/engine/subsystems/renderer/VKRenderer.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1009,7 +1009,7 @@ void VKRenderer::initialize()
10091009
{
10101010
if (VERBOSE == true) Console::println("VKRenderer::" + string(__FUNCTION__) + "()");
10111011

1012-
// create VK shader cache folder
1012+
// create VK shader cache path
10131013
try {
10141014
if (FileSystem::getInstance()->exists("shader/vk") == false) {
10151015
FileSystem::getInstance()->createPath("shader/vk");

‎src/tdme/gui/nodes/GUIScreenNode.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ class tdme::gui::nodes::GUIScreenNode final
199199
}
200200

201201
/**
202-
* @return application sub folder path name
202+
* @return application sub path path name
203203
*/
204204
inline const string& getApplicationSubPathName() {
205205
return applicationSubPathName;

‎src/tdme/os/filesystem/ArchiveFileSystem.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ const string ArchiveFileSystem::composeURI(const string& pathName, const string&
8484

8585
void ArchiveFileSystem::list(const string& pathName, vector<string>& files, FileNameFilter* filter, bool addDrives)
8686
{
87-
// TODO: this currently lists all files beginning from given path, also files in sub folders
87+
// TODO: this currently lists all files beginning from given path, also files in sub paths
8888
auto _pathName = pathName;
8989
if (_pathName.empty() == false && StringTools::endsWith(pathName, "/") == false) _pathName+= "/";
9090
for (const auto& [mapfileName, fileInformation]: fileInformations) {

‎src/tdme/tools/cli/collectguitags-main.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ using tinyxml::TiXmlAttribute;
3636
using tinyxml::TiXmlDocument;
3737
using tinyxml::TiXmlElement;
3838

39-
void scanDir(const string& folder, vector<string>& totalFiles) {
39+
void scanPath(const string& path, vector<string>& totalFiles) {
4040
class ListFilter : public virtual FileNameFilter {
4141
public:
4242
virtual ~ListFilter() {}
@@ -53,13 +53,13 @@ void scanDir(const string& folder, vector<string>& totalFiles) {
5353
ListFilter listFilter;
5454
vector<string> files;
5555

56-
FileSystem::getInstance()->list(folder, files, &listFilter);
56+
FileSystem::getInstance()->list(path, files, &listFilter);
5757

5858
for (const auto& fileName: files) {
5959
if (StringTools::endsWith(fileName, ".xml") == true) {
60-
totalFiles.push_back(folder + "/" + fileName);
60+
totalFiles.push_back(path + "/" + fileName);
6161
} else {
62-
scanDir(folder + "/" + fileName, totalFiles);
62+
scanPath(path + "/" + fileName, totalFiles);
6363
}
6464
}
6565
}
@@ -134,7 +134,7 @@ int main(int argc, char** argv)
134134
for (auto i = 1; i < argc; i++) {
135135
auto pathToHeaders = string(argv[i]);
136136
Console::println("Scanning files: " + pathToHeaders);
137-
scanDir(pathToHeaders, files);
137+
scanPath(pathToHeaders, files);
138138
}
139139

140140
Console::println("Processing files");

‎src/tdme/tools/cli/createinstaller-main.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ static void scanPathLibraries(const string& path, vector<string>& totalFiles) {
161161
if (fileName == "..") return false;
162162
// path
163163
if (FileSystem::getInstance()->isPath(pathName + "/" + fileName) == true) {
164-
// Apple: no .dSYM folders
164+
// Apple: no .dSYM files
165165
#if defined(__APPLE__)
166166
if (StringTools::endsWith(fileName, ".dSYM") == true) return false;
167167
#endif
@@ -258,7 +258,7 @@ static void scanPathExecutables(const string& path, vector<string>& totalFiles)
258258
if (fileName == "..") return false;
259259
// path
260260
if (FileSystem::getInstance()->isPath(pathName + "/" + fileName) == true) {
261-
// Apple: no .dSYM folders
261+
// Apple: no .dSYM files
262262
#if defined(__APPLE__)
263263
if (StringTools::endsWith(fileName, ".dSYM") == true) return false;
264264
#endif

‎src/tdme/tools/cli/generatelicenses-main.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ using tdme::utilities::Exception;
2626
using tdme::utilities::StringTokenizer;
2727
using tdme::utilities::StringTools;
2828

29-
void scanDir(const string& folder, vector<string>& totalFiles) {
29+
void scanPath(const string& path, vector<string>& totalFiles) {
3030
class ListFilter : public virtual FileNameFilter {
3131
public:
3232
virtual ~ListFilter() {}
@@ -43,13 +43,13 @@ void scanDir(const string& folder, vector<string>& totalFiles) {
4343
ListFilter listFilter;
4444
vector<string> files;
4545

46-
FileSystem::getInstance()->list(folder, files, &listFilter);
46+
FileSystem::getInstance()->list(path, files, &listFilter);
4747

4848
for (const auto& fileName: files) {
4949
if (fileName == "LICENSE") {
50-
totalFiles.push_back(folder + "/" + fileName);
50+
totalFiles.push_back(path + "/" + fileName);
5151
} else {
52-
scanDir(folder + "/" + fileName, totalFiles);
52+
scanPath(path + "/" + fileName, totalFiles);
5353
}
5454
}
5555
}
@@ -92,7 +92,7 @@ int main(int argc, char** argv)
9292

9393
Console::println("Scanning files");
9494
vector<string> files;
95-
scanDir(pathToHeaders, files);
95+
scanPath(pathToHeaders, files);
9696

9797
Console::println("Processing files");
9898
Console::println("------------------");

‎src/tdme/tools/cli/makefilegenerator-main.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ using tdme::utilities::Console;
2424
using tdme::utilities::Exception;
2525
using tdme::utilities::StringTools;
2626

27-
void scanDir(const string& folder, vector<string>& sourceFiles, vector<string>& mainSourceFiles) {
27+
void scanPath(const string& path, vector<string>& sourceFiles, vector<string>& mainSourceFiles) {
2828
class SourceFilesFilter : public virtual FileNameFilter {
2929
public:
3030
virtual ~SourceFilesFilter() {}
@@ -45,16 +45,16 @@ void scanDir(const string& folder, vector<string>& sourceFiles, vector<string>&
4545
SourceFilesFilter sourceFilesFilter;
4646
vector<string> files;
4747

48-
FileSystem::getInstance()->list(folder, files, &sourceFilesFilter);
48+
FileSystem::getInstance()->list(path, files, &sourceFilesFilter);
4949

5050
for (const auto& fileName: files) {
5151
if (StringTools::endsWith(fileName, "-main.cpp") == true) {
52-
mainSourceFiles.push_back(folder + "/" + fileName);
52+
mainSourceFiles.push_back(path + "/" + fileName);
5353
} else
5454
if (StringTools::endsWith(fileName, ".cpp") == true) {
55-
sourceFiles.push_back(folder + "/" + fileName);
55+
sourceFiles.push_back(path + "/" + fileName);
5656
} else {
57-
scanDir(folder + "/" + fileName, sourceFiles, mainSourceFiles);
57+
scanPath(path + "/" + fileName, sourceFiles, mainSourceFiles);
5858
}
5959
}
6060
}
@@ -79,7 +79,7 @@ int main(int argc, char** argv)
7979
Console::println("Scanning source files");
8080
vector<string> sourceFiles;
8181
vector<string> mainSourceFiles;
82-
scanDir(pathToSource, sourceFiles, mainSourceFiles);
82+
scanPath(pathToSource, sourceFiles, mainSourceFiles);
8383

8484
string sourceFilesVariable = "\\\n";
8585
for (const auto& file: sourceFiles) sourceFilesVariable+= "\t" + file + "\\\n";
@@ -91,10 +91,10 @@ int main(int argc, char** argv)
9191

9292
Console::println("Generating Makefile");
9393

94-
auto executableFolder = StringTools::replace(argv[0], "\\", "/");
95-
auto tdme2Folder = StringTools::substring(executableFolder, 0, StringTools::toLowerCase(executableFolder).rfind("/tdme2/") + string("/tdme2/").length());
94+
auto executablePath = StringTools::replace(argv[0], "\\", "/");
95+
auto tdme2Path = StringTools::substring(executablePath, 0, StringTools::toLowerCase(executablePath).rfind("/tdme2/") + string("/tdme2/").length());
9696

97-
auto makefileSource = FileSystem::getInstance()->getContentAsString(tdme2Folder + "/resources/engine/templates/makefiles", "Makefile");
97+
auto makefileSource = FileSystem::getInstance()->getContentAsString(tdme2Path + "/resources/engine/templates/makefiles", "Makefile");
9898
makefileSource = StringTools::replace(makefileSource, "{$source-files}", sourceFilesVariable);
9999
makefileSource = StringTools::replace(makefileSource, "{$main-source-files}", mainSourceFilesVariable);
100100
FileSystem::getInstance()->setContentFromString(".", "Makefile", makefileSource);

‎src/tdme/tools/cli/nmakefilegenerator-main.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ using tdme::utilities::Console;
2424
using tdme::utilities::Exception;
2525
using tdme::utilities::StringTools;
2626

27-
void scanDir(const string& folder, vector<string>& sourceFiles, vector<string>& mainSourceFiles) {
27+
void scanPath(const string& path, vector<string>& sourceFiles, vector<string>& mainSourceFiles) {
2828
class SourceFilesFilter : public virtual FileNameFilter {
2929
public:
3030
virtual ~SourceFilesFilter() {}
@@ -45,16 +45,16 @@ void scanDir(const string& folder, vector<string>& sourceFiles, vector<string>&
4545
SourceFilesFilter sourceFilesFilter;
4646
vector<string> files;
4747

48-
FileSystem::getInstance()->list(folder, files, &sourceFilesFilter);
48+
FileSystem::getInstance()->list(path, files, &sourceFilesFilter);
4949

5050
for (const auto& fileName: files) {
5151
if (StringTools::endsWith(fileName, "-main.cpp") == true) {
52-
mainSourceFiles.push_back(folder + "/" + fileName);
52+
mainSourceFiles.push_back(path + "/" + fileName);
5353
} else
5454
if (StringTools::endsWith(fileName, ".cpp") == true) {
55-
sourceFiles.push_back(folder + "/" + fileName);
55+
sourceFiles.push_back(path + "/" + fileName);
5656
} else {
57-
scanDir(folder + "/" + fileName, sourceFiles, mainSourceFiles);
57+
scanPath(path + "/" + fileName, sourceFiles, mainSourceFiles);
5858
}
5959
}
6060
}
@@ -76,7 +76,7 @@ int main(int argc, char** argv)
7676
Console::println("Scanning source files");
7777
vector<string> sourceFiles;
7878
vector<string> mainSourceFiles;
79-
scanDir(pathToSource, sourceFiles, mainSourceFiles);
79+
scanPath(pathToSource, sourceFiles, mainSourceFiles);
8080

8181
//
8282
string sourceFilesVariable = "\\\n";
@@ -93,12 +93,12 @@ int main(int argc, char** argv)
9393
Console::println("Generating Makefile");
9494

9595
//
96-
auto executableFolder = StringTools::replace(argv[0], "\\", "/");
97-
auto tdme2Folder = StringTools::substring(executableFolder, 0, StringTools::toLowerCase(executableFolder).rfind("/tdme2/") + string("/tdme2/").length());
96+
auto executablePath = StringTools::replace(argv[0], "\\", "/");
97+
auto tdme2Path = StringTools::substring(executablePath, 0, StringTools::toLowerCase(executablePath).rfind("/tdme2/") + string("/tdme2/").length());
9898

9999
//
100-
auto makefileSource = FileSystem::getInstance()->getContentAsString(tdme2Folder + "/resources/engine/templates/makefiles", "Makefile.nmake");
101-
auto makefileMainSourceTemplate = FileSystem::getInstance()->getContentAsString(tdme2Folder + "/resources/engine/templates/makefiles", "Makefile.nmake.main");
100+
auto makefileSource = FileSystem::getInstance()->getContentAsString(tdme2Path + "/resources/engine/templates/makefiles", "Makefile.nmake");
101+
auto makefileMainSourceTemplate = FileSystem::getInstance()->getContentAsString(tdme2Path + "/resources/engine/templates/makefiles", "Makefile.nmake.main");
102102
makefileSource = StringTools::replace(makefileSource, "{$source-files}", sourceFilesVariable);
103103
makefileSource = StringTools::replace(makefileSource, "{$main-targets}", mainTargets);
104104
makefileSource+= "\n";

‎src/tdme/tools/cli/recreatevkcache-main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ int main(int argc, char** argv)
9191
Console::println();
9292

9393
//
94-
Console::println("Deleting shader/vk folder");
94+
Console::println("Deleting shader/vk path");
9595
try {
9696
FileSystem::getInstance()->removePath("shader/vk", true);
9797
} catch (Exception& exception) {

‎src/tdme/tools/cli/sortincludes-main.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ using tdme::utilities::Exception;
3333
using tdme::utilities::StringTokenizer;
3434
using tdme::utilities::StringTools;
3535

36-
void scanDir(const string& folder, vector<string>& totalFiles) {
36+
void scanPath(const string& path, vector<string>& totalFiles) {
3737
class ListFilter : public virtual FileNameFilter {
3838
public:
3939
virtual ~ListFilter() {}
@@ -51,14 +51,14 @@ void scanDir(const string& folder, vector<string>& totalFiles) {
5151
ListFilter listFilter;
5252
vector<string> files;
5353

54-
FileSystem::getInstance()->list(folder, files, &listFilter);
54+
FileSystem::getInstance()->list(path, files, &listFilter);
5555

5656
for (const auto& fileName: files) {
5757
if (StringTools::endsWith(fileName, ".h") == true ||
5858
StringTools::endsWith(fileName, ".cpp") == true) {
59-
totalFiles.push_back(folder + "/" + fileName);
59+
totalFiles.push_back(path + "/" + fileName);
6060
} else {
61-
scanDir(folder + "/" + fileName, totalFiles);
61+
scanPath(path + "/" + fileName, totalFiles);
6262
}
6363
}
6464
}
@@ -191,7 +191,7 @@ int main(int argc, char** argv)
191191
//
192192
Console::println("Scanning files");
193193
vector<string> files;
194-
scanDir(pathToSource, files);
194+
scanPath(pathToSource, files);
195195

196196
//
197197
Console::println("Processing files");

0 commit comments

Comments
 (0)