From 4e46c747cfba093d37f9d7c6b0f11be1e7a0a499 Mon Sep 17 00:00:00 2001 From: Jani Mustonen Date: Tue, 14 Nov 2017 06:42:08 +0200 Subject: [PATCH] Adhere to change request --- include/TimelineView.h | 4 ++-- src/TimelineView.cc | 8 +++++--- src/TimelineViewManager.cc | 7 +++---- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/include/TimelineView.h b/include/TimelineView.h index 695e15f7..af0e9386 100644 --- a/include/TimelineView.h +++ b/include/TimelineView.h @@ -91,8 +91,8 @@ public: // Add new events at the end of the timeline. int addEvents(const Timeline &timeline); - void addUserMessage(matrix::events::MessageEventType ty, const QString &msg, int txn_id); - void addUserMessage(const QString &url, const QString &filename, int txn_id); + void addUserMessage(matrix::events::MessageEventType ty, const QString &msg); + void addUserMessage(const QString &url, const QString &filename); void updatePendingMessage(int txn_id, QString event_id); void scrollDown(); diff --git a/src/TimelineView.cc b/src/TimelineView.cc index 4fd714fd..0e45bf63 100644 --- a/src/TimelineView.cc +++ b/src/TimelineView.cc @@ -507,7 +507,7 @@ TimelineView::updatePendingMessage(int txn_id, QString event_id) } void -TimelineView::addUserMessage(matrix::events::MessageEventType ty, const QString &body, int txn_id) +TimelineView::addUserMessage(matrix::events::MessageEventType ty, const QString &body) { QSettings settings; auto user_id = settings.value("auth/user_id").toString(); @@ -522,12 +522,13 @@ TimelineView::addUserMessage(matrix::events::MessageEventType ty, const QString lastSender_ = user_id; + int txn_id = client_->incrementTransactionId(); PendingMessage message(ty, txn_id, body, "", "", view_item); handleNewUserMessage(message); } void -TimelineView::addUserMessage(const QString &url, const QString &filename, int txn_id) +TimelineView::addUserMessage(const QString &url, const QString &filename) { QSettings settings; auto user_id = settings.value("auth/user_id").toString(); @@ -544,6 +545,7 @@ TimelineView::addUserMessage(const QString &url, const QString &filename, int tx lastSender_ = user_id; + int txn_id = client_->incrementTransactionId(); PendingMessage message(matrix::events::MessageEventType::Image, txn_id, url, filename, "", view_item); handleNewUserMessage(message); } @@ -628,7 +630,7 @@ TimelineView::removePendingMessage(const QString &txnid) void TimelineView::handleFailedMessage(int txnid) { + Q_UNUSED(txnid); // Note: We do this even if the message has already been echoed. - (void)txnid; // We don't need it. QTimer::singleShot(500, this, SLOT(sendNextPendingMessage())); } diff --git a/src/TimelineViewManager.cc b/src/TimelineViewManager.cc index 00608b4e..d98168c0 100644 --- a/src/TimelineViewManager.cc +++ b/src/TimelineViewManager.cc @@ -67,7 +67,7 @@ TimelineViewManager::queueTextMessage(const QString &msg) auto room_id = active_room_; auto view = views_[room_id]; - view->addUserMessage(matrix::events::MessageEventType::Text, msg, client_->incrementTransactionId()); + view->addUserMessage(matrix::events::MessageEventType::Text, msg); } void @@ -76,8 +76,7 @@ TimelineViewManager::queueEmoteMessage(const QString &msg) auto room_id = active_room_; auto view = views_[room_id]; - view->addUserMessage( - matrix::events::MessageEventType::Emote, msg, client_->incrementTransactionId()); + view->addUserMessage(matrix::events::MessageEventType::Emote, msg); } void @@ -92,7 +91,7 @@ TimelineViewManager::queueImageMessage(const QString &roomid, auto view = views_[roomid]; - view->addUserMessage(url, filename, client_->incrementTransactionId()); + view->addUserMessage(url, filename); } void