clean up path functions

This commit is contained in:
stonedDiscord 2020-11-16 14:32:04 +01:00
parent 4eb45ef2b0
commit 10298230ce

View File

@ -44,61 +44,37 @@ QString AOApplication::get_data_path() { return get_base_path() + "data/"; }
QString AOApplication::get_default_theme_path(QString p_file) QString AOApplication::get_default_theme_path(QString p_file)
{ {
QString path = get_base_path() + "themes/default/" + p_file; QString path = get_base_path() + "themes/default/" + p_file;
#ifndef CASE_SENSITIVE_FILESYSTEM
return path;
#else
return get_case_sensitive_path(path); return get_case_sensitive_path(path);
#endif
} }
QString AOApplication::get_custom_theme_path(QString p_theme, QString p_file) QString AOApplication::get_custom_theme_path(QString p_theme, QString p_file)
{ {
QString path = get_base_path() + "themes/" + p_theme + "/" + p_file; QString path = get_base_path() + "themes/" + p_theme + "/" + p_file;
#ifndef CASE_SENSITIVE_FILESYSTEM
return path;
#else
return get_case_sensitive_path(path); return get_case_sensitive_path(path);
#endif
} }
QString AOApplication::get_theme_path(QString p_file) QString AOApplication::get_theme_path(QString p_file)
{ {
QString path = get_base_path() + "themes/" + current_theme + "/" + p_file; QString path = get_base_path() + "themes/" + current_theme + "/" + p_file;
#ifndef CASE_SENSITIVE_FILESYSTEM
return path;
#else
return get_case_sensitive_path(path); return get_case_sensitive_path(path);
#endif
} }
QString AOApplication::get_character_path(QString p_char, QString p_file) QString AOApplication::get_character_path(QString p_char, QString p_file)
{ {
QString path = get_base_path() + "characters/" + p_char + "/" + p_file; QString path = get_base_path() + "characters/" + p_char + "/" + p_file;
#ifndef CASE_SENSITIVE_FILESYSTEM
return path;
#else
return get_case_sensitive_path(path); return get_case_sensitive_path(path);
#endif
} }
QString AOApplication::get_sounds_path(QString p_file) QString AOApplication::get_sounds_path(QString p_file)
{ {
QString path = get_base_path() + "sounds/general/" + p_file; QString path = get_base_path() + "sounds/general/" + p_file;
#ifndef CASE_SENSITIVE_FILESYSTEM
return path;
#else
return get_case_sensitive_path(path); return get_case_sensitive_path(path);
#endif
} }
QString AOApplication::get_music_path(QString p_song) QString AOApplication::get_music_path(QString p_song)
{ {
QString path = get_base_path() + "sounds/music/" + p_song; QString path = get_base_path() + "sounds/music/" + p_song;
#ifndef CASE_SENSITIVE_FILESYSTEM
return path;
#else
return get_case_sensitive_path(path); return get_case_sensitive_path(path);
#endif
} }
QString AOApplication::get_background_path(QString p_file) QString AOApplication::get_background_path(QString p_file)
@ -106,11 +82,7 @@ QString AOApplication::get_background_path(QString p_file)
QString path = get_base_path() + "background/" + QString path = get_base_path() + "background/" +
w_courtroom->get_current_background() + "/" + p_file; w_courtroom->get_current_background() + "/" + p_file;
if (courtroom_constructed) { if (courtroom_constructed) {
#ifndef CASE_SENSITIVE_FILESYSTEM
return path;
#else
return get_case_sensitive_path(path); return get_case_sensitive_path(path);
#endif
} }
return get_default_background_path(p_file); return get_default_background_path(p_file);
} }
@ -118,25 +90,18 @@ QString AOApplication::get_background_path(QString p_file)
QString AOApplication::get_default_background_path(QString p_file) QString AOApplication::get_default_background_path(QString p_file)
{ {
QString path = get_base_path() + "background/default/" + p_file; QString path = get_base_path() + "background/default/" + p_file;
#ifndef CASE_SENSITIVE_FILESYSTEM
return path;
#else
return get_case_sensitive_path(path); return get_case_sensitive_path(path);
#endif
} }
QString AOApplication::get_evidence_path(QString p_file) QString AOApplication::get_evidence_path(QString p_file)
{ {
QString path = get_base_path() + "evidence/" + p_file; QString path = get_base_path() + "evidence/" + p_file;
#ifndef CASE_SENSITIVE_FILESYSTEM
return path;
#else
return get_case_sensitive_path(path); return get_case_sensitive_path(path);
#endif
} }
QString AOApplication::get_case_sensitive_path(QString p_file) QString AOApplication::get_case_sensitive_path(QString p_file)
{ {
#ifdef CASE_SENSITIVE_FILESYSTEM
// first, check to see if it's actually there (also serves as base case for // first, check to see if it's actually there (also serves as base case for
// recursion) // recursion)
if (exists(p_file)) if (exists(p_file))
@ -163,4 +128,7 @@ QString AOApplication::get_case_sensitive_path(QString p_file)
// if nothing is found, let the caller handle the missing file // if nothing is found, let the caller handle the missing file
return file_parent_dir + "/" + file_basename; return file_parent_dir + "/" + file_basename;
#else
return p_file;
#endif
} }