From 1d285993f7f2e41437acafbab3a1335622e85817 Mon Sep 17 00:00:00 2001 From: Konstantinos Sideris Date: Tue, 12 Dec 2017 09:31:00 +0200 Subject: [PATCH] Valgrind run - Fix a memory leak where a layout was created without being used. - Fix uninitialized value. --- include/ui/ScrollBar.h | 2 +- src/timeline/TimelineItem.cc | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/ui/ScrollBar.h b/include/ui/ScrollBar.h index fe8ba64a..45d5b21f 100644 --- a/include/ui/ScrollBar.h +++ b/include/ui/ScrollBar.h @@ -49,7 +49,7 @@ private: int roundRadius_ = 4; int handleWidth_ = 7; int minHandleHeight_ = 20; - bool isActive; + bool isActive = false; const int AnimationDuration = 300; const int Padding = 4; diff --git a/src/timeline/TimelineItem.cc b/src/timeline/TimelineItem.cc index 39b345b5..0534ab7d 100644 --- a/src/timeline/TimelineItem.cc +++ b/src/timeline/TimelineItem.cc @@ -43,10 +43,9 @@ TimelineItem::init() QFontMetrics fm(font_); - topLayout_ = new QHBoxLayout(this); - sideLayout_ = new QVBoxLayout(); - mainLayout_ = new QVBoxLayout(); - headerLayout_ = new QHBoxLayout(); + topLayout_ = new QHBoxLayout(this); + sideLayout_ = new QVBoxLayout; + mainLayout_ = new QVBoxLayout; topLayout_->setContentsMargins(conf::timeline::msgMargin, conf::timeline::msgMargin, 0, 0); topLayout_->setSpacing(0); @@ -59,9 +58,6 @@ TimelineItem::init() mainLayout_->setContentsMargins(conf::timeline::headerLeftMargin, 0, 0, 0); mainLayout_->setSpacing(0); - - headerLayout_->setMargin(0); - headerLayout_->setSpacing(conf::timeline::headerSpacing); } /* @@ -418,6 +414,10 @@ TimelineItem::setupAvatarLayout(const QString &userName) sideLayout_->addWidget(userAvatar_); sideLayout_->addStretch(1); + headerLayout_ = new QHBoxLayout; + headerLayout_->setMargin(0); + headerLayout_->setSpacing(conf::timeline::headerSpacing); + headerLayout_->addWidget(userName_); headerLayout_->addWidget(timestamp_, 1); }