diff options
author | Andrei Karas <akaras@inbox.ru> | 2014-01-06 13:29:14 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2014-01-06 13:29:14 +0300 |
commit | 3cb15a8f777bd9907d8dc4ba57774c762ec1f67f (patch) | |
tree | ec991d4a6c5c9a528163dad15a284674d478e64b /src/gui | |
parent | 5ab85579f493e951d0042cd879cc848d4c7c871b (diff) | |
download | manaplus-3cb15a8f777bd9907d8dc4ba57774c762ec1f67f.tar.gz manaplus-3cb15a8f777bd9907d8dc4ba57774c762ec1f67f.tar.bz2 manaplus-3cb15a8f777bd9907d8dc4ba57774c762ec1f67f.tar.xz manaplus-3cb15a8f777bd9907d8dc4ba57774c762ec1f67f.zip |
simplify files enumerate function usage.
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/theme.cpp | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 760169d07..f329ada74 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -33,6 +33,7 @@ #include "resources/resourcemanager.h" #include "utils/dtor.h" +#include "utils/files.h" #include "utils/physfstools.h" #include <algorithm> @@ -649,37 +650,13 @@ bool Theme::tryThemePath(const std::string &themeName) void Theme::fillSkinsList(StringVect &list) { - char **skins = PhysFs::enumerateFiles( - branding.getStringValue("guiThemePath").c_str()); - - for (char **i = skins; *i; i++) - { - if (PhysFs::isDirectory(( - branding.getStringValue("guiThemePath") + *i).c_str())) - { - list.push_back(*i); - } - } - - PhysFs::freeList(skins); + Files::getFiles(branding.getStringValue("guiThemePath"), list); } void Theme::fillFontsList(StringVect &list) { PHYSFS_permitSymbolicLinks(1); - char **fonts = PhysFs::enumerateFiles( - branding.getStringValue("fontsPath").c_str()); - - for (char **i = fonts; *i; i++) - { - if (!PhysFs::isDirectory(( - branding.getStringValue("fontsPath") + *i).c_str())) - { - list.push_back(*i); - } - } - - PhysFs::freeList(fonts); + Files::getFiles(branding.getStringValue("fontsPath"), list); PHYSFS_permitSymbolicLinks(0); } |