From beebdb815e17a45b9ffb6bd455135725e37a9954 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 24 May 2015 20:02:08 +0300 Subject: Move type Enable into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/being/actorsprite.h | 2 ++ src/enums/simpletypes/enable.h | 28 ++++++++++++++++++++++++++++ src/enums/simpletypes/simpletypes.h | 1 - src/gui/widgets/inttextfield.h | 1 + src/statuseffect.h | 1 + 7 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 src/enums/simpletypes/enable.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 14d54e49e..4da865be0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1058,6 +1058,7 @@ SET(SRCS enums/simpletypes/allowsort.h enums/simpletypes/allplayers.h enums/simpletypes/damaged.h + enums/simpletypes/enable.h enums/simpletypes/equipm.h enums/simpletypes/equipped.h enums/simpletypes/favorite.h diff --git a/src/Makefile.am b/src/Makefile.am index fcb5d3f6c..cf2618738 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1186,6 +1186,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ enums/simpletypes/allowsort.h \ enums/simpletypes/allplayers.h \ enums/simpletypes/damaged.h \ + enums/simpletypes/enable.h \ enums/simpletypes/equipm.h \ enums/simpletypes/equipped.h \ enums/simpletypes/favorite.h \ diff --git a/src/being/actorsprite.h b/src/being/actorsprite.h index d219309c4..06949839a 100644 --- a/src/being/actorsprite.h +++ b/src/being/actorsprite.h @@ -32,6 +32,8 @@ #include "enums/being/targetcursorsize.h" #include "enums/being/targetcursortype.h" +#include "enums/simpletypes/enable.h" + #include "particle/particlelist.h" #include "particle/particlevector.h" diff --git a/src/enums/simpletypes/enable.h b/src/enums/simpletypes/enable.h new file mode 100644 index 000000000..3e7857628 --- /dev/null +++ b/src/enums/simpletypes/enable.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_ENABLE_H +#define ENUMS_SIMPLETYPES_ENABLE_H + +#include "enums/simpletypes/simpledefines.h" + +defBoolEnum(Enable); + +#endif // ENUMS_SIMPLETYPES_ENABLE_H diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h index 057710c29..6f7aa0124 100644 --- a/src/enums/simpletypes/simpletypes.h +++ b/src/enums/simpletypes/simpletypes.h @@ -25,7 +25,6 @@ #include "localconsts.h" -defBoolEnum(Enable); defBoolEnum(ForceDisplay); defBoolEnum(UseResman); defBoolEnum(SkipError); diff --git a/src/gui/widgets/inttextfield.h b/src/gui/widgets/inttextfield.h index 91fe7957d..6f7eeff89 100644 --- a/src/gui/widgets/inttextfield.h +++ b/src/gui/widgets/inttextfield.h @@ -23,6 +23,7 @@ #ifndef GUI_WIDGETS_INTTEXTFIELD_H #define GUI_WIDGETS_INTTEXTFIELD_H +#include "enums/simpletypes/enable.h" #include "enums/simpletypes/simpletypes.h" #include "gui/widgets/textfield.h" diff --git a/src/statuseffect.h b/src/statuseffect.h index 4af6e039f..4f1c57733 100644 --- a/src/statuseffect.h +++ b/src/statuseffect.h @@ -23,6 +23,7 @@ #ifndef STATUSEFFECT_H #define STATUSEFFECT_H +#include "enums/simpletypes/enable.h" #include "enums/simpletypes/simpletypes.h" #include -- cgit v1.2.3-60-g2f50