From abde0f51b3062c158fb52e9dfff23d21d3be03d1 Mon Sep 17 00:00:00 2001 From: Yohann Ferreira Date: Sun, 11 Jul 2010 20:05:44 +0200 Subject: Made the different hard-coded paths and files be now taken from the data/paths.xml configuration file. Also added default gui theme path in branding and default wallpaper path and file searched respectively in the branding and paths.xml files. Hard-coded values are still used as fallbacks. Resolves: Manasource Mantis #148. Reviewed-by: jaxad0127. --- src/configuration.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/configuration.h') diff --git a/src/configuration.h b/src/configuration.h index a0c896a5..908d13a4 100644 --- a/src/configuration.h +++ b/src/configuration.h @@ -197,9 +197,10 @@ class Configuration : public ConfigurationObject /** * Reads config file and parse all options into memory. * - * \param filename path to config file + * @param filename path to config file + * @param useResManager Make use of the resource manager. */ - void init(const std::string &filename); + void init(const std::string &filename, bool useResManager = false); /** * Writes the current settings back to the config file. @@ -244,10 +245,11 @@ class Configuration : public ConfigurationObject typedef ListenerMap::iterator ListenerMapIterator; ListenerMap mListenerMap; - std::string mConfigPath; /**< Location of config file */ + std::string mConfigPath; /**< Location of config file */ }; extern Configuration branding; extern Configuration config; +extern Configuration paths; #endif -- cgit v1.2.3-70-g09d2