From 075d1ef24cbd6820d19f56c299838fd59469b4e4 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 28 Mar 2017 19:34:17 +0300 Subject: Move virtlist into virtfs directory. --- src/CMakeLists.txt | 8 ++++---- src/Makefile.am | 4 ++-- src/fs/files.cpp | 3 ++- src/fs/virtfs/virtfs.cpp | 2 +- src/fs/virtfs/virtfs_unittest.cc | 2 +- src/fs/virtfs/virtfsdir.cpp | 2 +- src/fs/virtfs/virtfstools.cpp | 2 +- src/fs/virtfs/virtfszip.cpp | 2 +- src/fs/virtfs/virtlist.cpp | 32 ++++++++++++++++++++++++++++++++ src/fs/virtfs/virtlist.h | 39 +++++++++++++++++++++++++++++++++++++++ src/fs/virtfs_unittest.cc | 2 +- src/fs/virtlist.cpp | 32 -------------------------------- src/fs/virtlist.h | 39 --------------------------------------- src/gui/theme.cpp | 2 +- src/resources/wallpaper.cpp | 2 +- 15 files changed, 87 insertions(+), 86 deletions(-) create mode 100644 src/fs/virtfs/virtlist.cpp create mode 100644 src/fs/virtfs/virtlist.h delete mode 100644 src/fs/virtlist.cpp delete mode 100644 src/fs/virtlist.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 50c0c3545..61ddc6332 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -888,8 +888,8 @@ SET(SRCS fs/virtfs/virtfsrwops.h fs/virtfs/virtfstools.cpp fs/virtfs/virtfstools.h - fs/virtlist.cpp - fs/virtlist.h + fs/virtfs/virtlist.cpp + fs/virtfs/virtlist.h fs/virtfs/virtfs.cpp fs/virtfs/virtfs.h fs/virtfs/virtdirentry.cpp @@ -1789,8 +1789,8 @@ SET(DYE_CMD_SRCS fs/virtfs/virtfsrwops.h fs/virtfs/virtfstools.cpp fs/virtfs/virtfstools.h - fs/virtlist.cpp - fs/virtlist.h + fs/virtfs/virtlist.cpp + fs/virtfs/virtlist.h fs/virtfs/virtfs.cpp fs/virtfs/virtfs.h fs/virtfs/virtdirentry.cpp diff --git a/src/Makefile.am b/src/Makefile.am index fe3d0793b..21eba0710 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -575,8 +575,8 @@ BASE_SRC += events/actionevent.h \ fs/virtfs/virtfsrwops.h \ fs/virtfs/virtfstools.cpp \ fs/virtfs/virtfstools.h \ - fs/virtlist.cpp \ - fs/virtlist.h \ + fs/virtfs/virtlist.cpp \ + fs/virtfs/virtlist.h \ utils/process.cpp \ utils/process.h \ utils/sdl2helper.cpp \ diff --git a/src/fs/files.cpp b/src/fs/files.cpp index 44ca4dc1d..91433e287 100644 --- a/src/fs/files.cpp +++ b/src/fs/files.cpp @@ -23,9 +23,10 @@ #include "fs/mkdir.h" #if defined(ANDROID) || defined(__native_client__) #include "fs/paths.h" + #include "fs/virtfs/virtfs.h" #include "fs/virtfs/virtfstools.h" -#include "fs/virtlist.h" +#include "fs/virtfs/virtlist.h" #endif // defined(ANDROID) || defined(__native_client__) #include "utils/checkutils.h" diff --git a/src/fs/virtfs/virtfs.cpp b/src/fs/virtfs/virtfs.cpp index 940bdb055..bab10197d 100644 --- a/src/fs/virtfs/virtfs.cpp +++ b/src/fs/virtfs/virtfs.cpp @@ -28,7 +28,7 @@ #include "fs/virtfs/virtfsdir.h" #include "fs/virtfs/virtfsfuncs.h" #include "fs/virtfs/virtfszip.h" -#include "fs/virtlist.h" +#include "fs/virtfs/virtlist.h" #include "fs/virtfs/virtzipentry.h" #include "fs/virtfs/zip.h" diff --git a/src/fs/virtfs/virtfs_unittest.cc b/src/fs/virtfs/virtfs_unittest.cc index 8e060b77f..902620303 100644 --- a/src/fs/virtfs/virtfs_unittest.cc +++ b/src/fs/virtfs/virtfs_unittest.cc @@ -25,7 +25,7 @@ #include "fs/virtfs/virtdirentry.h" #include "fs/virtfs/virtfs.h" #include "fs/virtfs/virtfstools.h" -#include "fs/virtlist.h" +#include "fs/virtfs/virtlist.h" #include "utils/checkutils.h" #include "utils/delete2.h" diff --git a/src/fs/virtfs/virtfsdir.cpp b/src/fs/virtfs/virtfsdir.cpp index 4e847f6cb..781182b8f 100644 --- a/src/fs/virtfs/virtfsdir.cpp +++ b/src/fs/virtfs/virtfsdir.cpp @@ -28,7 +28,7 @@ #include "fs/virtfs/virtfile.h" #include "fs/virtfs/virtfileprivate.h" #include "fs/virtfs/virtfsfuncs.h" -#include "fs/virtlist.h" +#include "fs/virtfs/virtlist.h" #include "utils/checkutils.h" #include "utils/stringutils.h" diff --git a/src/fs/virtfs/virtfstools.cpp b/src/fs/virtfs/virtfstools.cpp index 9d2260694..957b73e6e 100644 --- a/src/fs/virtfs/virtfstools.cpp +++ b/src/fs/virtfs/virtfstools.cpp @@ -25,7 +25,7 @@ #include "fs/paths.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtlist.h" +#include "fs/virtfs/virtlist.h" #include "utils/stringutils.h" diff --git a/src/fs/virtfs/virtfszip.cpp b/src/fs/virtfs/virtfszip.cpp index ce08b935b..78c294f85 100644 --- a/src/fs/virtfs/virtfszip.cpp +++ b/src/fs/virtfs/virtfszip.cpp @@ -23,7 +23,7 @@ #include "fs/virtfs/virtfile.h" #include "fs/virtfs/virtfileprivate.h" #include "fs/virtfs/virtfsfuncs.h" -#include "fs/virtlist.h" +#include "fs/virtfs/virtlist.h" #include "fs/virtfs/virtzipentry.h" #include "fs/virtfs/zip.h" #include "fs/virtfs/ziplocalheader.h" diff --git a/src/fs/virtfs/virtlist.cpp b/src/fs/virtfs/virtlist.cpp new file mode 100644 index 000000000..a2e8219f6 --- /dev/null +++ b/src/fs/virtfs/virtlist.cpp @@ -0,0 +1,32 @@ +/* + * 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/virtlist.h" + +#include "debug.h" + +VirtList::VirtList() : + names() +{ +} + +VirtList::~VirtList() +{ +} diff --git a/src/fs/virtfs/virtlist.h b/src/fs/virtfs/virtlist.h new file mode 100644 index 000000000..5b1d10924 --- /dev/null +++ b/src/fs/virtfs/virtlist.h @@ -0,0 +1,39 @@ +/* + * 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_VIRTLIST_H +#define UTILS_VIRTLIST_H + +#include "utils/stringvector.h" + +#include "localconsts.h" + +struct VirtList final +{ + VirtList(); + + A_DELETE_COPY(VirtList) + + ~VirtList(); + + StringVect names; +}; + +#endif // UTILS_VIRTLIST_H diff --git a/src/fs/virtfs_unittest.cc b/src/fs/virtfs_unittest.cc index 271a95c66..1bd815f2b 100644 --- a/src/fs/virtfs_unittest.cc +++ b/src/fs/virtfs_unittest.cc @@ -25,7 +25,7 @@ #include "fs/virtfs/virtfs.h" #include "fs/virtfs/virtfstools.h" -#include "fs/virtlist.h" +#include "fs/virtfs/virtlist.h" #include "utils/checkutils.h" #include "utils/delete2.h" diff --git a/src/fs/virtlist.cpp b/src/fs/virtlist.cpp deleted file mode 100644 index d561e6b66..000000000 --- a/src/fs/virtlist.cpp +++ /dev/null @@ -1,32 +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/virtlist.h" - -#include "debug.h" - -VirtList::VirtList() : - names() -{ -} - -VirtList::~VirtList() -{ -} diff --git a/src/fs/virtlist.h b/src/fs/virtlist.h deleted file mode 100644 index 5b1d10924..000000000 --- a/src/fs/virtlist.h +++ /dev/null @@ -1,39 +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_VIRTLIST_H -#define UTILS_VIRTLIST_H - -#include "utils/stringvector.h" - -#include "localconsts.h" - -struct VirtList final -{ - VirtList(); - - A_DELETE_COPY(VirtList) - - ~VirtList(); - - StringVect names; -}; - -#endif // UTILS_VIRTLIST_H diff --git a/src/gui/theme.cpp b/src/gui/theme.cpp index 6829971a1..bffd212f7 100644 --- a/src/gui/theme.cpp +++ b/src/gui/theme.cpp @@ -31,7 +31,7 @@ #include "fs/virtfs/virtfs.h" #include "fs/virtfs/virtfstools.h" -#include "fs/virtlist.h" +#include "fs/virtfs/virtlist.h" #include "gui/skin.h" #include "gui/themeinfo.h" diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp index 553e8c15b..79cb6bbbd 100644 --- a/src/resources/wallpaper.cpp +++ b/src/resources/wallpaper.cpp @@ -25,7 +25,7 @@ #include "configuration.h" #include "fs/virtfs/virtfs.h" -#include "fs/virtlist.h" +#include "fs/virtfs/virtlist.h" #include "resources/wallpaperdata.h" -- cgit v1.2.3-60-g2f50