From ffe46c13ca8e4393901db1226a6da11722c8f428 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 24 May 2015 17:04:09 +0300 Subject: Move type Modal into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/enums/simpletypes/modal.h | 28 ++++++++++++++++++++++++++++ src/enums/simpletypes/simpletypes.h | 1 - src/gui/dialogsmanager.h | 1 + src/gui/widgets/dropdown.h | 1 + src/gui/widgets/popuplist.h | 1 + src/gui/widgets/window.h | 1 + 8 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 src/enums/simpletypes/modal.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9f3824ba4..641e1b96d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1060,6 +1060,7 @@ SET(SRCS enums/simpletypes/equipped.h enums/simpletypes/favorite.h enums/simpletypes/identified.h + enums/simpletypes/modal.h enums/simpletypes/simpledefines.h enums/simpletypes/simpletypes.h statuseffect.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 86ca62861..8299896e2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1188,6 +1188,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ enums/simpletypes/equipped.h \ enums/simpletypes/favorite.h \ enums/simpletypes/identified.h \ + enums/simpletypes/modal.h \ enums/simpletypes/simpledefines.h \ enums/simpletypes/simpletypes.h \ statuseffect.cpp \ diff --git a/src/enums/simpletypes/modal.h b/src/enums/simpletypes/modal.h new file mode 100644 index 000000000..660ce8a8a --- /dev/null +++ b/src/enums/simpletypes/modal.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_MODAL_H +#define ENUMS_SIMPLETYPES_MODAL_H + +#include "enums/simpletypes/simpledefines.h" + +defBoolEnum(Modal); + +#endif // ENUMS_SIMPLETYPES_MODAL_H diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h index 276ff83ae..6c933a209 100644 --- a/src/enums/simpletypes/simpletypes.h +++ b/src/enums/simpletypes/simpletypes.h @@ -25,7 +25,6 @@ #include "localconsts.h" -defBoolEnum(Modal); defBoolEnum(ShowCenter); defBoolEnum(Notify); defBoolEnum(Trading); diff --git a/src/gui/dialogsmanager.h b/src/gui/dialogsmanager.h index 4f8780cb4..270f29cc1 100644 --- a/src/gui/dialogsmanager.h +++ b/src/gui/dialogsmanager.h @@ -23,6 +23,7 @@ #ifndef GUI_DIALOGSMANAGER_H #define GUI_DIALOGSMANAGER_H +#include "enums/simpletypes/modal.h" #include "enums/simpletypes/simpletypes.h" #include "listeners/attributelistener.h" diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index 979ba024c..2e5c32300 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -23,6 +23,7 @@ #ifndef GUI_WIDGETS_DROPDOWN_H #define GUI_WIDGETS_DROPDOWN_H +#include "enums/simpletypes/modal.h" #include "enums/simpletypes/simpletypes.h" #include "gui/widgets/basiccontainer.h" diff --git a/src/gui/widgets/popuplist.h b/src/gui/widgets/popuplist.h index fa59107af..7158b1943 100644 --- a/src/gui/widgets/popuplist.h +++ b/src/gui/widgets/popuplist.h @@ -21,6 +21,7 @@ #ifndef GUI_WIDGETS_POPUPLIST_H #define GUI_WIDGETS_POPUPLIST_H +#include "enums/simpletypes/modal.h" #include "enums/simpletypes/simpletypes.h" #include "gui/widgets/popup.h" diff --git a/src/gui/widgets/window.h b/src/gui/widgets/window.h index a812e135a..904a7914a 100644 --- a/src/gui/widgets/window.h +++ b/src/gui/widgets/window.h @@ -66,6 +66,7 @@ #ifndef GUI_WIDGETS_WINDOW_H #define GUI_WIDGETS_WINDOW_H +#include "enums/simpletypes/modal.h" #include "enums/simpletypes/simpletypes.h" #include "listeners/mouselistener.h" -- cgit v1.2.3-70-g09d2