From 016133457789ebf11214db0c10019519e7ed3bdb Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 24 May 2015 16:36:47 +0300 Subject: Move type Favorite into separate file. --- src/CMakeLists.txt | 1 + src/Makefile.am | 1 + src/enums/simpletypes/favorite.h | 28 ++++++++++++++++++++++++++++ src/enums/simpletypes/simpletypes.h | 1 - src/gui/windows/tradewindow.h | 1 + src/inventory.h | 1 + src/item.h | 1 + 7 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 src/enums/simpletypes/favorite.h (limited to 'src') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 40abcb35f..9889896bc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1056,6 +1056,7 @@ SET(SRCS enums/screendensity.h enums/state.h enums/simpletypes/damaged.h + enums/simpletypes/favorite.h enums/simpletypes/identified.h enums/simpletypes/simpledefines.h enums/simpletypes/simpletypes.h diff --git a/src/Makefile.am b/src/Makefile.am index 163e04de1..294ab7d99 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1184,6 +1184,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ enums/screendensity.h \ enums/state.h \ enums/simpletypes/damaged.h \ + enums/simpletypes/favorite.h \ enums/simpletypes/identified.h \ enums/simpletypes/simpledefines.h \ enums/simpletypes/simpletypes.h \ diff --git a/src/enums/simpletypes/favorite.h b/src/enums/simpletypes/favorite.h new file mode 100644 index 000000000..bb3295afc --- /dev/null +++ b/src/enums/simpletypes/favorite.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_FAVORITE_H +#define ENUMS_SIMPLETYPES_FAVORITE_H + +#include "enums/simpletypes/simpledefines.h" + +defBoolEnum(Favorite); + +#endif // ENUMS_SIMPLETYPES_FAVORITE_H diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h index 5625637fb..78d936d7d 100644 --- a/src/enums/simpletypes/simpletypes.h +++ b/src/enums/simpletypes/simpletypes.h @@ -25,7 +25,6 @@ #include "localconsts.h" -defBoolEnum(Favorite); defBoolEnum(Equipm); defBoolEnum(Equipped); defBoolEnum(Modal); diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h index 240aa960d..d2fe2d132 100644 --- a/src/gui/windows/tradewindow.h +++ b/src/gui/windows/tradewindow.h @@ -26,6 +26,7 @@ #include "gui/widgets/window.h" #include "enums/simpletypes/damaged.h" +#include "enums/simpletypes/favorite.h" #include "enums/simpletypes/identified.h" #include "listeners/actionlistener.h" diff --git a/src/inventory.h b/src/inventory.h index af0a500ea..e01f6667d 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -26,6 +26,7 @@ #include "enums/inventorytype.h" #include "enums/simpletypes/damaged.h" +#include "enums/simpletypes/favorite.h" #include "enums/simpletypes/identified.h" #include "enums/simpletypes/simpletypes.h" diff --git a/src/item.h b/src/item.h index d6a38733e..cfb0505be 100644 --- a/src/item.h +++ b/src/item.h @@ -24,6 +24,7 @@ #define ITEM_H #include "enums/simpletypes/damaged.h" +#include "enums/simpletypes/favorite.h" #include "enums/simpletypes/identified.h" #include "enums/simpletypes/simpletypes.h" -- cgit v1.2.3-70-g09d2