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

Fix build with build system optimizations of mtxclient

Browse Source
This commit is contained in:
Nicolas Werner 2020-01-29 23:39:05 +01:00
parent d6d4076d36
commit a07e699811
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -333,7 +333,7 @@ if(USE_BUNDLED_MTXCLIENT)
FetchContent_Declare( FetchContent_Declare(
MatrixClient MatrixClient
GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git GIT_REPOSITORY https://github.com/Nheko-Reborn/mtxclient.git
GIT_TAG 03b5008a05f895e91e3968de7b68db50f6c41b2a GIT_TAG 19e7d680bf5e8bc6a25586a225e881fe4e60d9fb
) )
FetchContent_MakeAvailable(MatrixClient) FetchContent_MakeAvailable(MatrixClient)
else() else()

12
src/CacheStructs.h
View File

@ -29,10 +29,10 @@ struct ReadReceiptKey
}; };
void void
to_json(json &j, const ReadReceiptKey &key); to_json(nlohmann::json &j, const ReadReceiptKey &key);
void void
from_json(const json &j, ReadReceiptKey &key); from_json(const nlohmann::json &j, ReadReceiptKey &key);
struct DescInfo struct DescInfo
{ {
@ -68,9 +68,9 @@ struct RoomInfo
}; };
void void
to_json(json &j, const RoomInfo &info); to_json(nlohmann::json &j, const RoomInfo &info);
void void
from_json(const json &j, RoomInfo &info); from_json(const nlohmann::json &j, RoomInfo &info);
//! Basic information per member; //! Basic information per member;
struct MemberInfo struct MemberInfo
@ -80,9 +80,9 @@ struct MemberInfo
}; };
void void
to_json(json &j, const MemberInfo &info); to_json(nlohmann::json &j, const MemberInfo &info);
void void
from_json(const json &j, MemberInfo &info); from_json(const nlohmann::json &j, MemberInfo &info);
struct RoomSearchResult struct RoomSearchResult
{ {

2
src/Utils.h
View File

@ -272,7 +272,7 @@ getMessageBody(const RoomMessageT &event)
if (event.content.format.empty()) if (event.content.format.empty())
return QString::fromStdString(event.content.body).toHtmlEscaped(); return QString::fromStdString(event.content.body).toHtmlEscaped();
if (event.content.format != common::FORMAT_MSG_TYPE) if (event.content.format != mtx::common::FORMAT_MSG_TYPE)
return QString::fromStdString(event.content.body).toHtmlEscaped(); return QString::fromStdString(event.content.body).toHtmlEscaped();
return QString::fromStdString(event.content.formatted_body); return QString::fromStdString(event.content.formatted_body);