From 7f0ad89bca6b368367357587bde995bc5eec4b50 Mon Sep 17 00:00:00 2001
From: Max Sandholm <max@sandholm.org>
Date: Tue, 31 Oct 2017 07:47:19 +0200
Subject: [PATCH] Fix merge errors

---
 include/ChatPage.h         | 2 ++
 include/RoomInfoListItem.h | 8 ++++----
 resources/res.qrc          | 7 -------
 src/CommunitiesListItem.cc | 2 +-
 src/MatrixClient.cc        | 4 ++--
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/include/ChatPage.h b/include/ChatPage.h
index 567ef551..773e3bc5 100644
--- a/include/ChatPage.h
+++ b/include/ChatPage.h
@@ -26,6 +26,8 @@
 #include "MemberEventContent.h"
 #include "MessageEvent.h"
 #include "StateEvent.h"
+#include "CommunitiesList.h"
+#include "Community.h"
 
 class Cache;
 class MatrixClient;
diff --git a/include/RoomInfoListItem.h b/include/RoomInfoListItem.h
index 63a73a04..992a3b5b 100644
--- a/include/RoomInfoListItem.h
+++ b/include/RoomInfoListItem.h
@@ -51,13 +51,13 @@ public:
         void clearUnreadMessageCount();
         void setState(const RoomState &state);
 
-        bool isPressed() const { return isPressed_; };
-        RoomState state() const { return state_; };
-        int unreadMessageCount() const { return unreadMsgCount_; };
+        bool isPressed() const { return isPressed_; }
+        RoomState state() const { return state_; }
+        int unreadMessageCount() const { return unreadMsgCount_; }
 
         void setAvatar(const QImage &avatar_image);
         void setDescriptionMessage(const DescInfo &info);
-        inline QString roomId();
+        QString roomId() { return roomId_; }
 
 signals:
         void clicked(const QString &room_id);
diff --git a/resources/res.qrc b/resources/res.qrc
index a3ba1b98..5d87f9ed 100644
--- a/resources/res.qrc
+++ b/resources/res.qrc
@@ -66,13 +66,6 @@
         <file>fonts/OpenSans/OpenSans-Italic.ttf</file>
         <file>fonts/OpenSans/OpenSans-Bold.ttf</file>
         <file>fonts/OpenSans/OpenSans-Semibold.ttf</file>
-<<<<<<< HEAD
-
-=======
-        <file>fonts/OpenSans/OpenSans-SemiboldItalic.ttf</file>
-        <file>fonts/OpenSans/OpenSans-ExtraBold.ttf</file>
-        <file>fonts/OpenSans/OpenSans-ExtraBoldItalic.ttf</file>
->>>>>>> 4e60338... Initial implementation of Communities (groups) feature
         <file>fonts/EmojiOne/emojione-android.ttf</file>
     </qresource>
     <qresource prefix="/"/>
diff --git a/src/CommunitiesListItem.cc b/src/CommunitiesListItem.cc
index 5f4253f6..6bb13014 100644
--- a/src/CommunitiesListItem.cc
+++ b/src/CommunitiesListItem.cc
@@ -171,7 +171,7 @@ WorldCommunityListItem::paintEvent(QPaintEvent *event)
 {
         Q_UNUSED(event);
 
-        static QPixmap worldIcon(":/icons/icons/world.png");
+        static QPixmap worldIcon(":/icons/icons/ui/world.png");
 
         QPainter p(this);
         p.setRenderHint(QPainter::SmoothPixmapTransform);
diff --git a/src/MatrixClient.cc b/src/MatrixClient.cc
index 8778c6c7..e0282e6a 100644
--- a/src/MatrixClient.cc
+++ b/src/MatrixClient.cc
@@ -487,7 +487,7 @@ MatrixClient::getOwnCommunities() noexcept
                 }
 
                 auto data = reply->readAll();
-                auto json = QJsonDocument::fromJson(data);
+                auto json = QJsonDocument::fromJson(data).object();
                 try {
                         QList<QString> response;
                         for (auto it = json["groups"].toArray().constBegin();
@@ -549,7 +549,7 @@ MatrixClient::fetchRoomAvatar(const QString &roomid, const QUrl &avatar_url)
 }
 
 void
-MatrixClient::fetchCommunityAvatar(const QString &communityid, const QUrl &avatar_url)
+MatrixClient::fetchCommunityAvatar(const QString &communityId, const QUrl &avatar_url)
 {
         QList<QString> url_parts = avatar_url.toString().split("mxc://");