New upstream version 0.7.0

1 files changed, 10 insertions, 31 deletions

diff --git a/lib/events/directchatevent.h b/lib/events/directchatevent.h
index 7559796b..0756d816 100644
--- a/lib/events/directchatevent.h
+++ b/lib/events/directchatevent.h
@@ -1,38 +1,17 @@
-/******************************************************************************
- * Copyright (C) 2018 Kitsune Ral <kitsune-ral@users.sf.net>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- */
+// SPDX-FileCopyrightText: 2018 Kitsune Ral <kitsune-ral@users.sf.net>
+// SPDX-License-Identifier: LGPL-2.1-or-later
 
 #pragma once
 
 #include "event.h"
 
-namespace QMatrixClient
-{
-    class DirectChatEvent : public Event
-    {
-        public:
-            DEFINE_EVENT_TYPEID("m.direct", DirectChatEvent)
+namespace Quotient {
+class QUOTIENT_API DirectChatEvent : public Event {
+public:
+    QUO_EVENT(DirectChatEvent, "m.direct")
 
-            explicit DirectChatEvent(const QJsonObject& obj)
-                : Event(typeId(), obj)
-            { }
+    using Event::Event;
 
-            QMultiHash<QString, QString> usersToDirectChats() const;
-    };
-    REGISTER_EVENT_TYPE(DirectChatEvent)
-    DEFINE_EVENTTYPE_ALIAS(DirectChat, DirectChatEvent)
-}
+    QMultiHash<QString, QString> usersToDirectChats() const;
+};
+} // namespace Quotient