From d74985d3f9093b5a7bd6fe437e2e21db155c0390 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Thu, 2 May 2019 20:36:15 -0700 Subject: [PATCH] ircd::m: Move event.h/room.h headers into their dirs. --- include/ircd/m/{ => event}/event.h | 24 ++++++++++++------------ include/ircd/m/m.h | 4 ++-- include/ircd/m/{ => room}/room.h | 18 +++++++++--------- 3 files changed, 23 insertions(+), 23 deletions(-) rename include/ircd/m/{ => event}/event.h (94%) rename include/ircd/m/{ => room}/room.h (97%) diff --git a/include/ircd/m/event.h b/include/ircd/m/event/event.h similarity index 94% rename from include/ircd/m/event.h rename to include/ircd/m/event/event.h index 33dd16eda..2761b77fb 100644 --- a/include/ircd/m/event.h +++ b/include/ircd/m/event/event.h @@ -136,15 +136,15 @@ struct ircd::m::event event() = default; }; -#include "event/prev.h" -#include "event/refs.h" -#include "event/auth.h" -#include "event/index.h" -#include "event/event_id.h" -#include "event/fetch.h" -#include "event/get.h" -#include "event/cached.h" -#include "event/prefetch.h" -#include "event/conforms.h" -#include "event/append.h" -#include "event/pretty.h" +#include "prev.h" +#include "refs.h" +#include "auth.h" +#include "index.h" +#include "event_id.h" +#include "fetch.h" +#include "get.h" +#include "cached.h" +#include "prefetch.h" +#include "conforms.h" +#include "append.h" +#include "pretty.h" diff --git a/include/ircd/m/m.h b/include/ircd/m/m.h index 1f9513c88..65d7c8349 100644 --- a/include/ircd/m/m.h +++ b/include/ircd/m/m.h @@ -32,13 +32,13 @@ namespace ircd::m::vm #include "error.h" #include "self.h" #include "id.h" -#include "event.h" +#include "event/event.h" #include "dbs.h" #include "state.h" #include "vm.h" #include "invite_3pid.h" #include "createroom.h" -#include "room.h" +#include "room/room.h" #include "user.h" #include "users.h" #include "rooms.h" diff --git a/include/ircd/m/room.h b/include/ircd/m/room/room.h similarity index 97% rename from include/ircd/m/room.h rename to include/ircd/m/room/room.h index 2cb8007a0..b526b6f0e 100644 --- a/include/ircd/m/room.h +++ b/include/ircd/m/room/room.h @@ -183,15 +183,15 @@ struct ircd::m::room static size_t purge(const room &); // cuidado! }; -#include "room/messages.h" -#include "room/state.h" -#include "room/members.h" -#include "room/origins.h" -#include "room/head.h" -#include "room/auth.h" -#include "room/power.h" -#include "room/aliases.h" -#include "room/stats.h" +#include "messages.h" +#include "state.h" +#include "members.h" +#include "origins.h" +#include "head.h" +#include "auth.h" +#include "power.h" +#include "aliases.h" +#include "stats.h" inline ircd::m::room::operator const ircd::m::room::id &()