diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/fs/virtfs/rwops.cpp (renamed from src/fs/virtfs/virtfsrwops.cpp) | 2 | ||||
| -rw-r--r-- | src/fs/virtfs/rwops.h (renamed from src/fs/virtfs/virtfsrwops.h) | 0 | ||||
| -rw-r--r-- | src/fs/virtfs/virtfs1_unittest.cc | 2 | ||||
| -rw-r--r-- | src/integrity_unittest.cc | 2 | ||||
| -rw-r--r-- | src/resources/atlas/atlasmanager.cpp | 2 | ||||
| -rw-r--r-- | src/resources/loaders/imageloader.cpp | 2 | ||||
| -rw-r--r-- | src/resources/loaders/musicloader.cpp | 2 | ||||
| -rw-r--r-- | src/resources/loaders/soundloader.cpp | 2 | ||||
| -rw-r--r-- | src/test/testlauncher.cpp | 2 |
11 files changed, 14 insertions, 14 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c62b11eba..71ca2aa29 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -891,8 +891,8 @@ SET(SRCS utils/perfomance.cpp utils/perfomance.h fs/virtfs/fsfuncs.h - fs/virtfs/virtfsrwops.cpp - fs/virtfs/virtfsrwops.h + fs/virtfs/rwops.cpp + fs/virtfs/rwops.h fs/virtfs/tools.cpp fs/virtfs/tools.h fs/virtfs/virtlist.cpp @@ -1800,8 +1800,8 @@ SET(DYE_CMD_SRCS utils/perfomance.cpp utils/perfomance.h fs/virtfs/fsfuncs.h - fs/virtfs/virtfsrwops.cpp - fs/virtfs/virtfsrwops.h + fs/virtfs/rwops.cpp + fs/virtfs/rwops.h fs/virtfs/tools.cpp fs/virtfs/tools.h fs/virtfs/virtlist.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 9684fab6b..b4c8e3e21 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -579,8 +579,8 @@ BASE_SRC += events/actionevent.h \ utils/perfomance.cpp \ utils/perfomance.h \ fs/virtfs/fsfuncs.h \ - fs/virtfs/virtfsrwops.cpp \ - fs/virtfs/virtfsrwops.h \ + fs/virtfs/rwops.cpp \ + fs/virtfs/rwops.h \ fs/virtfs/tools.cpp \ fs/virtfs/tools.h \ fs/virtfs/virtlist.cpp \ diff --git a/src/fs/virtfs/virtfsrwops.cpp b/src/fs/virtfs/rwops.cpp index 48a446928..854c5510d 100644 --- a/src/fs/virtfs/virtfsrwops.cpp +++ b/src/fs/virtfs/rwops.cpp @@ -42,7 +42,7 @@ * Copyright (C) 2012-2017 The ManaPlus Developers */ -#include "fs/virtfs/virtfsrwops.h" +#include "fs/virtfs/rwops.h" #include "logger.h" diff --git a/src/fs/virtfs/virtfsrwops.h b/src/fs/virtfs/rwops.h index 7be265ad2..7be265ad2 100644 --- a/src/fs/virtfs/virtfsrwops.h +++ b/src/fs/virtfs/rwops.h diff --git a/src/fs/virtfs/virtfs1_unittest.cc b/src/fs/virtfs/virtfs1_unittest.cc index dc8a610eb..b4bdcbb09 100644 --- a/src/fs/virtfs/virtfs1_unittest.cc +++ b/src/fs/virtfs/virtfs1_unittest.cc @@ -24,7 +24,7 @@ #include "fs/virtfs/direntry.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfs/virtfsrwops.h" +#include "fs/virtfs/rwops.h" #include "fs/virtfs/virtlist.h" #include "utils/checkutils.h" diff --git a/src/integrity_unittest.cc b/src/integrity_unittest.cc index 41a57f41d..955c0457f 100644 --- a/src/integrity_unittest.cc +++ b/src/integrity_unittest.cc @@ -28,7 +28,7 @@ #include "fs/files.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfs/virtfsrwops.h" +#include "fs/virtfs/rwops.h" #include "gui/gui.h" diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp index 7b7ab4536..8a9991714 100644 --- a/src/resources/atlas/atlasmanager.cpp +++ b/src/resources/atlas/atlasmanager.cpp @@ -28,7 +28,7 @@ #include "logger.h" #endif // DEBUG_IMAGES -#include "fs/virtfs/virtfsrwops.h" +#include "fs/virtfs/rwops.h" #include "utils/mathutils.h" #include "utils/sdlcheckutils.h" diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp index 5ae883886..268466654 100644 --- a/src/resources/loaders/imageloader.cpp +++ b/src/resources/loaders/imageloader.cpp @@ -22,7 +22,7 @@ #include "resources/imagehelper.h" -#include "fs/virtfs/virtfsrwops.h" +#include "fs/virtfs/rwops.h" #include "resources/image/image.h" diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp index 1e5ceaff7..3c6c7e1c2 100644 --- a/src/resources/loaders/musicloader.cpp +++ b/src/resources/loaders/musicloader.cpp @@ -22,7 +22,7 @@ #include "resources/sdlmusic.h" -#include "fs/virtfs/virtfsrwops.h" +#include "fs/virtfs/rwops.h" #include "resources/loaders/musicloader.h" diff --git a/src/resources/loaders/soundloader.cpp b/src/resources/loaders/soundloader.cpp index 819e3d140..bbab6d6ee 100644 --- a/src/resources/loaders/soundloader.cpp +++ b/src/resources/loaders/soundloader.cpp @@ -22,7 +22,7 @@ #include "resources/soundeffect.h" -#include "fs/virtfs/virtfsrwops.h" +#include "fs/virtfs/rwops.h" #include "resources/loaders/soundloader.h" diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp index ffb183cd0..64ea181fb 100644 --- a/src/test/testlauncher.cpp +++ b/src/test/testlauncher.cpp @@ -26,7 +26,7 @@ #include "settings.h" #include "soundmanager.h" -#include "fs/virtfs/virtfsrwops.h" +#include "fs/virtfs/rwops.h" #include "gui/skin.h" #include "gui/theme.h" |