15 files changed, 0 insertions, 41 deletions
diff --git a/lib/events/accountdataevents.h b/lib/events/accountdataevents.h
index 68392a32..a8df08a5 100644
--- a/lib/events/accountdataevents.h
+++ b/lib/events/accountdataevents.h
@@ -90,7 +90,4 @@ DEFINE_SIMPLE_EVENT(TagEvent, "m.tag", TagsMap, tags)
 DEFINE_SIMPLE_EVENT(ReadMarkerEvent, "m.fully_read", QString, event_id)
 DEFINE_SIMPLE_EVENT(IgnoredUsersEvent, "m.ignored_user_list", QSet<QString>,
                     ignored_users)
-
-DEFINE_EVENTTYPE_ALIAS(Tag, TagEvent)
-DEFINE_EVENTTYPE_ALIAS(ReadMarker, ReadMarkerEvent)
 } // namespace Quotient
diff --git a/lib/events/callanswerevent.h b/lib/events/callanswerevent.h
index e01b39db..2709882b 100644
--- a/lib/events/callanswerevent.h
+++ b/lib/events/callanswerevent.h
@@ -42,5 +42,4 @@ public:
 };
 
 REGISTER_EVENT_TYPE(CallAnswerEvent)
-DEFINE_EVENTTYPE_ALIAS(CallAnswer, CallAnswerEvent)
 } // namespace Quotient
diff --git a/lib/events/callcandidatesevent.h b/lib/events/callcandidatesevent.h
index 3d13ba8a..e224f048 100644
--- a/lib/events/callcandidatesevent.h
+++ b/lib/events/callcandidatesevent.h
@@ -42,5 +42,4 @@ public:
 };
 
 REGISTER_EVENT_TYPE(CallCandidatesEvent)
-DEFINE_EVENTTYPE_ALIAS(CallCandidates, CallCandidatesEvent)
 } // namespace Quotient
diff --git a/lib/events/callhangupevent.h b/lib/events/callhangupevent.h
index d23e29db..5d73fb62 100644
--- a/lib/events/callhangupevent.h
+++ b/lib/events/callhangupevent.h
@@ -30,5 +30,4 @@ public:
 };
 
 REGISTER_EVENT_TYPE(CallHangupEvent)
-DEFINE_EVENTTYPE_ALIAS(CallHangup, CallHangupEvent)
 } // namespace Quotient
diff --git a/lib/events/callinviteevent.h b/lib/events/callinviteevent.h
index 3e39e0ba..b067a492 100644
--- a/lib/events/callinviteevent.h
+++ b/lib/events/callinviteevent.h
@@ -41,5 +41,4 @@ public:
 };
 
 REGISTER_EVENT_TYPE(CallInviteEvent)
-DEFINE_EVENTTYPE_ALIAS(CallInvite, CallInviteEvent)
 } // namespace Quotient
diff --git a/lib/events/directchatevent.h b/lib/events/directchatevent.h
index b4981f2e..bb091c5c 100644
--- a/lib/events/directchatevent.h
+++ b/lib/events/directchatevent.h
@@ -30,5 +30,4 @@ public:
     QMultiHash<QString, QString> usersToDirectChats() const;
 };
 REGISTER_EVENT_TYPE(DirectChatEvent)
-DEFINE_EVENTTYPE_ALIAS(DirectChat, DirectChatEvent)
 } // namespace Quotient
diff --git a/lib/events/encryptionevent.h b/lib/events/encryptionevent.h
index 68e41719..7bbcc418 100644
--- a/lib/events/encryptionevent.h
+++ b/lib/events/encryptionevent.h
@@ -70,5 +70,4 @@ private:
 };
 
 REGISTER_EVENT_TYPE(EncryptionEvent)
-DEFINE_EVENTTYPE_ALIAS(Encryption, EncryptionEvent)
 } // namespace Quotient
diff --git a/lib/events/event.h b/lib/events/event.h
index e96d6897..d9c8e088 100644
--- a/lib/events/event.h
+++ b/lib/events/event.h
@@ -305,28 +305,6 @@ using Events = EventsArray<Event>;
     }                                                            \
     // End of macro
 
-#ifdef USE_EVENTTYPE_ALIAS
-namespace EventType {
-    inline event_type_t logEventType(event_type_t id, const char* idName)
-    {
-        qDebug(EVENTS) << "Using id" << id << "for" << idName;
-        return id;
-    }
-} // namespace EventType
-
-// This macro provides constants in EventType:: namespace for
-// back-compatibility with libQMatrixClient 0.3 event type system.
-#    define DEFINE_EVENTTYPE_ALIAS(_Id, _Type)                  \
-        namespace EventType {                                   \
-            [[deprecated("Use is<>(), eventCast<>() or "        \
-                         "visit<>()")]] static const auto _Id = \
-                logEventType(typeId<_Type>(), #_Id);            \
-        }                                                       \
-        // End of macro
-#else
-#    define DEFINE_EVENTTYPE_ALIAS(_Id, _Type) // Nothing
-#endif
-
 // === is<>(), eventCast<>() and visit<>() ===
 
 template <typename EventT>
diff --git a/lib/events/receiptevent.h b/lib/events/receiptevent.h
index 71cd5de0..dd54a476 100644
--- a/lib/events/receiptevent.h
+++ b/lib/events/receiptevent.h
@@ -48,5 +48,4 @@ private:
     EventsWithReceipts _eventsWithReceipts;
 };
 REGISTER_EVENT_TYPE(ReceiptEvent)
-DEFINE_EVENTTYPE_ALIAS(Receipt, ReceiptEvent)
 } // namespace Quotient
diff --git a/lib/events/redactionevent.h b/lib/events/redactionevent.h
index eac627d5..3b3af18e 100644
--- a/lib/events/redactionevent.h
+++ b/lib/events/redactionevent.h
@@ -35,5 +35,4 @@ public:
     QString reason() const { return contentJson()["reason"_ls].toString(); }
 };
 REGISTER_EVENT_TYPE(RedactionEvent)
-DEFINE_EVENTTYPE_ALIAS(Redaction, RedactionEvent)
 } // namespace Quotient
diff --git a/lib/events/roomavatarevent.h b/lib/events/roomavatarevent.h
index 109f4014..4013773c 100644
--- a/lib/events/roomavatarevent.h
+++ b/lib/events/roomavatarevent.h
@@ -34,5 +34,4 @@ public:
     QUrl url() const { return content().url; }
 };
 REGISTER_EVENT_TYPE(RoomAvatarEvent)
-DEFINE_EVENTTYPE_ALIAS(RoomAvatar, RoomAvatarEvent)
 } // namespace Quotient
diff --git a/lib/events/roommemberevent.h b/lib/events/roommemberevent.h
index 2a16617a..43aaa8be 100644
--- a/lib/events/roommemberevent.h
+++ b/lib/events/roommemberevent.h
@@ -106,5 +106,4 @@ public:
 };
 
 REGISTER_EVENT_TYPE(RoomMemberEvent)
-DEFINE_EVENTTYPE_ALIAS(RoomMember, RoomMemberEvent)
 } // namespace Quotient
diff --git a/lib/events/roommessageevent.h b/lib/events/roommessageevent.h
index aa515c71..d0dbbfb3 100644
--- a/lib/events/roommessageevent.h
+++ b/lib/events/roommessageevent.h
@@ -90,7 +90,6 @@ private:
     REGISTER_ENUM(MsgType)
 };
 REGISTER_EVENT_TYPE(RoomMessageEvent)
-DEFINE_EVENTTYPE_ALIAS(RoomMessage, RoomMessageEvent)
 using MessageEventType = RoomMessageEvent::MsgType;
 
 namespace EventContent {
diff --git a/lib/events/simplestateevents.h b/lib/events/simplestateevents.h
index 520f6b4b..eb1d2f7a 100644
--- a/lib/events/simplestateevents.h
+++ b/lib/events/simplestateevents.h
@@ -69,13 +69,9 @@ namespace EventContent {
     // End of macro
 
 DEFINE_SIMPLE_STATE_EVENT(RoomNameEvent, "m.room.name", QString, name)
-DEFINE_EVENTTYPE_ALIAS(RoomName, RoomNameEvent)
 DEFINE_SIMPLE_STATE_EVENT(RoomCanonicalAliasEvent, "m.room.canonical_alias",
                           QString, alias)
-DEFINE_EVENTTYPE_ALIAS(RoomCanonicalAlias, RoomCanonicalAliasEvent)
 DEFINE_SIMPLE_STATE_EVENT(RoomTopicEvent, "m.room.topic", QString, topic)
-DEFINE_EVENTTYPE_ALIAS(RoomTopic, RoomTopicEvent)
-DEFINE_EVENTTYPE_ALIAS(RoomEncryption, EncryptionEvent)
 
 class RoomAliasesEvent
     : public StateEvent<EventContent::SimpleContent<QStringList>> {
diff --git a/lib/events/typingevent.h b/lib/events/typingevent.h
index d659c597..1cf4e69d 100644
--- a/lib/events/typingevent.h
+++ b/lib/events/typingevent.h
@@ -33,5 +33,4 @@ private:
     QStringList _users;
 };
 REGISTER_EVENT_TYPE(TypingEvent)
-DEFINE_EVENTTYPE_ALIAS(Typing, TypingEvent)
 } // namespace Quotient