From 2cbb2a8c1be8bf08b1b835ffaa7bb0bee823e3a6 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Wed, 4 Jul 2018 19:46:08 +0900
Subject: Break down event.* into smaller files

We now have event.*, roomevent.*, stateevent.* and eventloader.h. If you only use event leaf-classes (such as RoomMemberEvent) you shouldn't notice anything.
---
 lib/csapi/event_context.h      | 2 +-
 lib/csapi/gtad.yaml            | 8 ++++----
 lib/csapi/message_pagination.h | 2 +-
 lib/csapi/notifications.h      | 2 +-
 lib/csapi/peeking_events.h     | 2 +-
 lib/csapi/presence.h           | 2 +-
 lib/csapi/rooms.h              | 2 +-
 lib/csapi/search.h             | 6 +++---
 8 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'lib/csapi')

diff --git a/lib/csapi/event_context.h b/lib/csapi/event_context.h
index 0470ba36..22c9cbc3 100644
--- a/lib/csapi/event_context.h
+++ b/lib/csapi/event_context.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-#include "events/event.h"
+#include "events/eventloader.h"
 #include "converters.h"
 
 namespace QMatrixClient
diff --git a/lib/csapi/gtad.yaml b/lib/csapi/gtad.yaml
index 3d1b7e88..09344be5 100644
--- a/lib/csapi/gtad.yaml
+++ b/lib/csapi/gtad.yaml
@@ -62,11 +62,11 @@ analyzer:
       - +set: { moveOnly: }
         +on:
         - /state_event.yaml$/:
-            { type: StateEventPtr, imports: '"events/event.h"' }
+            { type: StateEventPtr, imports: '"events/eventloader.h"' }
         - /room_event.yaml$/:
-            { type: RoomEventPtr, imports: '"events/event.h"' }
+            { type: RoomEventPtr, imports: '"events/eventloader.h"' }
         - /event.yaml$/:
-            { type: EventPtr, imports: '"events/event.h"' }
+            { type: EventPtr, imports: '"events/eventloader.h"' }
       - /auth_data.yaml$/: *QJsonObject # GTAD 0.6 cannot cope with this one
       - /m\.room\.member$/: pass # This $ref is only used in an array, see below
       - //: *UseOmittable # Also apply "avoidCopy" to all other ref'ed types
@@ -79,7 +79,7 @@ analyzer:
         +on:
         - /^Notification|Result$/:
             type: "std::vector<{{1}}>"
-            imports: '"events/event.h"'
+            imports: '"events/eventloader.h"'
         - /m\.room\.member$/:
             type: "EventsArray<RoomMemberEvent>"
             imports: '"events/roommemberevent.h"'
diff --git a/lib/csapi/message_pagination.h b/lib/csapi/message_pagination.h
index 92b258ea..58900940 100644
--- a/lib/csapi/message_pagination.h
+++ b/lib/csapi/message_pagination.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-#include "events/event.h"
+#include "events/eventloader.h"
 #include "converters.h"
 
 namespace QMatrixClient
diff --git a/lib/csapi/notifications.h b/lib/csapi/notifications.h
index 094fa3af..3698431d 100644
--- a/lib/csapi/notifications.h
+++ b/lib/csapi/notifications.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-#include "events/event.h"
+#include "events/eventloader.h"
 #include "converters.h"
 #include <QtCore/QVector>
 #include <QtCore/QVariant>
diff --git a/lib/csapi/peeking_events.h b/lib/csapi/peeking_events.h
index f8876bf1..5f2c4233 100644
--- a/lib/csapi/peeking_events.h
+++ b/lib/csapi/peeking_events.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-#include "events/event.h"
+#include "events/eventloader.h"
 #include "converters.h"
 
 namespace QMatrixClient
diff --git a/lib/csapi/presence.h b/lib/csapi/presence.h
index 2def94ba..7d6665f3 100644
--- a/lib/csapi/presence.h
+++ b/lib/csapi/presence.h
@@ -6,7 +6,7 @@
 
 #include "jobs/basejob.h"
 
-#include "events/event.h"
+#include "events/eventloader.h"
 #include "converters.h"
 
 namespace QMatrixClient
diff --git a/lib/csapi/rooms.h b/lib/csapi/rooms.h
index 459c6ad5..7d690ec8 100644
--- a/lib/csapi/rooms.h
+++ b/lib/csapi/rooms.h
@@ -6,8 +6,8 @@
 
 #include "jobs/basejob.h"
 
-#include "events/event.h"
 #include "events/roommemberevent.h"
+#include "events/eventloader.h"
 #include <QtCore/QHash>
 #include "converters.h"
 
diff --git a/lib/csapi/search.h b/lib/csapi/search.h
index 206bacca..572ea6af 100644
--- a/lib/csapi/search.h
+++ b/lib/csapi/search.h
@@ -6,12 +6,12 @@
 
 #include "jobs/basejob.h"
 
-#include <unordered_map>
-#include <QtCore/QHash>
 #include <QtCore/QJsonObject>
-#include "events/event.h"
 #include "converters.h"
 #include <QtCore/QVector>
+#include <unordered_map>
+#include <QtCore/QHash>
+#include "events/eventloader.h"
 
 namespace QMatrixClient
 {
-- 
cgit v1.2.3