From 9671b1c0d6b1dc70a8f5a7b23ea8166dcbd07a16 Mon Sep 17 00:00:00 2001 From: redsky17 Date: Mon, 27 May 2019 16:06:28 -0400 Subject: Fix linting issues --- src/timeline/TimelineItem.cpp | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'src/timeline/TimelineItem.cpp') diff --git a/src/timeline/TimelineItem.cpp b/src/timeline/TimelineItem.cpp index 24685641..faae1da3 100644 --- a/src/timeline/TimelineItem.cpp +++ b/src/timeline/TimelineItem.cpp @@ -126,8 +126,8 @@ void TimelineItem::adjustMessageLayoutForWidget() { messageLayout_->addLayout(widgetLayout_, 1); - actionLayout_->addWidget(replyBtn_); - actionLayout_->addWidget(contextBtn_); + actionLayout_->addWidget(replyBtn_); + actionLayout_->addWidget(contextBtn_); messageLayout_->addLayout(actionLayout_); messageLayout_->addWidget(statusIndicator_); messageLayout_->addWidget(timestamp_); @@ -145,8 +145,8 @@ void TimelineItem::adjustMessageLayout() { messageLayout_->addWidget(body_, 1); - actionLayout_->addWidget(replyBtn_); - actionLayout_->addWidget(contextBtn_); + actionLayout_->addWidget(replyBtn_); + actionLayout_->addWidget(contextBtn_); messageLayout_->addLayout(actionLayout_); messageLayout_->addWidget(statusIndicator_); messageLayout_->addWidget(timestamp_); @@ -163,10 +163,10 @@ TimelineItem::adjustMessageLayout() void TimelineItem::init() { - userAvatar_ = nullptr; - timestamp_ = nullptr; - userName_ = nullptr; - body_ = nullptr; + userAvatar_ = nullptr; + timestamp_ = nullptr; + userName_ = nullptr; + body_ = nullptr; auto buttonSize_ = 32; contextMenu_ = new QMenu(this); @@ -179,7 +179,6 @@ TimelineItem::init() contextMenu_->addAction(markAsRead_); contextMenu_->addAction(redactMsg_); - connect(showReadReceipts_, &QAction::triggered, this, [this]() { if (!event_id_.isEmpty()) MainWindow::instance()->openReadReceiptsDialog(event_id_); @@ -221,7 +220,7 @@ TimelineItem::init() topLayout_ = new QHBoxLayout(this); mainLayout_ = new QVBoxLayout; messageLayout_ = new QHBoxLayout; - actionLayout_ = new QHBoxLayout; + actionLayout_ = new QHBoxLayout; messageLayout_->setContentsMargins(0, 0, MSG_RIGHT_MARGIN, 0); messageLayout_->setSpacing(MSG_PADDING); @@ -870,13 +869,13 @@ TimelineItem::addReplyAction() } void -TimelineItem::replyAction() { - if (!body_) - return; +TimelineItem::replyAction() +{ + if (!body_) + return; - emit ChatPage::instance()->messageReply( - Cache::displayName(room_id_, descriptionMsg_.userid), - body_->toPlainText()); + emit ChatPage::instance()->messageReply( + Cache::displayName(room_id_, descriptionMsg_.userid), body_->toPlainText()); } void -- cgit 1.5.1