From f9b9e7b859dfe9a41addc823dd4d1d48d1b84abf Mon Sep 17 00:00:00 2001 From: kiritow <1362050620@qq.com> Date: Sun, 18 Jun 2017 20:42:33 +0800 Subject: [PATCH] Change Enum declaration to MiniEngine:: --- MiniEngine.h | 2 -- SDLWrapper/_BlendMode.h | 2 ++ SDLWrapper/_FlipMode.h | 2 ++ SDLWrapper/_FontHint.h | 2 ++ SDLWrapper/_FontStyle.h | 2 ++ SDLWrapper/_MessageBoxType.h | 2 ++ SDLWrapper/_Platform.h | 2 ++ SDLWrapper/_PowerState.h | 2 ++ SDLWrapper/_RendererType.h | 2 ++ SDLWrapper/_SystemCursorType.h | 2 ++ SDLWrapper/_WindowType.h | 2 ++ SDLWrapper/begin_code.h | 1 + SDLWrapper/end_code.h | 2 ++ 13 files changed, 23 insertions(+), 2 deletions(-) diff --git a/MiniEngine.h b/MiniEngine.h index c3dcaea..6604e92 100644 --- a/MiniEngine.h +++ b/MiniEngine.h @@ -7,8 +7,6 @@ namespace MiniEngine { - - class StringEngine { public: diff --git a/SDLWrapper/_BlendMode.h b/SDLWrapper/_BlendMode.h index a79d1da..23f106c 100644 --- a/SDLWrapper/_BlendMode.h +++ b/SDLWrapper/_BlendMode.h @@ -1,4 +1,5 @@ #pragma once +#include "begin_code.h" enum class BlendMode { None, @@ -6,3 +7,4 @@ enum class BlendMode Add, Mod }; +#include "end_code.h" diff --git a/SDLWrapper/_FlipMode.h b/SDLWrapper/_FlipMode.h index 6eee691..cbc7e0a 100644 --- a/SDLWrapper/_FlipMode.h +++ b/SDLWrapper/_FlipMode.h @@ -1,7 +1,9 @@ #pragma once +#include "begin_code.h" enum class FlipMode { None, Horizontal, Vertical }; +#include "end_code.h" diff --git a/SDLWrapper/_FontHint.h b/SDLWrapper/_FontHint.h index 7cb8f9b..225b76a 100644 --- a/SDLWrapper/_FontHint.h +++ b/SDLWrapper/_FontHint.h @@ -1,4 +1,5 @@ #pragma once +#include "begin_code.h" enum class FontHint { Normal, @@ -7,3 +8,4 @@ enum class FontHint None, Error }; +#include "end_code.h" diff --git a/SDLWrapper/_FontStyle.h b/SDLWrapper/_FontStyle.h index 26d748b..9b2d32c 100644 --- a/SDLWrapper/_FontStyle.h +++ b/SDLWrapper/_FontStyle.h @@ -1,4 +1,5 @@ #pragma once +#include "begin_code.h" enum class FontStyle { Normal, @@ -7,3 +8,4 @@ enum class FontStyle UnderLine, StrikeThrough }; +#include "end_code.h" diff --git a/SDLWrapper/_MessageBoxType.h b/SDLWrapper/_MessageBoxType.h index 12876aa..49fb880 100644 --- a/SDLWrapper/_MessageBoxType.h +++ b/SDLWrapper/_MessageBoxType.h @@ -1,7 +1,9 @@ #pragma once +#include "begin_code.h" enum class MessageBoxType { Error, Warning, Information }; +#include "end_code.h" diff --git a/SDLWrapper/_Platform.h b/SDLWrapper/_Platform.h index fce1f2c..4635e2e 100644 --- a/SDLWrapper/_Platform.h +++ b/SDLWrapper/_Platform.h @@ -1,4 +1,5 @@ #pragma once +#include "begin_code.h" enum class Platform { Unknown, @@ -8,3 +9,4 @@ enum class Platform iOS, Android }; +#include "end_code.h" diff --git a/SDLWrapper/_PowerState.h b/SDLWrapper/_PowerState.h index 7aaca83..f066d11 100644 --- a/SDLWrapper/_PowerState.h +++ b/SDLWrapper/_PowerState.h @@ -1,4 +1,5 @@ #pragma once +#include "begin_code.h" enum class PowerState { Unknown, @@ -7,3 +8,4 @@ enum class PowerState Charging, Charged }; +#include "end_code.h" diff --git a/SDLWrapper/_RendererType.h b/SDLWrapper/_RendererType.h index 7bdbd17..25b473b 100644 --- a/SDLWrapper/_RendererType.h +++ b/SDLWrapper/_RendererType.h @@ -1,4 +1,5 @@ #pragma once +#include "begin_code.h" enum class RendererType { Software, @@ -6,3 +7,4 @@ enum class RendererType PresentSync, TargetTexture }; +#include "end_code.h" diff --git a/SDLWrapper/_SystemCursorType.h b/SDLWrapper/_SystemCursorType.h index fd5ccf4..1bc9c64 100644 --- a/SDLWrapper/_SystemCursorType.h +++ b/SDLWrapper/_SystemCursorType.h @@ -1,4 +1,5 @@ #pragma once +#include "begin_code.h" enum class SystemCursorType { Arrow, Ibeam, CrossHair, @@ -6,3 +7,4 @@ enum class SystemCursorType SizeNWSE, SizeNESW, SizeWE, SizeNS, SizeAll, No, Hand }; +#include "end_code.h" diff --git a/SDLWrapper/_WindowType.h b/SDLWrapper/_WindowType.h index 0002026..6d5ae48 100644 --- a/SDLWrapper/_WindowType.h +++ b/SDLWrapper/_WindowType.h @@ -1,4 +1,5 @@ #pragma once +#include "begin_code.h" enum class WindowType { FullScreen, OpenGL, Shown, Hidden, @@ -8,3 +9,4 @@ enum class WindowType MouseCapture, AlwaysOnTop, SkipTaskBar, Utility, ToolTip, PopUpMenu }; +#include "end_code.h" diff --git a/SDLWrapper/begin_code.h b/SDLWrapper/begin_code.h index 4dcbe64..49c8e78 100644 --- a/SDLWrapper/begin_code.h +++ b/SDLWrapper/begin_code.h @@ -1,2 +1,3 @@ +/// Include this file at the beginning of MiniEngine headers and sources. namespace MiniEngine { diff --git a/SDLWrapper/end_code.h b/SDLWrapper/end_code.h index 1f542f7..ad0bd81 100644 --- a/SDLWrapper/end_code.h +++ b/SDLWrapper/end_code.h @@ -1 +1,3 @@ +/// Include this file at the end of MiniEngine headers and sources. } /// End of namespace MiniEngine +/// NOTICE: If you see an compile error here, there must be some unclosed "{" !