From 2ae376534b1d681ad813b2b12160fd486419fc1b Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 24 May 2015 16:16:49 +0300 Subject: Move type Identified into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/enums/simpletypes/identified.h | 28 ++++++++++++++++++++++++++++ src/enums/simpletypes/simpletypes.h | 1 - src/gui/windows/tradewindow.h | 2 ++ src/inventory.h | 1 + src/item.h | 1 + 7 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 src/enums/simpletypes/identified.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 61ae9e862..9715737d8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1055,6 +1055,7 @@ SET(SRCS sprite.h enums/screendensity.h enums/state.h + enums/simpletypes/identified.h enums/simpletypes/simpledefines.h enums/simpletypes/simpletypes.h statuseffect.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 535c8ac0e..f69ae37ce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1183,6 +1183,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ sprite.h \ enums/screendensity.h \ enums/state.h \ + enums/simpletypes/identified.h \ enums/simpletypes/simpledefines.h \ enums/simpletypes/simpletypes.h \ statuseffect.cpp \ diff --git a/src/enums/simpletypes/identified.h b/src/enums/simpletypes/identified.h new file mode 100644 index 000000000..ecc8b2d1b --- /dev/null +++ b/src/enums/simpletypes/identified.h @@ -0,0 +1,28 @@ +/* + * The ManaPlus Client + * Copyright (C) 2015 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 ENUMS_SIMPLETYPES_IDENTIFIED_H +#define ENUMS_SIMPLETYPES_IDENTIFIED_H + +#include "enums/simpletypes/simpledefines.h" + +defBoolEnum(Identified); + +#endif // ENUMS_SIMPLETYPES_IDENTIFIED_H diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h index 9fb0a553c..1dc1fb5cb 100644 --- a/src/enums/simpletypes/simpletypes.h +++ b/src/enums/simpletypes/simpletypes.h @@ -25,7 +25,6 @@ #include "localconsts.h" -defBoolEnum(Identified); defBoolEnum(Damaged); defBoolEnum(Favorite); defBoolEnum(Equipm); diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h index 6c5745c66..1d0413598 100644 --- a/src/gui/windows/tradewindow.h +++ b/src/gui/windows/tradewindow.h @@ -25,6 +25,8 @@ #include "gui/widgets/window.h" +#include "enums/simpletypes/identified.h" + #include "listeners/actionlistener.h" #include "listeners/selectionlistener.h" diff --git a/src/inventory.h b/src/inventory.h index 7e2f63727..fb4bef1b6 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -25,6 +25,7 @@ #include "enums/inventorytype.h" +#include "enums/simpletypes/identified.h" #include "enums/simpletypes/simpletypes.h" #include "enums/being/gender.h" diff --git a/src/item.h b/src/item.h index 94af1ccdc..5607c9f21 100644 --- a/src/item.h +++ b/src/item.h @@ -23,6 +23,7 @@ #ifndef ITEM_H #define ITEM_H +#include "enums/simpletypes/identified.h" #include "enums/simpletypes/simpletypes.h" #include "resources/db/itemdb.h" -- cgit v1.2.3-60-g2f50