From e74f8dbf42c027cdd4c32cc66036e0f4758d28c3 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 13 Jan 2015 18:25:03 +0300 Subject: Move rendertype.h into enums directory. --- src/CMakeLists.txt | 2 +- src/Makefile.am | 2 +- src/enums/render/rendertype.h | 36 ++++++++++++++++++++++++++++++++++++ src/render/graphics.h | 4 ++-- src/render/renderers.h | 2 +- src/render/rendertype.h | 36 ------------------------------------ src/resources/imagehelper.h | 2 +- src/resources/map/map.h | 4 ++-- 8 files changed, 44 insertions(+), 44 deletions(-) create mode 100644 src/enums/render/rendertype.h delete mode 100644 src/render/rendertype.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a8ee377ee..b2c7568ba 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1001,7 +1001,7 @@ SET(SRCS render/renderers.h render/rendererslistsdl.h render/rendererslistsdl2.h - render/rendertype.h + enums/render/rendertype.h particle/particle.cpp particle/particle.h particle/particlecontainer.cpp diff --git a/src/Makefile.am b/src/Makefile.am index d702914c9..439ef8a06 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1122,7 +1122,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ render/renderers.h \ render/rendererslistsdl.h \ render/rendererslistsdl2.h \ - render/rendertype.h \ + enums/render/rendertype.h \ particle/particle.cpp \ particle/particle.h \ particle/particlecontainer.cpp \ diff --git a/src/enums/render/rendertype.h b/src/enums/render/rendertype.h new file mode 100644 index 000000000..9799b92fc --- /dev/null +++ b/src/enums/render/rendertype.h @@ -0,0 +1,36 @@ +/* + * The ManaPlus Client + * Copyright (C) 2013-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_RENDER_RENDERTYPE_H +#define ENUMS_RENDER_RENDERTYPE_H + +enum RenderType +{ + RENDER_SOFTWARE = 0, + RENDER_NORMAL_OPENGL = 1, + RENDER_SAFE_OPENGL = 2, + RENDER_GLES_OPENGL = 3, + RENDER_SDL2_DEFAULT = 4, + RENDER_MODERN_OPENGL = 5, + RENDER_NULL = 6, + RENDER_LAST +}; + +#endif // ENUMS_RENDER_RENDERTYPE_H diff --git a/src/render/graphics.h b/src/render/graphics.h index a0612cef9..33ab2954e 100644 --- a/src/render/graphics.h +++ b/src/render/graphics.h @@ -68,12 +68,12 @@ #include "sdlshared.h" +#include "enums/render/rendertype.h" + #include "gui/color.h" #include "gui/cliprect.h" -#include "render/rendertype.h" - #include #ifdef USE_SDL2 diff --git a/src/render/renderers.h b/src/render/renderers.h index 36dec11de..63f93f786 100644 --- a/src/render/renderers.h +++ b/src/render/renderers.h @@ -21,7 +21,7 @@ #ifndef RENDER_RENDERERS_H #define RENDER_RENDERERS_H -#include "render/rendertype.h" +#include "enums/render/rendertype.h" RenderType intToRenderType(const int mode); diff --git a/src/render/rendertype.h b/src/render/rendertype.h deleted file mode 100644 index c20a1171c..000000000 --- a/src/render/rendertype.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2013-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 RENDER_RENDERTYPE_H -#define RENDER_RENDERTYPE_H - -enum RenderType -{ - RENDER_SOFTWARE = 0, - RENDER_NORMAL_OPENGL = 1, - RENDER_SAFE_OPENGL = 2, - RENDER_GLES_OPENGL = 3, - RENDER_SDL2_DEFAULT = 4, - RENDER_MODERN_OPENGL = 5, - RENDER_NULL = 6, - RENDER_LAST -}; - -#endif // RENDER_RENDERTYPE_H diff --git a/src/resources/imagehelper.h b/src/resources/imagehelper.h index 658c092bd..afbfc25b4 100644 --- a/src/resources/imagehelper.h +++ b/src/resources/imagehelper.h @@ -25,7 +25,7 @@ #include "localconsts.h" -#include "render/rendertype.h" +#include "enums/render/rendertype.h" #include "resources/resource.h" diff --git a/src/resources/map/map.h b/src/resources/map/map.h index fb83277ec..a6bc81560 100644 --- a/src/resources/map/map.h +++ b/src/resources/map/map.h @@ -27,6 +27,8 @@ #include "being/actor.h" +#include "enums/render/rendertype.h" + #include "resources/map/blockmask.h" #include "resources/map/blocktype.h" #include "resources/map/maptype.h" @@ -34,8 +36,6 @@ #include "listeners/configlistener.h" -#include "render/rendertype.h" - #include #include -- cgit v1.2.3-70-g09d2