diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-28 20:31:09 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-28 20:31:09 +0300 |
| commit | bb87f2911b63eaf80e49d689bf52ecf2042ae098 (patch) | |
| tree | 0778087134ec3c5a2370d417bcadb64a1dc6a9bc /src/utils/translation | |
| parent | 4415cb66734e67dfcdf8924d354107d27fb70fee (diff) | |
| download | manaplus-bb87f2911b63eaf80e49d689bf52ecf2042ae098.tar.gz manaplus-bb87f2911b63eaf80e49d689bf52ecf2042ae098.tar.bz2 manaplus-bb87f2911b63eaf80e49d689bf52ecf2042ae098.tar.xz manaplus-bb87f2911b63eaf80e49d689bf52ecf2042ae098.zip | |
Move from resourcemanager functions related to files into other files.
Diffstat (limited to 'src/utils/translation')
| -rw-r--r-- | src/utils/translation/poparser.cpp | 6 | ||||
| -rw-r--r-- | src/utils/translation/translationmanager.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/utils/translation/poparser.cpp b/src/utils/translation/poparser.cpp index bcb577f84..7e78ade9d 100644 --- a/src/utils/translation/poparser.cpp +++ b/src/utils/translation/poparser.cpp @@ -22,6 +22,7 @@ #include "resources/resourcemanager.h" +#include "utils/physfstools.h" #include "utils/stringutils.h" #include "utils/translation/podict.h" @@ -48,7 +49,7 @@ void PoParser::openFile(const std::string &name) if (!resman) return; int size; - char *buf = static_cast<char*>(resman->loadFile(getFileName(name), size)); + char *buf = static_cast<char*>(PhysFs::loadFile(getFileName(name), size)); if (buf) { @@ -231,8 +232,7 @@ PoDict *PoParser::getEmptyDict() bool PoParser::checkLang(const std::string &lang) { // check is po file exists - const ResourceManager *const resman = ResourceManager::getInstance(); - return resman->exists(getFileName(lang)); + return PhysFs::exists(getFileName(lang).c_str()); } std::string PoParser::getFileName(const std::string &lang) diff --git a/src/utils/translation/translationmanager.cpp b/src/utils/translation/translationmanager.cpp index 9bbdec810..5fddee639 100644 --- a/src/utils/translation/translationmanager.cpp +++ b/src/utils/translation/translationmanager.cpp @@ -21,6 +21,7 @@ #include "utils/translation/translationmanager.h" #include "utils/delete2.h" +#include "utils/physfstools.h" #include "utils/stringutils.h" #include "utils/translation/podict.h" @@ -85,9 +86,8 @@ bool TranslationManager::translateFile(const std::string &fileName, return false; int contentsLength; - const ResourceManager *const resman = ResourceManager::getInstance(); char *fileContents = static_cast<char*>( - resman->loadFile(fileName, contentsLength)); + PhysFs::loadFile(fileName, contentsLength)); if (!fileContents) { |