diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-10-04 20:07:58 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-10-04 20:07:58 +0300 |
commit | a6c31640303618601c8520c13f1565e8ed816447 (patch) | |
tree | 05424b61d17053d38d1c8972953e4560f17e914f /src/gui/widgets | |
parent | 60745b8038b18d4b7b7198a03547676b92988426 (diff) | |
download | manaverse-a6c31640303618601c8520c13f1565e8ed816447.tar.gz manaverse-a6c31640303618601c8520c13f1565e8ed816447.tar.bz2 manaverse-a6c31640303618601c8520c13f1565e8ed816447.tar.xz manaverse-a6c31640303618601c8520c13f1565e8ed816447.zip |
Move layouttype into enums directory.
Diffstat (limited to 'src/gui/widgets')
-rw-r--r-- | src/gui/widgets/layoutarray.cpp | 3 | ||||
-rw-r--r-- | src/gui/widgets/layouttype.h | 42 | ||||
-rw-r--r-- | src/gui/widgets/selldialog.cpp | 3 |
3 files changed, 4 insertions, 44 deletions
diff --git a/src/gui/widgets/layoutarray.cpp b/src/gui/widgets/layoutarray.cpp index 5b726b9cc..f1debc569 100644 --- a/src/gui/widgets/layoutarray.cpp +++ b/src/gui/widgets/layoutarray.cpp @@ -22,8 +22,9 @@ #include "gui/widgets/layoutarray.h" +#include "enums/gui/layouttype.h" + #include "gui/widgets/layoutcell.h" -#include "gui/widgets/layouttype.h" #include "gui/widgets/widget.h" #include <cassert> diff --git a/src/gui/widgets/layouttype.h b/src/gui/widgets/layouttype.h deleted file mode 100644 index f614ce313..000000000 --- a/src/gui/widgets/layouttype.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2007-2009 The Mana World Development Team - * Copyright (C) 2009-2010 The Mana Developers - * Copyright (C) 2011-2016 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 <http://www.gnu.org/licenses/>. - */ - -#ifndef GUI_WIDGETS_LAYOUTTYPE_H -#define GUI_WIDGETS_LAYOUTTYPE_H - -#include "localconsts.h" - -namespace LayoutType -{ - /** - * When the minimum size of the layout is less than the available size, - * the remaining pixels are equally split amongst the FILL items. - */ - enum Type - { - DEF = -42, /**< Default value, behaves like AUTO_ADD. */ - SET = -43, /**< Uses the share as the new size. */ - ADD = -44 /**< Adds the share to the current size. */ - }; -} // namespace LayoutType - -#endif // GUI_WIDGETS_LAYOUTTYPE_H diff --git a/src/gui/widgets/selldialog.cpp b/src/gui/widgets/selldialog.cpp index e7513dd89..299407b99 100644 --- a/src/gui/widgets/selldialog.cpp +++ b/src/gui/widgets/selldialog.cpp @@ -24,6 +24,8 @@ #include "units.h" +#include "enums/gui/layouttype.h" + #include "gui/windows/setupwindow.h" #include "gui/models/shopitems.h" @@ -33,7 +35,6 @@ #include "gui/widgets/createwidget.h" #include "gui/widgets/label.h" #include "gui/widgets/layout.h" -#include "gui/widgets/layouttype.h" #include "gui/widgets/scrollarea.h" #include "gui/widgets/shoplistbox.h" #include "gui/widgets/slider.h" |