From b9df78a88b4294cdaabd665dd4d88425aaaec3e9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 4 Mar 2016 00:14:15 +0300 Subject: Move questtype enum into enums directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/enums/resources/questtype.h | 34 ++++++++++++++++++++++++++++++++++ src/gui/windows/questswindow.cpp | 3 ++- src/resources/questtype.h | 34 ---------------------------------- 5 files changed, 38 insertions(+), 37 deletions(-) create mode 100644 src/enums/resources/questtype.h delete mode 100644 src/resources/questtype.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 86f665f28..5ff6c39ac 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -704,7 +704,7 @@ SET(SRCS resources/questeffect.h resources/questitem.h resources/questitemtext.h - resources/questtype.h + enums/resources/questtype.h resources/db/palettedb.cpp resources/db/palettedb.h resources/db/petdb.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 5173c45f7..f8ea7be19 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -370,7 +370,7 @@ SRC += events/actionevent.h \ resources/questeffect.h \ resources/questitem.h \ resources/questitemtext.h \ - resources/questtype.h \ + enums/resources/questtype.h \ resources/resource.cpp \ resources/resource.h \ resources/resourcemanager.cpp \ diff --git a/src/enums/resources/questtype.h b/src/enums/resources/questtype.h new file mode 100644 index 000000000..62f4271c7 --- /dev/null +++ b/src/enums/resources/questtype.h @@ -0,0 +1,34 @@ +/* + * The ManaPlus Client + * Copyright (C) 2012-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 . + */ + +#ifndef RESOURCES_QUESTTYPE_H +#define RESOURCES_QUESTTYPE_H + +namespace QuestType +{ + enum Type + { + TEXT = 0, + NAME = 1, + REWARD = 2 + }; +} + +#endif // RESOURCES_QUESTTYPE_H diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index 8ca5276f0..5c57ca4eb 100644 --- a/src/gui/windows/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -26,6 +26,8 @@ #include "being/localplayer.h" +#include "enums/resources/questtype.h" + #include "gui/gui.h" #include "gui/fonts/font.h" @@ -53,7 +55,6 @@ #include "resources/beingcommon.h" #include "resources/questeffect.h" #include "resources/questitem.h" -#include "resources/questtype.h" #include "resources/map/map.h" diff --git a/src/resources/questtype.h b/src/resources/questtype.h deleted file mode 100644 index 62f4271c7..000000000 --- a/src/resources/questtype.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2012-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 . - */ - -#ifndef RESOURCES_QUESTTYPE_H -#define RESOURCES_QUESTTYPE_H - -namespace QuestType -{ - enum Type - { - TEXT = 0, - NAME = 1, - REWARD = 2 - }; -} - -#endif // RESOURCES_QUESTTYPE_H -- cgit v1.2.3-70-g09d2