summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKonstantinos Sideris <sideris.konstantin@gmail.com>2017-11-15 18:42:21 +0200
committerKonstantinos Sideris <sideris.konstantin@gmail.com>2017-11-15 18:42:21 +0200
commit4166a863b405c54e4458adbdf8e54c6c4b06d6ee (patch)
tree42f19a935772b67a608ea9314abd6d90698ec7e8 /src
parent4e1c8dd6639c2debe1e14c94e564237fb76ef48a (diff)
Lint
Diffstat (limited to 'src')
-rw-r--r--src/TimelineView.cc17
-rw-r--r--src/TimelineViewManager.cc11
2 files changed, 17 insertions, 11 deletions
diff --git a/src/TimelineView.cc b/src/TimelineView.cc
index 0e45bf63..b1fb2ad0 100644
--- a/src/TimelineView.cc
+++ b/src/TimelineView.cc
@@ -247,7 +247,8 @@ TimelineView::parseMessageEvent(const QJsonObject &event, TimelineDirection dire
eventIds_[text.eventId()] = true;
QString txnid = text.unsignedData().transactionId();
- if (!txnid.isEmpty() && isPendingMessage(txnid, text.sender(), local_user_)) {
+ if (!txnid.isEmpty() &&
+ isPendingMessage(txnid, text.sender(), local_user_)) {
removePendingMessage(txnid);
return nullptr;
}
@@ -293,7 +294,8 @@ TimelineView::parseMessageEvent(const QJsonObject &event, TimelineDirection dire
eventIds_[img.eventId()] = true;
QString txnid = img.unsignedData().transactionId();
- if (!txnid.isEmpty() && isPendingMessage(txnid, img.sender(), local_user_)) {
+ if (!txnid.isEmpty() &&
+ isPendingMessage(txnid, img.sender(), local_user_)) {
removePendingMessage(txnid);
return nullptr;
}
@@ -319,7 +321,8 @@ TimelineView::parseMessageEvent(const QJsonObject &event, TimelineDirection dire
eventIds_[emote.eventId()] = true;
QString txnid = emote.unsignedData().transactionId();
- if (!txnid.isEmpty() && isPendingMessage(txnid, emote.sender(), local_user_)) {
+ if (!txnid.isEmpty() &&
+ isPendingMessage(txnid, emote.sender(), local_user_)) {
removePendingMessage(txnid);
return nullptr;
}
@@ -499,7 +502,7 @@ void
TimelineView::updatePendingMessage(int txn_id, QString event_id)
{
if (pending_msgs_.head().txn_id == txn_id) { // We haven't received it yet
- auto msg = pending_msgs_.dequeue();
+ auto msg = pending_msgs_.dequeue();
msg.event_id = event_id;
pending_sent_msgs_.append(msg);
}
@@ -546,7 +549,8 @@ TimelineView::addUserMessage(const QString &url, const QString &filename)
lastSender_ = user_id;
int txn_id = client_->incrementTransactionId();
- PendingMessage message(matrix::events::MessageEventType::Image, txn_id, url, filename, "", view_item);
+ PendingMessage message(
+ matrix::events::MessageEventType::Image, txn_id, url, filename, "", view_item);
handleNewUserMessage(message);
}
@@ -567,7 +571,8 @@ TimelineView::sendNextPendingMessage()
PendingMessage &m = pending_msgs_.head();
switch (m.ty) {
case matrix::events::MessageEventType::Image:
- client_->sendRoomMessage(m.ty, m.txn_id, room_id_, QFileInfo(m.filename).fileName(), m.body);
+ client_->sendRoomMessage(
+ m.ty, m.txn_id, room_id_, QFileInfo(m.filename).fileName(), m.body);
break;
default:
client_->sendRoomMessage(m.ty, m.txn_id, room_id_, m.body);
diff --git a/src/TimelineViewManager.cc b/src/TimelineViewManager.cc
index 35c2a560..ec7b8446 100644
--- a/src/TimelineViewManager.cc
+++ b/src/TimelineViewManager.cc
@@ -36,9 +36,10 @@ TimelineViewManager::TimelineViewManager(QSharedPointer<MatrixClient> client, QW
connect(
client_.data(), &MatrixClient::messageSent, this, &TimelineViewManager::messageSent);
- connect(
- client_.data(), &MatrixClient::messageSendFailed,
- this, &TimelineViewManager::messageSendFailed);
+ connect(client_.data(),
+ &MatrixClient::messageSendFailed,
+ this,
+ &TimelineViewManager::messageSendFailed);
}
TimelineViewManager::~TimelineViewManager() {}
@@ -81,8 +82,8 @@ TimelineViewManager::queueEmoteMessage(const QString &msg)
void
TimelineViewManager::queueImageMessage(const QString &roomid,
- const QString &filename,
- const QString &url)
+ const QString &filename,
+ const QString &url)
{
if (!views_.contains(roomid)) {
qDebug() << "Cannot send m.image message to a non-managed view";