From 370a8245ae3fbbfe449000b6bdaab366d08d925e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 29 Jun 2016 20:55:14 +0300 Subject: Move itemdbstat.h from db into resources directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/resources/db/itemdb.cpp | 2 +- src/resources/db/itemdbstat.h | 48 ------------------------------------------- src/resources/db/statdb.h | 2 +- src/resources/itemdbstat.h | 48 +++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 52 insertions(+), 52 deletions(-) delete mode 100644 src/resources/db/itemdbstat.h create mode 100644 src/resources/itemdbstat.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7080937b4..69de475f3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -660,7 +660,7 @@ SET(SRCS resources/imagewriter.h resources/db/itemdb.cpp resources/db/itemdb.h - resources/db/itemdbstat.h + resources/itemdbstat.h resources/db/itemfielddb.cpp resources/db/itemfielddb.h resources/iteminfo.h diff --git a/src/Makefile.am b/src/Makefile.am index 18975b618..d95601ad1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1228,7 +1228,7 @@ manaplus_SOURCES += main.cpp \ resources/db/horsedb.h \ resources/db/itemdb.cpp \ resources/db/itemdb.h \ - resources/db/itemdbstat.h \ + resources/itemdbstat.h \ resources/db/itemfielddb.cpp \ resources/db/itemfielddb.h \ resources/db/mapdb.cpp \ diff --git a/src/resources/db/itemdb.cpp b/src/resources/db/itemdb.cpp index 323412e08..b35290639 100644 --- a/src/resources/db/itemdb.cpp +++ b/src/resources/db/itemdb.cpp @@ -28,6 +28,7 @@ #include "enums/resources/spritedirection.h" +#include "resources/itemdbstat.h" #include "resources/iteminfo.h" #include "resources/itemtypemapdata.h" @@ -35,7 +36,6 @@ #include "resources/sprite/spritereference.h" -#include "resources/db/itemdbstat.h" #include "resources/db/itemfielddb.h" #include "resources/db/statdb.h" diff --git a/src/resources/db/itemdbstat.h b/src/resources/db/itemdbstat.h deleted file mode 100644 index 94e12f987..000000000 --- a/src/resources/db/itemdbstat.h +++ /dev/null @@ -1,48 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2004-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2016 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 RESOURCES_DB_ITEMDBSTAT_H -#define RESOURCES_DB_ITEMDBSTAT_H - -#include - -#include "localconsts.h" - -/** - * Item information database. - */ -namespace ItemDB -{ - struct Stat final - { - Stat(const std::string &tag0, - const std::string &format0) : - tag(tag0), - format(format0) - {} - - std::string tag; - std::string format; - }; -} // namespace ItemDB - -#endif // RESOURCES_DB_ITEMDBSTAT_H diff --git a/src/resources/db/statdb.h b/src/resources/db/statdb.h index 247c50ddb..475de6095 100644 --- a/src/resources/db/statdb.h +++ b/src/resources/db/statdb.h @@ -23,7 +23,7 @@ #include "enums/simpletypes/skiperror.h" -#include "resources/db/itemdbstat.h" +#include "resources/itemdbstat.h" #include #include diff --git a/src/resources/itemdbstat.h b/src/resources/itemdbstat.h new file mode 100644 index 000000000..94e12f987 --- /dev/null +++ b/src/resources/itemdbstat.h @@ -0,0 +1,48 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2016 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 RESOURCES_DB_ITEMDBSTAT_H +#define RESOURCES_DB_ITEMDBSTAT_H + +#include + +#include "localconsts.h" + +/** + * Item information database. + */ +namespace ItemDB +{ + struct Stat final + { + Stat(const std::string &tag0, + const std::string &format0) : + tag(tag0), + format(format0) + {} + + std::string tag; + std::string format; + }; +} // namespace ItemDB + +#endif // RESOURCES_DB_ITEMDBSTAT_H -- cgit v1.2.3-60-g2f50