summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-05-05 01:56:37 +0300
committerAndrei Karas <akaras@inbox.ru>2017-05-05 01:56:37 +0300
commitb66361dc7e3d831c3f3d27eca30a675b18b2d73b (patch)
treede32510f7577effd89f162cbb87447bce2b78478
parent9d1c9937a9e24e6d1ed52dedca4852e57f8c21a0 (diff)
downloadmanaplus-b66361dc7e3d831c3f3d27eca30a675b18b2d73b.tar.gz
manaplus-b66361dc7e3d831c3f3d27eca30a675b18b2d73b.tar.bz2
manaplus-b66361dc7e3d831c3f3d27eca30a675b18b2d73b.tar.xz
manaplus-b66361dc7e3d831c3f3d27eca30a675b18b2d73b.zip
Rename virtdirentry into direntry.
-rw-r--r--src/CMakeLists.txt8
-rw-r--r--src/Makefile.am4
-rw-r--r--src/fs/virtfs/direntry.cpp (renamed from src/fs/virtfs/virtdirentry.cpp)2
-rw-r--r--src/fs/virtfs/direntry.h (renamed from src/fs/virtfs/virtdirentry.h)0
-rw-r--r--src/fs/virtfs/virtfs.cpp2
-rw-r--r--src/fs/virtfs/virtfs1_unittest.cc2
-rw-r--r--src/fs/virtfs/virtfsdir.cpp2
7 files changed, 10 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 60c02047e..b15792876 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -900,8 +900,8 @@ SET(SRCS
fs/virtfs/virtfs.cpp
fs/virtfs/virtfs.h
fs/virtfs/rwopstypes.h
- fs/virtfs/virtdirentry.cpp
- fs/virtfs/virtdirentry.h
+ fs/virtfs/direntry.cpp
+ fs/virtfs/direntry.h
fs/virtfs/virtfsdir.cpp
fs/virtfs/virtfsdir.h
fs/virtfs/virtfsdirrwops.cpp
@@ -1809,8 +1809,8 @@ SET(DYE_CMD_SRCS
fs/virtfs/virtfs.cpp
fs/virtfs/virtfs.h
fs/virtfs/rwopstypes.h
- fs/virtfs/virtdirentry.cpp
- fs/virtfs/virtdirentry.h
+ fs/virtfs/direntry.cpp
+ fs/virtfs/direntry.h
fs/virtfs/virtfsdir.cpp
fs/virtfs/virtfsdir.h
fs/virtfs/virtfsdirrwops.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index a192366af..b9682f459 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -846,8 +846,8 @@ BASE_SRC += events/actionevent.h \
enums/fs/fsentrytype.h \
fs/virtfs/fileapi.h \
fs/virtfs/rwopstypes.h \
- fs/virtfs/virtdirentry.cpp \
- fs/virtfs/virtdirentry.h \
+ fs/virtfs/direntry.cpp \
+ fs/virtfs/direntry.h \
fs/virtfs/virtfs.cpp \
fs/virtfs/virtfs.h \
fs/virtfs/virtfsdir.cpp \
diff --git a/src/fs/virtfs/virtdirentry.cpp b/src/fs/virtfs/direntry.cpp
index d66b8bb5a..5616a6577 100644
--- a/src/fs/virtfs/virtdirentry.cpp
+++ b/src/fs/virtfs/direntry.cpp
@@ -18,7 +18,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "fs/virtfs/virtdirentry.h"
+#include "fs/virtfs/direntry.h"
#include "debug.h"
diff --git a/src/fs/virtfs/virtdirentry.h b/src/fs/virtfs/direntry.h
index fa5eabb16..fa5eabb16 100644
--- a/src/fs/virtfs/virtdirentry.h
+++ b/src/fs/virtfs/direntry.h
diff --git a/src/fs/virtfs/virtfs.cpp b/src/fs/virtfs/virtfs.cpp
index 3686b3606..d98a0b56a 100644
--- a/src/fs/virtfs/virtfs.cpp
+++ b/src/fs/virtfs/virtfs.cpp
@@ -23,7 +23,7 @@
#include "fs/files.h"
#include "fs/paths.h"
-#include "fs/virtfs/virtdirentry.h"
+#include "fs/virtfs/direntry.h"
#include "fs/virtfs/file.h"
#include "fs/virtfs/virtfsdir.h"
#include "fs/virtfs/virtfsfuncs.h"
diff --git a/src/fs/virtfs/virtfs1_unittest.cc b/src/fs/virtfs/virtfs1_unittest.cc
index 882cda31a..dc8a610eb 100644
--- a/src/fs/virtfs/virtfs1_unittest.cc
+++ b/src/fs/virtfs/virtfs1_unittest.cc
@@ -22,7 +22,7 @@
#include "fs/files.h"
-#include "fs/virtfs/virtdirentry.h"
+#include "fs/virtfs/direntry.h"
#include "fs/virtfs/virtfs.h"
#include "fs/virtfs/virtfsrwops.h"
#include "fs/virtfs/virtlist.h"
diff --git a/src/fs/virtfs/virtfsdir.cpp b/src/fs/virtfs/virtfsdir.cpp
index df0afbd05..df2511bf8 100644
--- a/src/fs/virtfs/virtfsdir.cpp
+++ b/src/fs/virtfs/virtfsdir.cpp
@@ -24,7 +24,7 @@
#include "fs/mkdir.h"
#include "fs/paths.h"
-#include "fs/virtfs/virtdirentry.h"
+#include "fs/virtfs/direntry.h"
#include "fs/virtfs/file.h"
#include "fs/virtfs/virtfsdirrwops.h"
#include "fs/virtfs/virtfsfuncs.h"