From b66361dc7e3d831c3f3d27eca30a675b18b2d73b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 5 May 2017 01:56:37 +0300 Subject: Rename virtdirentry into direntry. --- src/CMakeLists.txt | 8 +++---- src/Makefile.am | 4 ++-- src/fs/virtfs/direntry.cpp | 41 ++++++++++++++++++++++++++++++++++ src/fs/virtfs/direntry.h | 46 +++++++++++++++++++++++++++++++++++++++ src/fs/virtfs/virtdirentry.cpp | 41 ---------------------------------- src/fs/virtfs/virtdirentry.h | 46 --------------------------------------- src/fs/virtfs/virtfs.cpp | 2 +- src/fs/virtfs/virtfs1_unittest.cc | 2 +- src/fs/virtfs/virtfsdir.cpp | 2 +- 9 files changed, 96 insertions(+), 96 deletions(-) create mode 100644 src/fs/virtfs/direntry.cpp create mode 100644 src/fs/virtfs/direntry.h delete mode 100644 src/fs/virtfs/virtdirentry.cpp delete mode 100644 src/fs/virtfs/virtdirentry.h 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/direntry.cpp b/src/fs/virtfs/direntry.cpp new file mode 100644 index 000000000..5616a6577 --- /dev/null +++ b/src/fs/virtfs/direntry.cpp @@ -0,0 +1,41 @@ +/* + * The ManaPlus Client + * Copyright (C) 2017 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include "fs/virtfs/direntry.h" + +#include "debug.h" + +namespace VirtFs +{ + +DirEntry::DirEntry(const std::string &userDir0, + const std::string &rootDir, + VirtFsFuncs *restrict const funcs0) : + VirtFsEntry(FsEntryType::Dir, funcs0), + userDir(userDir0) +{ + root = rootDir; +} + +DirEntry::~DirEntry() +{ +} + +} // namespace VirtFs diff --git a/src/fs/virtfs/direntry.h b/src/fs/virtfs/direntry.h new file mode 100644 index 000000000..fa5eabb16 --- /dev/null +++ b/src/fs/virtfs/direntry.h @@ -0,0 +1,46 @@ +/* + * The ManaPlus Client + * Copyright (C) 2017 The ManaPlus Developers + * + * This file is part of The ManaPlus Client. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef UTILS_VIRTDIRENTRY_H +#define UTILS_VIRTDIRENTRY_H + +#include "fs/virtfs/virtfsentry.h" + +#include "localconsts.h" + +namespace VirtFs +{ + +struct DirEntry final : public VirtFsEntry +{ + DirEntry(const std::string &userDir, + const std::string &rootDir, + VirtFsFuncs *restrict const funcs); + + A_DELETE_COPY(DirEntry) + + ~DirEntry(); + + std::string userDir; +}; + +} // namespace VirtFs + +#endif // UTILS_VIRTDIRENTRY_H diff --git a/src/fs/virtfs/virtdirentry.cpp b/src/fs/virtfs/virtdirentry.cpp deleted file mode 100644 index d66b8bb5a..000000000 --- a/src/fs/virtfs/virtdirentry.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#include "fs/virtfs/virtdirentry.h" - -#include "debug.h" - -namespace VirtFs -{ - -DirEntry::DirEntry(const std::string &userDir0, - const std::string &rootDir, - VirtFsFuncs *restrict const funcs0) : - VirtFsEntry(FsEntryType::Dir, funcs0), - userDir(userDir0) -{ - root = rootDir; -} - -DirEntry::~DirEntry() -{ -} - -} // namespace VirtFs diff --git a/src/fs/virtfs/virtdirentry.h b/src/fs/virtfs/virtdirentry.h deleted file mode 100644 index fa5eabb16..000000000 --- a/src/fs/virtfs/virtdirentry.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2017 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef UTILS_VIRTDIRENTRY_H -#define UTILS_VIRTDIRENTRY_H - -#include "fs/virtfs/virtfsentry.h" - -#include "localconsts.h" - -namespace VirtFs -{ - -struct DirEntry final : public VirtFsEntry -{ - DirEntry(const std::string &userDir, - const std::string &rootDir, - VirtFsFuncs *restrict const funcs); - - A_DELETE_COPY(DirEntry) - - ~DirEntry(); - - std::string userDir; -}; - -} // namespace VirtFs - -#endif // UTILS_VIRTDIRENTRY_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" -- cgit v1.2.3-60-g2f50