Merge branch 'master' of https://github.com/quotient-im/libQuotient into

bhat-libqtolm-update

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/events/reactionevent.cpp b/lib/events/reactionevent.cpp
index 0081edc2..003c8ead 100644
--- a/lib/events/reactionevent.cpp
+++ b/lib/events/reactionevent.cpp
@@ -13,15 +13,15 @@
  *
  * 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
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #include "reactionevent.h"
 
-using namespace QMatrixClient;
+using namespace Quotient;
 
-void QMatrixClient::JsonObjectConverter<EventRelation>::dumpTo(
-        QJsonObject& jo, const EventRelation& pod)
+void JsonObjectConverter<EventRelation>::dumpTo(
+    QJsonObject& jo, const EventRelation& pod)
 {
     if (pod.type.isEmpty()) {
         qCWarning(MAIN) << "Empty relation type; won't dump to JSON";
@@ -33,8 +33,8 @@ void QMatrixClient::JsonObjectConverter<EventRelation>::dumpTo(
         jo.insert(QStringLiteral("key"), pod.key);
 }
 
-void QMatrixClient::JsonObjectConverter<EventRelation>::fillFrom(
-        const QJsonObject& jo, EventRelation& pod)
+void JsonObjectConverter<EventRelation>::fillFrom(
+    const QJsonObject& jo, EventRelation& pod)
 {
     // The experimental logic for generic relationships (MSC1849)
     fromJson(jo["rel_type"_ls], pod.type);