Remove event_subscriber declaration from event_bus.h

src/achievement.h

@@ -8,14 +8,21 @@
 #include <unordered_set>
 #include <vector>
 
-#include "event_bus.h"
+#include "calendar.h"
+#include "cata_variant.h"
+#include "enum_traits.h"
+#include "event_subscriber.h"
 #include "optional.h"
 #include "string_id.h"
 #include "translations.h"
 
 class JsonObject;
 struct achievement_requirement;
 class achievements_tracker;
+namespace cata
+{
+class event;
+}  // namespace cata
 class requirement_watcher;
 class stats_tracker;
 

src/activity_actor.cpp

@@ -11,6 +11,8 @@
 #include "computer_session.h"
 #include "debug.h"
 #include "enums.h"
+#include "event.h"
+#include "event_bus.h"
 #include "game.h"
 #include "gates.h"
 #include "iexamine.h"

src/debug_menu.cpp

@@ -41,6 +41,8 @@
 #include "dialogue_chatbin.h"
 #include "enum_conversions.h"
 #include "enums.h"
+#include "event.h"
+#include "event_bus.h"
 #include "faction.h"
 #include "filesystem.h"
 #include "game.h"

src/event_bus.h

@@ -7,22 +7,7 @@
 
 #include "event.h"
 
-class event_bus;
-
-class event_subscriber
-{
-    public:
-        event_subscriber() = default;
-        event_subscriber( const event_subscriber & ) = delete;
-        event_subscriber &operator=( const event_subscriber & ) = delete;
-        virtual ~event_subscriber();
-        virtual void notify( const cata::event & ) = 0;
-    private:
-        friend class event_bus;
-        void on_subscribe( event_bus * );
-        void on_unsubscribe( event_bus * );
-        event_bus *subscribed_to = nullptr;
-};
+class event_subscriber;
 
 class event_bus
 {

src/event_subscriber.h

@@ -0,0 +1,25 @@
+#ifndef CATA_SRC_EVENT_SUBSCRIBER_H
+#define CATA_SRC_EVENT_SUBSCRIBER_H
+
+namespace cata
+{
+class event;
+}  // namespace cata
+class event_bus;
+
+class event_subscriber
+{
+    public:
+        event_subscriber() = default;
+        event_subscriber( const event_subscriber & ) = delete;
+        event_subscriber &operator=( const event_subscriber & ) = delete;
+        virtual ~event_subscriber();
+        virtual void notify( const cata::event & ) = 0;
+    private:
+        friend class event_bus;
+        void on_subscribe( event_bus * );
+        void on_unsubscribe( event_bus * );
+        event_bus *subscribed_to = nullptr;
+};
+
+#endif // CATA_SRC_EVENT_SUBSCRIBER_H

src/kill_tracker.h

@@ -6,7 +6,7 @@
 #include <string>
 #include <vector>
 
-#include "event_bus.h"
+#include "event_subscriber.h"
 #include "type_id.h"
 
 class JsonIn;

src/magic.cpp

@@ -22,6 +22,7 @@
 #include "enum_conversions.h"
 #include "enums.h"
 #include "event.h"
+#include "event_bus.h"
 #include "field.h"
 #include "game.h"
 #include "generic_factory.h"

src/magic.h

@@ -13,7 +13,7 @@
 #include "bodypart.h"
 #include "damage.h"
 #include "enum_bitset.h"
-#include "event_bus.h"
+#include "event_subscriber.h"
 #include "optional.h"
 #include "point.h"
 #include "sounds.h"

src/memorial_logger.h

@@ -6,13 +6,18 @@
 #include <string>
 #include <vector>
 
-#include "event_bus.h"
+#include "calendar.h"
+#include "event_subscriber.h"
 #include "string_formatter.h"
+#include "type_id.h"
 
 namespace cata
 {
 class event;
 }  // namespace cata
+class JsonIn;
+class JsonOut;
+
 
 class memorial_log_entry
 {

src/stats_tracker.h

@@ -12,6 +12,7 @@
 #include "cata_variant.h"
 #include "event.h"
 #include "event_bus.h"
+#include "event_subscriber.h"
 #include "hash_utils.h"
 #include "string_id.h"
 

tests/memorial_test.cpp

@@ -11,6 +11,7 @@
 #include "character_id.h"
 #include "debug_menu.h"
 #include "event.h"
+#include "event_bus.h"
 #include "filesystem.h"
 #include "memorial_logger.h"
 #include "mutation.h"