Move defines from simpletypes.h into separate file.

4 files changed, 54 insertions, 25 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bd9afc6a8..61ae9e862 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1055,6 +1055,7 @@ SET(SRCS
     sprite.h
     enums/screendensity.h
     enums/state.h
+    enums/simpletypes/simpledefines.h
     enums/simpletypes/simpletypes.h
     statuseffect.cpp
     statuseffect.h
diff --git a/src/Makefile.am b/src/Makefile.am
index 9101b90b7..535c8ac0e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1183,6 +1183,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \
 	      sprite.h \
 	      enums/screendensity.h \
 	      enums/state.h \
+	      enums/simpletypes/simpledefines.h \
 	      enums/simpletypes/simpletypes.h \
 	      statuseffect.cpp \
 	      statuseffect.h \
diff --git a/src/enums/simpletypes/simpledefines.h b/src/enums/simpletypes/simpledefines.h
new file mode 100644
index 000000000..ea5592b0e
--- /dev/null
+++ b/src/enums/simpletypes/simpledefines.h
@@ -0,0 +1,50 @@
+/*
+ *  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 <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ENUMS_SIMPLETYPES_SIMPLDEFINES_H
+#define ENUMS_SIMPLETYPES_SIMPLDEFINES_H
+
+#include "localconsts.h"
+
+#ifdef ADVGCC
+
+#define defBoolEnum(name) \
+    enum class name : bool \
+    { \
+        MFalse = false, \
+        MTrue = true \
+    }; \
+    const name name##_true = name::MTrue; \
+    const name name##_false = name::MFalse
+#define fromBool(val, name) \
+    (val) ? name::MTrue : name::MFalse
+
+#else  // ADVGCC
+
+#define defBoolEnum(name) \
+    const bool name##_true = true; \
+    const bool name##_false = false; \
+    typedef bool name
+#define fromBool(val, name) \
+    (val) ? true : false
+
+#endif  // ADVGCC
+
+#endif  // ENUMS_SIMPLETYPES_SIMPLDEFINES_H
diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h
index 2d5514d11..9fb0a553c 100644
--- a/src/enums/simpletypes/simpletypes.h
+++ b/src/enums/simpletypes/simpletypes.h
@@ -21,32 +21,9 @@
 #ifndef ENUMS_SIMPLETYPES_SIMPLETYPES_H
 #define ENUMS_SIMPLETYPES_SIMPLETYPES_H
 
-#include "localconsts.h"
-
-#ifdef ADVGCC
-
-#define defBoolEnum(name) \
-    enum class name : bool \
-    { \
-        MFalse = false, \
-        MTrue = true \
-    }; \
-    const name name##_true = name::MTrue; \
-    const name name##_false = name::MFalse
-#define fromBool(val, name) \
-    (val) ? name::MTrue : name::MFalse
-
-#else  // ADVGCC
-
-#define defBoolEnum(name) \
-    const bool name##_true = true; \
-    const bool name##_false = false; \
-    typedef bool name
-#define fromBool(val, name) \
-    (val) ? true : false
-
-#endif  // ADVGCC
+#include "enums/simpletypes/simpledefines.h"
 
+#include "localconsts.h"
 
 defBoolEnum(Identified);
 defBoolEnum(Damaged);