diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-03-28 18:51:40 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-03-28 18:51:40 +0300 |
| commit | f04a6cae9a280190beb7d1a8ec0798afeb3390a1 (patch) | |
| tree | ff3e62d4459ec367344c17d02568208a56369e30 | |
| parent | 3b004486a0dbcdcb586b5f190aef980294729926 (diff) | |
| download | manaplus-f04a6cae9a280190beb7d1a8ec0798afeb3390a1.tar.gz manaplus-f04a6cae9a280190beb7d1a8ec0798afeb3390a1.tar.bz2 manaplus-f04a6cae9a280190beb7d1a8ec0798afeb3390a1.tar.xz manaplus-f04a6cae9a280190beb7d1a8ec0798afeb3390a1.zip | |
Move virtfsrwops into virtfs directory.
| -rw-r--r-- | src/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/fs/virtfs/virtfsrwops.cpp (renamed from src/fs/virtfsrwops.cpp) | 2 | ||||
| -rw-r--r-- | src/fs/virtfs/virtfsrwops.h (renamed from src/fs/virtfsrwops.h) | 0 | ||||
| -rw-r--r-- | src/integrity_unittest.cc | 2 | ||||
| -rw-r--r-- | src/maingui.cpp | 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 983f0e26b..e32e628db 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -884,8 +884,8 @@ SET(SRCS utils/perfomance.h utils/debugmemoryobject.h fs/virtfs/virtfsfuncs.h - fs/virtfsrwops.cpp - fs/virtfsrwops.h + fs/virtfs/virtfsrwops.cpp + fs/virtfs/virtfsrwops.h fs/virtfstools.cpp fs/virtfstools.h fs/virtlist.cpp @@ -1785,8 +1785,8 @@ SET(DYE_CMD_SRCS utils/perfomance.cpp utils/perfomance.h fs/virtfs/virtfsfuncs.h - fs/virtfsrwops.cpp - fs/virtfsrwops.h + fs/virtfs/virtfsrwops.cpp + fs/virtfs/virtfsrwops.h fs/virtfstools.cpp fs/virtfstools.h fs/virtlist.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 036a2770d..ef2cb3d0e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -571,8 +571,8 @@ BASE_SRC += events/actionevent.h \ utils/perfomance.h \ utils/debugmemoryobject.h \ fs/virtfs/virtfsfuncs.h \ - fs/virtfsrwops.cpp \ - fs/virtfsrwops.h \ + fs/virtfs/virtfsrwops.cpp \ + fs/virtfs/virtfsrwops.h \ fs/virtfstools.cpp \ fs/virtfstools.h \ fs/virtlist.cpp \ diff --git a/src/fs/virtfsrwops.cpp b/src/fs/virtfs/virtfsrwops.cpp index d44959f9a..0816b93eb 100644 --- a/src/fs/virtfsrwops.cpp +++ b/src/fs/virtfs/virtfsrwops.cpp @@ -42,7 +42,7 @@ * Copyright (C) 2012-2017 The ManaPlus Developers */ -#include "fs/virtfsrwops.h" +#include "fs/virtfs/virtfsrwops.h" #include "logger.h" diff --git a/src/fs/virtfsrwops.h b/src/fs/virtfs/virtfsrwops.h index 2703044df..2703044df 100644 --- a/src/fs/virtfsrwops.h +++ b/src/fs/virtfs/virtfsrwops.h diff --git a/src/integrity_unittest.cc b/src/integrity_unittest.cc index a2ef86a8a..cdd5fecab 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/virtfsrwops.h" +#include "fs/virtfs/virtfsrwops.h" #include "fs/virtfstools.h" #include "input/inputactionmap.h" diff --git a/src/maingui.cpp b/src/maingui.cpp index d281dee1d..3725ee59a 100644 --- a/src/maingui.cpp +++ b/src/maingui.cpp @@ -27,7 +27,7 @@ #include "settings.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfsrwops.h" +#include "fs/virtfs/virtfsrwops.h" #include "utils/delete2.h" #ifdef ANDROID diff --git a/src/resources/atlas/atlasmanager.cpp b/src/resources/atlas/atlasmanager.cpp index d64193ccd..79edf043e 100644 --- a/src/resources/atlas/atlasmanager.cpp +++ b/src/resources/atlas/atlasmanager.cpp @@ -29,7 +29,7 @@ #endif // DEBUG_IMAGES #include "fs/virtfs/virtfs.h" -#include "fs/virtfsrwops.h" +#include "fs/virtfs/virtfsrwops.h" #include "utils/mathutils.h" #include "utils/sdlcheckutils.h" diff --git a/src/resources/loaders/imageloader.cpp b/src/resources/loaders/imageloader.cpp index 198bfaa4e..c4bf47c72 100644 --- a/src/resources/loaders/imageloader.cpp +++ b/src/resources/loaders/imageloader.cpp @@ -23,7 +23,7 @@ #include "resources/imagehelper.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfsrwops.h" +#include "fs/virtfs/virtfsrwops.h" #include "resources/image/image.h" diff --git a/src/resources/loaders/musicloader.cpp b/src/resources/loaders/musicloader.cpp index 01b7bcbea..df9908da2 100644 --- a/src/resources/loaders/musicloader.cpp +++ b/src/resources/loaders/musicloader.cpp @@ -23,7 +23,7 @@ #include "resources/sdlmusic.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfsrwops.h" +#include "fs/virtfs/virtfsrwops.h" #include "resources/loaders/musicloader.h" diff --git a/src/resources/loaders/soundloader.cpp b/src/resources/loaders/soundloader.cpp index 654938d4e..9ee106e0c 100644 --- a/src/resources/loaders/soundloader.cpp +++ b/src/resources/loaders/soundloader.cpp @@ -23,7 +23,7 @@ #include "resources/soundeffect.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfsrwops.h" +#include "fs/virtfs/virtfsrwops.h" #include "resources/loaders/soundloader.h" diff --git a/src/test/testlauncher.cpp b/src/test/testlauncher.cpp index 7e3586d44..133c897fd 100644 --- a/src/test/testlauncher.cpp +++ b/src/test/testlauncher.cpp @@ -26,7 +26,7 @@ #include "settings.h" #include "soundmanager.h" -#include "fs/virtfsrwops.h" +#include "fs/virtfs/virtfsrwops.h" #include "gui/skin.h" #include "gui/theme.h" |