rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix merge errors

Browse Source
This commit is contained in:
Max Sandholm 2017-10-31 07:47:19 +02:00
parent 0f76f0115e
commit 7f0ad89bca
5 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ChatPage.h
View File

@ -26,6 +26,8 @@
#include "MemberEventContent.h"
#include "MessageEvent.h"
#include "StateEvent.h"
#include "CommunitiesList.h"
#include "Community.h"
class Cache;
class MatrixClient;

8
include/RoomInfoListItem.h
View File

@ -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);

7
resources/res.qrc
View File

@ -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="/"/>

2
src/CommunitiesListItem.cc
View File

@ -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);

4
src/MatrixClient.cc
View File

@ -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://");