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

Rename EventStore::event to get to remove ambiguity with QObject::event

Browse source
This commit is contained in:
Nicolas Werner 2020-07-26 12:33:30 +02:00
parent 28e7ea40cb
commit a00b11def7
3 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/timeline/EventStore.cpp
View file

@ -264,7 +264,7 @@ EventStore::reactions(const std::string &event_id)
auto self = http::client()->user_id().to_string();
for (const auto &id : event_ids) {
auto related_event = event(id, event_id);
auto related_event = get(id, event_id);
if (!related_event)
continue;
@ -313,7 +313,7 @@ EventStore::reactions(const std::string &event_id)
}
mtx::events::collections::TimelineEvents *
EventStore::event(int idx, bool decrypt)
EventStore::get(int idx, bool decrypt)
{
if (this->thread() != QThread::currentThread())
nhlog::db()->warn("{} called from a different thread!", __func__);
@ -479,7 +479,7 @@ EventStore::decryptEvent(const IdIndex &idx,
}
mtx::events::collections::TimelineEvents *
EventStore::event(std::string_view id, std::string_view related_to, bool decrypt)
EventStore::get(std::string_view id, std::string_view related_to, bool decrypt)
{
if (this->thread() != QThread::currentThread())
nhlog::db()->warn("{} called from a different thread!", __func__);