aboutsummaryrefslogtreecommitdiff
path: root/text_file_functions.cpp
diff options
context:
space:
mode:
authorDavid Skoland <davidskoland@gmail.com>2018-11-16 02:01:08 +0100
committerDavid Skoland <davidskoland@gmail.com>2018-11-16 02:01:08 +0100
commit8ffdd2afb84ec483160f156d24cf786165a9506c (patch)
tree39212e8d648e458188ce49823963fb1c88b70bd2 /text_file_functions.cpp
parent11c2f258ebf48f515cdba5c7ae9cccec447604dd (diff)
refactored path functions and added support for case-sensitive filesystems
Diffstat (limited to 'text_file_functions.cpp')
-rw-r--r--text_file_functions.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/text_file_functions.cpp b/text_file_functions.cpp
index 1aebc35e..e31ff862 100644
--- a/text_file_functions.cpp
+++ b/text_file_functions.cpp
@@ -212,8 +212,8 @@ QString AOApplication::read_design_ini(QString p_identifier, QString p_design_pa
QPoint AOApplication::get_button_spacing(QString p_identifier, QString p_file)
{
- QString design_ini_path = get_theme_path() + p_file;
- QString default_path = get_default_theme_path() + p_file;
+ QString design_ini_path = get_theme_path(p_file);
+ QString default_path = get_default_theme_path(p_file);
QString f_result = read_design_ini(p_identifier, design_ini_path);
QPoint return_value;
@@ -242,8 +242,8 @@ QPoint AOApplication::get_button_spacing(QString p_identifier, QString p_file)
pos_size_type AOApplication::get_element_dimensions(QString p_identifier, QString p_file)
{
- QString design_ini_path = get_theme_path() + p_file;
- QString default_path = get_default_theme_path() + p_file;
+ QString design_ini_path = get_theme_path(p_file);
+ QString default_path = get_default_theme_path(p_file);
QString f_result = read_design_ini(p_identifier, design_ini_path);
pos_size_type return_value;
@@ -276,8 +276,8 @@ pos_size_type AOApplication::get_element_dimensions(QString p_identifier, QStrin
int AOApplication::get_font_size(QString p_identifier, QString p_file)
{
- QString design_ini_path = get_theme_path() + p_file;
- QString default_path = get_default_theme_path() + p_file;
+ QString design_ini_path = get_theme_path(p_file);
+ QString default_path = get_default_theme_path(p_file);
QString f_result = read_design_ini(p_identifier, design_ini_path);
if (f_result == "")
@@ -293,8 +293,8 @@ int AOApplication::get_font_size(QString p_identifier, QString p_file)
QColor AOApplication::get_color(QString p_identifier, QString p_file)
{
- QString design_ini_path = get_theme_path() + p_file;
- QString default_path = get_default_theme_path() + p_file;
+ QString design_ini_path = get_theme_path(p_file);
+ QString default_path = get_default_theme_path(p_file);
QString f_result = read_design_ini(p_identifier, design_ini_path);
QColor return_color(255, 255, 255);
@@ -321,8 +321,8 @@ QColor AOApplication::get_color(QString p_identifier, QString p_file)
QString AOApplication::get_sfx(QString p_identifier)
{
- QString design_ini_path = get_theme_path() + "courtroom_sounds.ini";
- QString default_path = get_default_theme_path() + "courtroom_sounds.ini";
+ QString design_ini_path = get_theme_path("courtroom_sounds.ini");
+ QString default_path = get_default_theme_path("courtroom_sounds.ini");
QString f_result = read_design_ini(p_identifier, design_ini_path);
QString return_sfx = "";
@@ -344,7 +344,7 @@ QString AOApplication::get_sfx(QString p_identifier)
//returns the empty string if the search line couldnt be found
QString AOApplication::read_char_ini(QString p_char, QString p_search_line, QString target_tag, QString terminator_tag)
{
- QString char_ini_path = get_character_path(p_char) + "char.ini";
+ QString char_ini_path = get_character_path(p_char, "char.ini");
QFile char_ini;
@@ -586,4 +586,4 @@ bool AOApplication::ic_scroll_down_enabled()
{
QString f_result = read_config("ic_scroll_down");
return f_result.startsWith("true");
-} \ No newline at end of file
+}