From 15004b64d4fac07d91076e38c5a3031cc373d619 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 24 May 2015 18:44:29 +0300 Subject: Move type Modifiable into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/enums/simpletypes/modifiable.h | 28 ++++++++++++++++++++++++++++ src/enums/simpletypes/simpletypes.h | 1 - src/gui/widgets/skillinfo.h | 1 + src/gui/windows/skilldialog.h | 2 ++ src/gui/windows/statuswindow.h | 2 ++ 7 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 src/enums/simpletypes/modifiable.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f8fa142fb..e257ca8ad 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1062,6 +1062,7 @@ SET(SRCS enums/simpletypes/identified.h enums/simpletypes/keep.h enums/simpletypes/modal.h + enums/simpletypes/modifiable.h enums/simpletypes/notify.h enums/simpletypes/sfx.h enums/simpletypes/showcenter.h diff --git a/src/Makefile.am b/src/Makefile.am index 5e721472a..d064556bb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1190,6 +1190,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ enums/simpletypes/identified.h \ enums/simpletypes/keep.h \ enums/simpletypes/modal.h \ + enums/simpletypes/modifiable.h \ enums/simpletypes/notify.h \ enums/simpletypes/sfx.h \ enums/simpletypes/showcenter.h \ diff --git a/src/enums/simpletypes/modifiable.h b/src/enums/simpletypes/modifiable.h new file mode 100644 index 000000000..8710043f9 --- /dev/null +++ b/src/enums/simpletypes/modifiable.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_MODIFIABLE_H +#define ENUMS_SIMPLETYPES_MODIFIABLE_H + +#include "enums/simpletypes/simpledefines.h" + +defBoolEnum(Modifiable); + +#endif // ENUMS_SIMPLETYPES_MODIFIABLE_H diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h index 5839bbe0e..951d2fc53 100644 --- a/src/enums/simpletypes/simpletypes.h +++ b/src/enums/simpletypes/simpletypes.h @@ -25,7 +25,6 @@ #include "localconsts.h" -defBoolEnum(Modifiable); defBoolEnum(AllPlayers); defBoolEnum(AllowSort); defBoolEnum(NpcNames); diff --git a/src/gui/widgets/skillinfo.h b/src/gui/widgets/skillinfo.h index cfe571f37..d97be7953 100644 --- a/src/gui/widgets/skillinfo.h +++ b/src/gui/widgets/skillinfo.h @@ -23,6 +23,7 @@ #ifndef GUI_WIDGETS_SKILLINFO_H #define GUI_WIDGETS_SKILLINFO_H +#include "enums/simpletypes/modifiable.h" #include "enums/simpletypes/simpletypes.h" #include "gui/color.h" diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h index d067643f4..7c8329ce9 100644 --- a/src/gui/windows/skilldialog.h +++ b/src/gui/windows/skilldialog.h @@ -25,6 +25,8 @@ #include "gui/widgets/window.h" +#include "enums/simpletypes/modifiable.h" + #include "listeners/actionlistener.h" #include "resources/skillowner.h" diff --git a/src/gui/windows/statuswindow.h b/src/gui/windows/statuswindow.h index eea7f936e..44328e1df 100644 --- a/src/gui/windows/statuswindow.h +++ b/src/gui/windows/statuswindow.h @@ -25,6 +25,8 @@ #include "gui/widgets/window.h" +#include "enums/simpletypes/modifiable.h" + #include "listeners/actionlistener.h" #include "listeners/attributelistener.h" #include "listeners/statlistener.h" -- cgit v1.2.3-60-g2f50