thek0tyara/nheko
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make Nheko compile on Qt6

Browse source
This commit is contained in:
Nicolas Werner 2023-06-02 00:24:26 +02:00
parent 0ac46ea209
commit b518f6902e
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
39 changed files with 108 additions and 361 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/timeline/EventStore.cpp
View file

@ -15,11 +15,9 @@
#include "EventAccessors.h"
#include "Logging.h"
#include "MatrixClient.h"
#include "TimelineModel.h"
#include "UserSettingsPage.h"
#include "Utils.h"
Q_DECLARE_METATYPE(Reaction)
QCache<EventStore::IdIndex, olm::DecryptionResult> EventStore::decryptedEvents_{1000};
QCache<EventStore::IdIndex, mtx::events::collections::TimelineEvents> EventStore::events_by_id_{
@ -29,8 +27,6 @@ QCache<EventStore::Index, mtx::events::collections::TimelineEvents> EventStore::
EventStore::EventStore(std::string room_id, QObject *)
: room_id_(std::move(room_id))
{
static auto reactionType = qRegisterMetaType<Reaction>();
(void)reactionType;
auto range = cache::client()->getTimelineRange(room_id_);
@ -293,12 +289,12 @@ EventStore::EventStore(std::string room_id, QObject *)
}
void
EventStore::addPending(mtx::events::collections::TimelineEvents event)
EventStore::addPending(const mtx::events::collections::TimelineEvents& event)
{
if (this->thread() != QThread::currentThread())
nhlog::db()->warn("{} called from a different thread!", __func__);
cache::client()->savePendingMessage(this->room_id_, {event});
cache::client()->savePendingMessage(this->room_id_, event);
mtx::responses::Timeline events;
events.limited = false;
events.events.emplace_back(event);
@ -761,11 +757,11 @@ EventStore::decryptEvent(const IdIndex &idx,
}
void
EventStore::refetchOnlineKeyBackupKeys(TimelineModel *room)
EventStore::refetchOnlineKeyBackupKeys()
{
for (const auto &[session_id, request] : room->events.pending_key_requests) {
for (const auto &[session_id, request] : this->pending_key_requests) {
(void)request;
olm::lookup_keybackup(room->events.room_id_, session_id);
olm::lookup_keybackup(this->room_id_, session_id);
}
}