diff options
-rw-r--r-- | src/CMakeLists.txt | 8 | ||||
-rw-r--r-- | src/Makefile.am | 4 | ||||
-rw-r--r-- | src/client.cpp | 2 | ||||
-rw-r--r-- | src/dyetool/client.cpp | 2 | ||||
-rw-r--r-- | src/fs/files.cpp | 2 | ||||
-rw-r--r-- | src/fs/files_unittest.cc | 2 | ||||
-rw-r--r-- | src/fs/virtfs/tools.cpp (renamed from src/fs/virtfs/virtfstools.cpp) | 2 | ||||
-rw-r--r-- | src/fs/virtfs/tools.h (renamed from src/fs/virtfs/virtfstools.h) | 0 | ||||
-rw-r--r-- | src/gui/fonts/font.cpp | 2 | ||||
-rw-r--r-- | src/gui/windowmanager.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/chatwindow.cpp | 2 | ||||
-rw-r--r-- | src/gui/windows/helpwindow.cpp | 2 | ||||
-rw-r--r-- | src/render/shaders/shadersmanager.cpp | 2 | ||||
-rw-r--r-- | src/resources/beingcommon.h | 2 | ||||
-rw-r--r-- | src/resources/db/badgesdb.cpp | 2 | ||||
-rw-r--r-- | src/resources/db/itemdb.cpp | 2 | ||||
-rw-r--r-- | src/resources/db/palettedb.cpp | 2 |
17 files changed, 20 insertions, 20 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index def79d5a9..c62b11eba 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -893,8 +893,8 @@ SET(SRCS fs/virtfs/fsfuncs.h fs/virtfs/virtfsrwops.cpp fs/virtfs/virtfsrwops.h - fs/virtfs/virtfstools.cpp - fs/virtfs/virtfstools.h + fs/virtfs/tools.cpp + fs/virtfs/tools.h fs/virtfs/virtlist.cpp fs/virtfs/virtlist.h fs/virtfs/virtfs.cpp @@ -1802,8 +1802,8 @@ SET(DYE_CMD_SRCS fs/virtfs/fsfuncs.h fs/virtfs/virtfsrwops.cpp fs/virtfs/virtfsrwops.h - fs/virtfs/virtfstools.cpp - fs/virtfs/virtfstools.h + fs/virtfs/tools.cpp + fs/virtfs/tools.h fs/virtfs/virtlist.cpp fs/virtfs/virtlist.h fs/virtfs/virtfs.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 706bee1b0..9684fab6b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -581,8 +581,8 @@ BASE_SRC += events/actionevent.h \ fs/virtfs/fsfuncs.h \ fs/virtfs/virtfsrwops.cpp \ fs/virtfs/virtfsrwops.h \ - fs/virtfs/virtfstools.cpp \ - fs/virtfs/virtfstools.h \ + fs/virtfs/tools.cpp \ + fs/virtfs/tools.h \ fs/virtfs/virtlist.cpp \ fs/virtfs/virtlist.h \ utils/process.cpp \ diff --git a/src/client.cpp b/src/client.cpp index 21ea23ce1..a47d68098 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -43,7 +43,7 @@ #include "enums/being/attributesstrings.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfs/virtfstools.h" +#include "fs/virtfs/tools.h" #include "gui/dialogsmanager.h" #include "gui/gui.h" diff --git a/src/dyetool/client.cpp b/src/dyetool/client.cpp index 0815272d4..9c33b2edd 100644 --- a/src/dyetool/client.cpp +++ b/src/dyetool/client.cpp @@ -31,7 +31,7 @@ #include "soundmanager.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfs/virtfstools.h" +#include "fs/virtfs/tools.h" #include "gui/dialogsmanager.h" #include "gui/gui.h" diff --git a/src/fs/files.cpp b/src/fs/files.cpp index 320e7e2d7..e805a5f1a 100644 --- a/src/fs/files.cpp +++ b/src/fs/files.cpp @@ -25,7 +25,7 @@ #include "fs/paths.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfs/virtfstools.h" +#include "fs/virtfs/tools.h" #include "fs/virtfs/virtlist.h" #endif // defined(ANDROID) || defined(__native_client__) diff --git a/src/fs/files_unittest.cc b/src/fs/files_unittest.cc index f44cadb7b..be3cf9256 100644 --- a/src/fs/files_unittest.cc +++ b/src/fs/files_unittest.cc @@ -24,7 +24,7 @@ #include "logger.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtfs/virtfstools.h" +#include "fs/virtfs/tools.h" #include "utils/delete2.h" #include "utils/stringutils.h" diff --git a/src/fs/virtfs/virtfstools.cpp b/src/fs/virtfs/tools.cpp index af44b34e8..6573e6141 100644 --- a/src/fs/virtfs/virtfstools.cpp +++ b/src/fs/virtfs/tools.cpp @@ -18,7 +18,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "fs/virtfs/virtfstools.h" +#include "fs/virtfs/tools.h" #include "logger.h" diff --git a/src/fs/virtfs/virtfstools.h b/src/fs/virtfs/tools.h index f00a976bb..f00a976bb 100644 --- a/src/fs/virtfs/virtfstools.h +++ b/src/fs/virtfs/tools.h diff --git a/src/gui/fonts/font.cpp b/src/gui/fonts/font.cpp index c4af92717..70adce617 100644 --- a/src/gui/fonts/font.cpp +++ b/src/gui/fonts/font.cpp @@ -69,7 +69,7 @@ #include "fs/files.h" #include "fs/paths.h" -#include "fs/virtfs/virtfstools.h" +#include "fs/virtfs/tools.h" #include "gui/fonts/textchunk.h" diff --git a/src/gui/windowmanager.cpp b/src/gui/windowmanager.cpp index 20e2f0b8b..ffc3e6593 100644 --- a/src/gui/windowmanager.cpp +++ b/src/gui/windowmanager.cpp @@ -29,7 +29,7 @@ #include "settings.h" #include "spellmanager.h" -#include "fs/virtfs/virtfstools.h" +#include "fs/virtfs/tools.h" #include "gui/gui.h" #include "gui/userpalette.h" diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 0b58b88fc..1e10c08bb 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -35,7 +35,7 @@ #include "const/gui/chat.h" -#include "fs/virtfs/virtfstools.h" +#include "fs/virtfs/tools.h" #include "input/inputmanager.h" diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp index d0aa30b42..226284a35 100644 --- a/src/gui/windows/helpwindow.cpp +++ b/src/gui/windows/helpwindow.cpp @@ -28,7 +28,7 @@ #include "fs/paths.h" -#include "fs/virtfs/virtfstools.h" +#include "fs/virtfs/tools.h" #include "gui/gui.h" diff --git a/src/render/shaders/shadersmanager.cpp b/src/render/shaders/shadersmanager.cpp index 8b0d89269..1180ae880 100644 --- a/src/render/shaders/shadersmanager.cpp +++ b/src/render/shaders/shadersmanager.cpp @@ -25,7 +25,7 @@ #include "configuration.h" #include "logger.h" -#include "fs/virtfs/virtfstools.h" +#include "fs/virtfs/tools.h" #include "render/opengl/mgl.h" #ifdef __native_client__ diff --git a/src/resources/beingcommon.h b/src/resources/beingcommon.h index caa1f4c9a..4299d7707 100644 --- a/src/resources/beingcommon.h +++ b/src/resources/beingcommon.h @@ -21,7 +21,7 @@ #ifndef RESOURCES_BEINGCOMMON_H #define RESOURCES_BEINGCOMMON_H -#include "fs/virtfs/virtfstools.h" +#include "fs/virtfs/tools.h" #include "utils/xml.h" diff --git a/src/resources/db/badgesdb.cpp b/src/resources/db/badgesdb.cpp index f4939ca17..4b6bd85d2 100644 --- a/src/resources/db/badgesdb.cpp +++ b/src/resources/db/badgesdb.cpp @@ -22,7 +22,7 @@ #include "configuration.h" -#include "fs/virtfs/virtfstools.h" +#include "fs/virtfs/tools.h" #include "utils/xmlutils.h" diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index 12615a1a1..4bd68c42e 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -28,7 +28,7 @@ #include "enums/resources/spritedirection.h" -#include "fs/virtfs/virtfstools.h" +#include "fs/virtfs/tools.h" #include "resources/iteminfo.h" #include "resources/itemtypemapdata.h" diff --git a/src/resources/db/palettedb.cpp b/src/resources/db/palettedb.cpp index 90354b2fe..f6f54a875 100644 --- a/src/resources/db/palettedb.cpp +++ b/src/resources/db/palettedb.cpp @@ -22,7 +22,7 @@ #include "configuration.h" -#include "fs/virtfs/virtfstools.h" +#include "fs/virtfs/tools.h" #include "utils/checkutils.h" |