From df287d79b978cdd97f6bf406bfbb19e2b32702d2 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 28 Mar 2017 18:36:17 +0300 Subject: Move virtfile into virtfs directory. --- src/CMakeLists.txt | 8 ++++---- src/Makefile.am | 4 ++-- src/fs/virtfile.cpp | 36 ------------------------------------ src/fs/virtfile.h | 41 ----------------------------------------- src/fs/virtfs/virtfile.cpp | 36 ++++++++++++++++++++++++++++++++++++ src/fs/virtfs/virtfile.h | 41 +++++++++++++++++++++++++++++++++++++++++ src/fs/virtfs/virtfs.cpp | 6 +++--- src/fs/virtfs/virtfsdir.cpp | 6 +++--- src/fs/virtfs/virtfszip.cpp | 5 ++--- 9 files changed, 91 insertions(+), 92 deletions(-) delete mode 100644 src/fs/virtfile.cpp delete mode 100644 src/fs/virtfile.h create mode 100644 src/fs/virtfs/virtfile.cpp create mode 100644 src/fs/virtfs/virtfile.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e71e47170..6532d0455 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -923,8 +923,8 @@ SET(SRCS utils/stringvector.h utils/timer.cpp utils/timer.h - fs/virtfile.cpp - fs/virtfile.h + fs/virtfs/virtfile.cpp + fs/virtfs/virtfile.h utils/mutex.h utils/naclmessages.cpp utils/naclmessages.h @@ -1820,8 +1820,8 @@ SET(DYE_CMD_SRCS utils/stringutils.h utils/timer.cpp utils/timer.h - fs/virtfile.cpp - fs/virtfile.h + fs/virtfs/virtfile.cpp + fs/virtfs/virtfile.h utils/xml.cpp utils/xml.h utils/xml.inc diff --git a/src/Makefile.am b/src/Makefile.am index 5ac464a5a..7a7c19b48 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -594,8 +594,8 @@ BASE_SRC += events/actionevent.h \ utils/stringvector.h \ utils/timer.cpp \ utils/timer.h \ - fs/virtfile.cpp \ - fs/virtfile.h \ + fs/virtfs/virtfile.cpp \ + fs/virtfs/virtfile.h \ utils/mutex.h \ utils/naclmessages.cpp \ utils/naclmessages.h \ diff --git a/src/fs/virtfile.cpp b/src/fs/virtfile.cpp deleted file mode 100644 index ff7be9627..000000000 --- a/src/fs/virtfile.cpp +++ /dev/null @@ -1,36 +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/virtfile.h" - -#include "fs/virtfs/virtfileprivate.h" - -#include "debug.h" - -VirtFile::VirtFile(const VirtFsFuncs *restrict const funcs0) : - funcs(funcs0), - mPrivate(nullptr) -{ -} - -VirtFile::~VirtFile() -{ - delete mPrivate; -} diff --git a/src/fs/virtfile.h b/src/fs/virtfile.h deleted file mode 100644 index 1cb819a6a..000000000 --- a/src/fs/virtfile.h +++ /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 . - */ - -#ifndef UTILS_VIRTFILE_H -#define UTILS_VIRTFILE_H - -#include "localconsts.h" - -struct VirtFilePrivate; -struct VirtFsFuncs; - -struct VirtFile final -{ - explicit VirtFile(const VirtFsFuncs *restrict const funcs0); - - A_DELETE_COPY(VirtFile) - - ~VirtFile(); - - const VirtFsFuncs *funcs; - VirtFilePrivate *mPrivate; -}; - -#endif // UTILS_VIRTFILE_H diff --git a/src/fs/virtfs/virtfile.cpp b/src/fs/virtfs/virtfile.cpp new file mode 100644 index 000000000..b60db8c99 --- /dev/null +++ b/src/fs/virtfs/virtfile.cpp @@ -0,0 +1,36 @@ +/* + * 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/virtfile.h" + +#include "fs/virtfs/virtfileprivate.h" + +#include "debug.h" + +VirtFile::VirtFile(const VirtFsFuncs *restrict const funcs0) : + funcs(funcs0), + mPrivate(nullptr) +{ +} + +VirtFile::~VirtFile() +{ + delete mPrivate; +} diff --git a/src/fs/virtfs/virtfile.h b/src/fs/virtfs/virtfile.h new file mode 100644 index 000000000..1cb819a6a --- /dev/null +++ b/src/fs/virtfs/virtfile.h @@ -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 . + */ + +#ifndef UTILS_VIRTFILE_H +#define UTILS_VIRTFILE_H + +#include "localconsts.h" + +struct VirtFilePrivate; +struct VirtFsFuncs; + +struct VirtFile final +{ + explicit VirtFile(const VirtFsFuncs *restrict const funcs0); + + A_DELETE_COPY(VirtFile) + + ~VirtFile(); + + const VirtFsFuncs *funcs; + VirtFilePrivate *mPrivate; +}; + +#endif // UTILS_VIRTFILE_H diff --git a/src/fs/virtfs/virtfs.cpp b/src/fs/virtfs/virtfs.cpp index 8718a9738..19e42fab7 100644 --- a/src/fs/virtfs/virtfs.cpp +++ b/src/fs/virtfs/virtfs.cpp @@ -22,13 +22,13 @@ #include "fs/files.h" #include "fs/paths.h" -#include "fs/virtfile.h" -#include "fs/virtfsfuncs.h" -#include "fs/virtlist.h" #include "fs/virtfs/virtdirentry.h" +#include "fs/virtfs/virtfile.h" #include "fs/virtfs/virtfsdir.h" +#include "fs/virtfsfuncs.h" #include "fs/virtfs/virtfszip.h" +#include "fs/virtlist.h" #include "fs/virtfs/virtzipentry.h" #include "fs/virtfs/zip.h" diff --git a/src/fs/virtfs/virtfsdir.cpp b/src/fs/virtfs/virtfsdir.cpp index 357702de6..ba1961649 100644 --- a/src/fs/virtfs/virtfsdir.cpp +++ b/src/fs/virtfs/virtfsdir.cpp @@ -23,12 +23,12 @@ #include "fs/files.h" #include "fs/mkdir.h" #include "fs/paths.h" -#include "fs/virtfile.h" -#include "fs/virtfsfuncs.h" -#include "fs/virtlist.h" #include "fs/virtfs/virtdirentry.h" +#include "fs/virtfs/virtfile.h" #include "fs/virtfs/virtfileprivate.h" +#include "fs/virtfsfuncs.h" +#include "fs/virtlist.h" #include "utils/checkutils.h" #include "utils/stringutils.h" diff --git a/src/fs/virtfs/virtfszip.cpp b/src/fs/virtfs/virtfszip.cpp index e9414136f..a28f4d89f 100644 --- a/src/fs/virtfs/virtfszip.cpp +++ b/src/fs/virtfs/virtfszip.cpp @@ -20,11 +20,10 @@ #include "fs/virtfs/virtfszip.h" +#include "fs/virtfs/virtfile.h" +#include "fs/virtfs/virtfileprivate.h" #include "fs/virtfsfuncs.h" -#include "fs/virtfile.h" #include "fs/virtlist.h" - -#include "fs/virtfs/virtfileprivate.h" #include "fs/virtfs/virtzipentry.h" #include "fs/virtfs/zip.h" #include "fs/virtfs/ziplocalheader.h" -- cgit v1.2.3-60-g2f50