From f4a20cc3710ee8f4b1788f73d05466aa0e660d61 Mon Sep 17 00:00:00 2001
From: Alexey Rusakov <Kitsune-Ral@users.sf.net>
Date: Sat, 7 May 2022 19:02:35 +0200
Subject: More cleanup
---
lib/events/directchatevent.cpp | 2 --
lib/events/eventcontent.h | 2 +-
lib/events/roomevent.cpp | 4 ++--
lib/events/stateevent.cpp | 4 ++--
lib/room.cpp | 9 +++++----
lib/room.h | 3 ++-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/lib/events/directchatevent.cpp b/lib/events/directchatevent.cpp
index 0ee1f7b0..83bb1e32 100644
--- a/lib/events/directchatevent.cpp
+++ b/lib/events/directchatevent.cpp
@@ -3,8 +3,6 @@
#include "directchatevent.h"
-#include <QtCore/QJsonArray>
-
using namespace Quotient;
QMultiHash<QString, QString> DirectChatEvent::usersToDirectChats() const
diff --git a/lib/events/eventcontent.h b/lib/events/eventcontent.h
index 6aee333d..bbd35618 100644
--- a/lib/events/eventcontent.h
+++ b/lib/events/eventcontent.h
@@ -40,7 +40,7 @@ namespace EventContent {
Base(const Base&) = default;
Base(Base&&) = default;
- virtual void fillJson(QJsonObject& o) const = 0;
+ virtual void fillJson(QJsonObject&) const = 0;
};
// The below structures fairly follow CS spec 11.2.1.6. The overall
diff --git a/lib/events/roomevent.cpp b/lib/events/roomevent.cpp
index 707cf4fd..3ddf5ac4 100644
--- a/lib/events/roomevent.cpp
+++ b/lib/events/roomevent.cpp
@@ -103,7 +103,7 @@ void RoomEvent::dumpTo(QDebug dbg) const
QJsonObject CallEventBase::basicJson(const QString& matrixType,
const QString& callId, int version,
- QJsonObject content)
+ QJsonObject contentJson)
{
contentJson.insert(QStringLiteral("call_id"), callId);
contentJson.insert(QStringLiteral("version"), version);
@@ -116,7 +116,7 @@ CallEventBase::CallEventBase(Type type, event_mtype_t matrixType,
: RoomEvent(type, basicJson(matrixType, callId, version, contentJson))
{}
-CallEventBase::CallEventBase(Event::Type type, const QJsonObject& json)
+CallEventBase::CallEventBase(Type type, const QJsonObject& json)
: RoomEvent(type, json)
{
if (callId().isEmpty())
diff --git a/lib/events/stateevent.cpp b/lib/events/stateevent.cpp
index 0fd489d1..c343e37f 100644
--- a/lib/events/stateevent.cpp
+++ b/lib/events/stateevent.cpp
@@ -6,9 +6,9 @@
using namespace Quotient;
StateEventBase::StateEventBase(Type type, const QJsonObject& json)
- : RoomEvent(json.contains(StateKeyKeyL) ? type : unknownEventTypeId(), json)
+ : RoomEvent(json.contains(StateKeyKeyL) ? type : UnknownEventTypeId, json)
{
- if (Event::type() == unknownEventTypeId() && !json.contains(StateKeyKeyL))
+ if (Event::type() == UnknownEventTypeId && !json.contains(StateKeyKeyL))
qWarning(EVENTS) << "Attempt to create a state event with no stateKey -"
"forcing the event type to unknown to avoid damage";
}
diff --git a/lib/room.cpp b/lib/room.cpp
index 183e242a..4d9f952c 100644
--- a/lib/room.cpp
+++ b/lib/room.cpp
@@ -3064,15 +3064,16 @@ Room::Changes Room::processEphemeralEvent(EventPtr&& event)
QElapsedTimer et;
et.start();
if (auto* evt = eventCast<TypingEvent>(event)) {
+ const auto& users = evt->users();
d->usersTyping.clear();
- d->usersTyping.reserve(evt->users().size()); // Assume all are members
- for (const auto& userId : evt->users())
+ d->usersTyping.reserve(users.size()); // Assume all are members
+ for (const auto& userId : users)
if (isMember(userId))
d->usersTyping.append(user(userId));
- if (evt->users().size() > 3 || et.nsecsElapsed() >= profilerMinNsecs())
+ if (users.size() > 3 || et.nsecsElapsed() >= profilerMinNsecs())
qCDebug(PROFILER)
- << "Processing typing events from" << evt->users().size()
+ << "Processing typing events from" << users.size()
<< "user(s) in" << objectName() << "took" << et;
emit typingChanged();
}
diff --git a/lib/room.h b/lib/room.h
index 6ba7feac..7e53aed0 100644
--- a/lib/room.h
+++ b/lib/room.h
@@ -758,7 +758,8 @@ public:
[[deprecated("Use currentState().get() instead; "
"make sure to check its result for nullptrs")]] //
const Quotient::StateEventBase*
- getCurrentState(const QString& evtType, const QString& stateKey = {}) const;
+ getCurrentState(const QString& evtType,
+ const QString& stateKey = {}) const;
/// Get a state event with the given event type and state key
/*! This is a typesafe overload that accepts a C++ event type instead of
--
cgit v1.2.3