From 0fd434e3102a5aad5e6f24cf384f03c527ce7c04 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 19 May 2014 15:57:00 +0300 Subject: Move itemdb stat into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/resources/db/itemdb.h | 14 ++----------- src/resources/db/itemdbstat.h | 48 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 52 insertions(+), 12 deletions(-) create mode 100644 src/resources/db/itemdbstat.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 04aeae206..471cac4da 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -552,6 +552,7 @@ SET(SRCS resources/imagewriter.h resources/db/itemdb.cpp resources/db/itemdb.h + resources/db/itemdbstat.h resources/iteminfo.h resources/iteminfo.cpp resources/itemslot.h diff --git a/src/Makefile.am b/src/Makefile.am index ed3268b23..5b9099e8f 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -661,6 +661,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ resources/imagewriter.h \ resources/db/itemdb.cpp \ resources/db/itemdb.h \ + resources/db/itemdbstat.h \ resources/iteminfo.h \ resources/iteminfo.cpp \ resources/itemslot.h \ diff --git a/src/resources/db/itemdb.h b/src/resources/db/itemdb.h index 8a113cf6c..5328ecc59 100644 --- a/src/resources/db/itemdb.h +++ b/src/resources/db/itemdb.h @@ -25,6 +25,8 @@ #include "utils/stringvector.h" +#include "resources/db/itemdbstat.h" + #include #include "localconsts.h" @@ -57,18 +59,6 @@ namespace ItemDB int getTagId(const std::string &tagName) A_WARN_UNUSED; - struct Stat - { - Stat(const std::string &tag0, - const std::string &format0) : - tag(tag0), - format(format0) - {} - - std::string tag; - std::string format; - }; - void setStatsList(const std::vector &stats); } // namespace ItemDB diff --git a/src/resources/db/itemdbstat.h b/src/resources/db/itemdbstat.h new file mode 100644 index 000000000..3b5d50bb5 --- /dev/null +++ b/src/resources/db/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-2014 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-70-g09d2