diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:08:06 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:08:06 +0200 |
| commit | fbe76102e941b9f1edaf236788e42678f05fdf9a (patch) | |
| tree | f5f538316019fa89be8dc478103490c3a826f3ac /library/resources.cpp | |
| parent | 3.8 (diff) | |
| download | FreeFileSync-fbe76102e941b9f1edaf236788e42678f05fdf9a.tar.gz FreeFileSync-fbe76102e941b9f1edaf236788e42678f05fdf9a.tar.bz2 FreeFileSync-fbe76102e941b9f1edaf236788e42678f05fdf9a.zip | |
3.9
Diffstat (limited to 'library/resources.cpp')
| -rw-r--r-- | library/resources.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/library/resources.cpp b/library/resources.cpp index 2104efc3..637dfea3 100644 --- a/library/resources.cpp +++ b/library/resources.cpp @@ -10,12 +10,12 @@ #include <wx/image.h> #include <wx/icon.h> #include <wx/mstream.h> -#include "../shared/stringConv.h" -#include "../shared/systemConstants.h" +#include "../shared/string_conv.h" +#include "../shared/system_constants.h" #include <memory> -#include "../shared/standardPaths.h" +#include "../shared/standard_paths.h" -using namespace FreeFileSync; +using namespace ffs3; const GlobalResources& GlobalResources::getInstance() @@ -67,7 +67,7 @@ void loadAnimFromZip(wxZipInputStream& zipInput, wxAnimation* animation) void GlobalResources::load() const { - wxFFileInputStream input(FreeFileSync::getResourceDir() + wxT("Resources.dat")); + wxFFileInputStream input(ffs3::getResourceDir() + wxT("Resources.dat")); if (input.IsOk()) //if not... we don't want to react too harsh here { //activate support for .png files |