summaryrefslogtreecommitdiff
path: root/library/resources.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'library/resources.cpp')
-rw-r--r--library/resources.cpp10
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
bgstack15