From 500bcec44d40ee72873cf16d09c5a0b268825a41 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 24 May 2015 15:55:34 +0300
Subject: Move simpletypes.h into directory simpletypes.

---
 src/enums/simpletypes.h             | 72 -------------------------------------
 src/enums/simpletypes/simpletypes.h | 72 +++++++++++++++++++++++++++++++++++++
 2 files changed, 72 insertions(+), 72 deletions(-)
 delete mode 100644 src/enums/simpletypes.h
 create mode 100644 src/enums/simpletypes/simpletypes.h

(limited to 'src/enums')

diff --git a/src/enums/simpletypes.h b/src/enums/simpletypes.h
deleted file mode 100644
index 3a0488684..000000000
--- a/src/enums/simpletypes.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- *  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_H
-#define ENUMS_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
-
-
-defBoolEnum(Identified);
-defBoolEnum(Damaged);
-defBoolEnum(Favorite);
-defBoolEnum(Equipm);
-defBoolEnum(Equipped);
-defBoolEnum(Modal);
-defBoolEnum(ShowCenter);
-defBoolEnum(Notify);
-defBoolEnum(Trading);
-defBoolEnum(Sfx);
-defBoolEnum(Keep);
-defBoolEnum(Modifiable);
-defBoolEnum(AllPlayers);
-defBoolEnum(AllowSort);
-defBoolEnum(NpcNames);
-defBoolEnum(Enable);
-defBoolEnum(ForceDisplay);
-defBoolEnum(UseResman);
-defBoolEnum(SkipError);
-defBoolEnum(UseArgs);
-
-#endif  // ENUMS_SIMPLETYPES_H
diff --git a/src/enums/simpletypes/simpletypes.h b/src/enums/simpletypes/simpletypes.h
new file mode 100644
index 000000000..2d5514d11
--- /dev/null
+++ b/src/enums/simpletypes/simpletypes.h
@@ -0,0 +1,72 @@
+/*
+ *  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_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
+
+
+defBoolEnum(Identified);
+defBoolEnum(Damaged);
+defBoolEnum(Favorite);
+defBoolEnum(Equipm);
+defBoolEnum(Equipped);
+defBoolEnum(Modal);
+defBoolEnum(ShowCenter);
+defBoolEnum(Notify);
+defBoolEnum(Trading);
+defBoolEnum(Sfx);
+defBoolEnum(Keep);
+defBoolEnum(Modifiable);
+defBoolEnum(AllPlayers);
+defBoolEnum(AllowSort);
+defBoolEnum(NpcNames);
+defBoolEnum(Enable);
+defBoolEnum(ForceDisplay);
+defBoolEnum(UseResman);
+defBoolEnum(SkipError);
+defBoolEnum(UseArgs);
+
+#endif  // ENUMS_SIMPLETYPES_SIMPLETYPES_H
-- 
cgit v1.2.3-70-g09d2