diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-01-13 18:25:03 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-01-13 18:25:03 +0300 |
| commit | e74f8dbf42c027cdd4c32cc66036e0f4758d28c3 (patch) | |
| tree | 58f1c0800aeb2131022b40ab6e38302377f9e4e4 | |
| parent | fb810c2d0a117dba032353b4e60391db2bff504c (diff) | |
| download | plus-e74f8dbf42c027cdd4c32cc66036e0f4758d28c3.tar.gz plus-e74f8dbf42c027cdd4c32cc66036e0f4758d28c3.tar.bz2 plus-e74f8dbf42c027cdd4c32cc66036e0f4758d28c3.tar.xz plus-e74f8dbf42c027cdd4c32cc66036e0f4758d28c3.zip | |
Move rendertype.h into enums directory.
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/enums/render/rendertype.h (renamed from src/render/rendertype.h) | 6 | ||||
| -rw-r--r-- | src/render/graphics.h | 4 | ||||
| -rw-r--r-- | src/render/renderers.h | 2 | ||||
| -rw-r--r-- | src/resources/imagehelper.h | 2 | ||||
| -rw-r--r-- | src/resources/map/map.h | 4 |
7 files changed, 11 insertions, 11 deletions
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/render/rendertype.h b/src/enums/render/rendertype.h index c20a1171c..9799b92fc 100644 --- a/src/render/rendertype.h +++ b/src/enums/render/rendertype.h @@ -18,8 +18,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef RENDER_RENDERTYPE_H -#define RENDER_RENDERTYPE_H +#ifndef ENUMS_RENDER_RENDERTYPE_H +#define ENUMS_RENDER_RENDERTYPE_H enum RenderType { @@ -33,4 +33,4 @@ enum RenderType RENDER_LAST }; -#endif // RENDER_RENDERTYPE_H +#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 <SDL_video.h> #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/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 <string> #include <vector> |