summary refs log tree commit diff
path: root/src/MatrixClient.cpp
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2021-02-01 18:42:38 -0500
committerJoseph Donofry <joedonofry@gmail.com>2021-02-01 18:42:38 -0500
commit53c653a228f529bab3753ca99dee18a5bf5342a2 (patch)
treead0ba40d27ca5a515f1f33c29c910e5cf7b20dd7 /src/MatrixClient.cpp
parentRemove redundant import and fix visible warning (diff)
parentFix emojis with fe0f in the middle (diff)
downloadnheko-53c653a228f529bab3753ca99dee18a5bf5342a2.tar.xz
Merge remote-tracking branch 'nheko-im/master' into privacy_screen
Diffstat (limited to 'src/MatrixClient.cpp')
-rw-r--r--src/MatrixClient.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/MatrixClient.cpp b/src/MatrixClient.cpp

index b69ba480..669dc270 100644 --- a/src/MatrixClient.cpp +++ b/src/MatrixClient.cpp
@@ -1,6 +1,7 @@ #include "MatrixClient.h" #include <memory> +#include <set> #include <QMetaType> #include <QObject> @@ -21,6 +22,7 @@ Q_DECLARE_METATYPE(nlohmann::json) Q_DECLARE_METATYPE(std::string) Q_DECLARE_METATYPE(std::vector<std::string>) Q_DECLARE_METATYPE(std::vector<QString>) +Q_DECLARE_METATYPE(std::set<QString>) namespace { auto client_ = std::make_shared<mtx::http::Client>(); @@ -55,6 +57,7 @@ init() qRegisterMetaType<std::vector<std::string>>(); qRegisterMetaType<std::vector<QString>>(); qRegisterMetaType<std::map<QString, bool>>("std::map<QString, bool>"); + qRegisterMetaType<std::set<QString>>(); } } // namespace http