diff options
author | Andrei Karas <akaras@inbox.ru> | 2011-06-16 22:10:50 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2011-06-16 22:22:24 +0300 |
commit | 6a10bc8d7d186fd83099c75c2a03409d0881aae9 (patch) | |
tree | d95c703390c73c1d1bc23359eb9de9d257a65090 /src/configuration.cpp | |
parent | 654285675ececa142877d86e6f730d040625fc6e (diff) | |
download | plus-6a10bc8d7d186fd83099c75c2a03409d0881aae9.tar.gz plus-6a10bc8d7d186fd83099c75c2a03409d0881aae9.tar.bz2 plus-6a10bc8d7d186fd83099c75c2a03409d0881aae9.tar.xz plus-6a10bc8d7d186fd83099c75c2a03409d0881aae9.zip |
Fix dataDir in branding files.
Move path functions to paths.cpp
Diffstat (limited to 'src/configuration.cpp')
-rw-r--r-- | src/configuration.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/configuration.cpp b/src/configuration.cpp index 7969c9341..2d569314a 100644 --- a/src/configuration.cpp +++ b/src/configuration.cpp @@ -25,15 +25,13 @@ #include "configlistener.h" #include "log.h" +#include "utils/paths.h" #include "utils/stringutils.h" #include "utils/xml.h" #include <libxml/encoding.h> #include <stdlib.h> -#ifdef WIN32 -#define realpath(N,R) _fullpath((R),(N),_MAX_PATH) -#endif #include "debug.h" @@ -400,9 +398,7 @@ void Configuration::init(const std::string &filename, bool useResManager) else { mConfigPath = filename; - char *realPath = realpath(getFileDir(filename).c_str(), NULL); - mDirectory = realPath; - free(realPath); + mDirectory = getRealPath(getFileDir(filename)); } if (!doc.rootNode()) |