summary refs log tree commit diff
path: root/include
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2018-06-14 02:28:35 +0300
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2018-06-14 02:28:35 +0300
commit8e9d210a2a2136d1d517645b2b2412b15da09360 (patch)
treeb58bd7b236e9759bbc4b310ebffb0687f89db47d /include
parentAdd support for sending encrypted messages (diff)
downloadnheko-8e9d210a2a2136d1d517645b2b2412b15da09360.tar.xz
Rename the log namespace to avoid symbol clash with the math function
- Patch the olm repo with a CMakeLists.txt file
Diffstat (limited to 'include')
-rw-r--r--include/Logging.hpp4
-rw-r--r--include/timeline/TimelineItem.h14
2 files changed, 3 insertions, 15 deletions
diff --git a/include/Logging.hpp b/include/Logging.hpp

index bdbd3e2c..2feae60d 100644 --- a/include/Logging.hpp +++ b/include/Logging.hpp
@@ -3,12 +3,12 @@ #include <memory> #include <spdlog/spdlog.h> -namespace log { +namespace nhlog { void init(const std::string &file); std::shared_ptr<spdlog::logger> -main(); +ui(); std::shared_ptr<spdlog::logger> net(); diff --git a/include/timeline/TimelineItem.h b/include/timeline/TimelineItem.h
index 4dcca1a5..6623a82c 100644 --- a/include/timeline/TimelineItem.h +++ b/include/timeline/TimelineItem.h
@@ -194,19 +194,7 @@ public: void setEventId(const QString &event_id) { event_id_ = event_id; } void markReceived(); void setRoomId(QString room_id) { room_id_ = room_id; } - void sendReadReceipt() const - { - if (!event_id_.isEmpty()) - http::v2::client()->read_event( - room_id_.toStdString(), - event_id_.toStdString(), - [this](mtx::http::RequestErr err) { - if (err) { - qWarning() << QString("failed to read_event (%1, %2)") - .arg(room_id_, event_id_); - } - }); - } + void sendReadReceipt() const; //! Add a user avatar for this event. void addAvatar();