Split types.h into separate header for each type

4 files changed, 8 insertions, 20 deletions

diff --git a/src/include/tome/squelch/automatizer.hpp b/src/include/tome/squelch/automatizer.hpp
index fae52a2b..786ca1ae 100644
--- a/src/include/tome/squelch/automatizer.hpp
+++ b/src/include/tome/squelch/automatizer.hpp
@@ -1,5 +1,4 @@
-#ifndef H_53108fce_b059_4a82_99db_e1d4970ebd77
-#define H_53108fce_b059_4a82_99db_e1d4970ebd77
+#pragma once
 
 #include <boost/noncopyable.hpp>
 #include <memory>
@@ -10,7 +9,7 @@
 #include "tome/squelch/cursor_fwd.hpp"
 #include "tome/squelch/tree_printer_fwd.hpp"
 #include "tome/squelch/condition_fwd.hpp"
-#include "types_fwd.h"
+#include "../object_type_fwd.hpp"
 
 namespace squelch {
 
@@ -155,5 +154,3 @@ private:
 };
 
 } // namespace
-
-#endif
diff --git a/src/include/tome/squelch/condition.hpp b/src/include/tome/squelch/condition.hpp
index 7aad5ff1..5d1240f5 100644
--- a/src/include/tome/squelch/condition.hpp
+++ b/src/include/tome/squelch/condition.hpp
@@ -1,5 +1,4 @@
-#ifndef H_e31ae6cc_eb8a_4909_ad6c_da485e4264a2
-#define H_e31ae6cc_eb8a_4909_ad6c_da485e4264a2
+#pragma once
 
 #include "tome/squelch/condition_fwd.hpp"
 
@@ -13,7 +12,7 @@
 #include "tome/squelch/tree_printer_fwd.hpp"
 #include "tome/squelch/object_status_fwd.hpp"
 #include "tome/enum_string_map.hpp"
-#include "types_fwd.h"
+#include "../object_type_fwd.hpp"
 
 namespace squelch {
 
@@ -631,5 +630,3 @@ protected:
 };
 
 } // namespace
-
-#endif
diff --git a/src/include/tome/squelch/object_status_fwd.hpp b/src/include/tome/squelch/object_status_fwd.hpp
index 10725050..361ea2fe 100644
--- a/src/include/tome/squelch/object_status_fwd.hpp
+++ b/src/include/tome/squelch/object_status_fwd.hpp
@@ -1,7 +1,6 @@
-#ifndef H_3261a8ad_ee1c_4a2b_9d21_7c9955f09542
-#define H_3261a8ad_ee1c_4a2b_9d21_7c9955f09542
+#pragma once
 
-#include "types_fwd.h"
+#include "../object_type_fwd.hpp"
 #include "tome/enum_string_map.hpp"
 
 namespace squelch {
@@ -11,5 +10,3 @@ EnumStringMap<status_type> &status_mapping();
 status_type object_status(object_type *o_ptr);
 
 } // namespace
-
-#endif
diff --git a/src/include/tome/squelch/rule.hpp b/src/include/tome/squelch/rule.hpp
index 4d4c7c53..63f1b6c0 100644
--- a/src/include/tome/squelch/rule.hpp
+++ b/src/include/tome/squelch/rule.hpp
@@ -1,5 +1,4 @@
-#ifndef H_c3dd858a_4663_44a0_8871_ff6c8148a613
-#define H_c3dd858a_4663_44a0_8871_ff6c8148a613
+#pragma once
 
 #include <jansson.h>
 #include <memory>
@@ -8,7 +7,7 @@
 #include "tome/squelch/cursor_fwd.hpp"
 #include "tome/squelch/tree_printer_fwd.hpp"
 #include "tome/enum_string_map.hpp"
-#include "types_fwd.h"
+#include "../object_type_fwd.hpp"
 
 namespace squelch {
 
@@ -161,5 +160,3 @@ private:
 };
 
 } // namespace
-
-#endif