Small code cleanup

This commit is contained in:
mathusummut
2019-04-04 23:35:44 +02:00
parent 890fcc482b
commit b5051e8fa9
3 changed files with 6 additions and 11 deletions

View File

@@ -241,8 +241,8 @@ namespace Shared {
bool EndsWith(const string &str, const string& key);
string endPathWithSlash(string &path, bool requireOSSlash = false);
void trimPathWithStartingSlash(string &path);
void updatePathClimbingParts(string &path, bool processPreviousDirTokenCheck = true);
string trimPathWithStartingSlash(string &path);
string updatePathClimbingParts(string &path, bool processPreviousDirTokenCheck = true);
string formatPath(string path);
string replaceAllHTMLEntities(string& context);
@@ -265,7 +265,6 @@ namespace Shared {
void showCursor(bool b);
bool isKeyDown(int virtualKey);
//bool isKeyDown(SDLKey key);
string getCommandLine();
string getUserHome();

View File

@@ -71,8 +71,6 @@ namespace Shared {
void message(const string &message,bool isNonGraphicalModeEnabled, const string &writepath);
void exceptionMessage(const exception &excp);
string getCommandLine();
// WINDOWS
#else
@@ -98,11 +96,8 @@ namespace Shared {
#if !defined(__GNUC__)
virtual void handle(LPEXCEPTION_POINTERS pointers)=0;
#endif
static string codeToStr(DWORD code);
};
LONG WINAPI UnhandledExceptionFilter2(struct _EXCEPTION_POINTERS *ExceptionInfo);
// =====================================================
// Misc
// =====================================================
@@ -113,7 +108,6 @@ namespace Shared {
void message(string message, bool isNonGraphicalModeEnabled,const string &writepath);
void exceptionMessage(const exception &excp);
string getCommandLine();
void init_win32();
void done_win32();
void ontop_win32(int width, int height);

View File

@@ -572,14 +572,15 @@ namespace Shared {
return path;
}
void trimPathWithStartingSlash(string &path) {
string trimPathWithStartingSlash(string &path) {
if (StartsWith(path, "/") == true || StartsWith(path, "\\") == true) {
path.erase(path.begin(), path.begin() + 1);
//printf("************* trimPathWithStartingSlash changed path [%s]\n",path.c_str());
}
return path;
}
void updatePathClimbingParts(string &path, bool processPreviousDirTokenCheck) {
string updatePathClimbingParts(string &path, bool processPreviousDirTokenCheck) {
// Update paths with /./
string::size_type pos = path.find("/./");
if (pos != string::npos && pos != 0) {
@@ -683,6 +684,7 @@ namespace Shared {
printf("CHANGED relative path from [%s] to [%s]\n",orig.c_str(),path.c_str());
}
*/
return path;
}
string getCRCCacheFilePath() {