From f3c8ab52faf03329fd6e88f37e83bbb8279e7628 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 26 Jan 2018 07:29:20 +0100 Subject: [PATCH] AutoTest: Avoid unnecessary local object Change-Id: I9794a35ce5f983114769f3a14ab970f4e822471f Reviewed-by: David Schulz --- src/plugins/autotest/testresultdelegate.cpp | 8 +++++--- src/plugins/autotest/testresultdelegate.h | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/plugins/autotest/testresultdelegate.cpp b/src/plugins/autotest/testresultdelegate.cpp index 68403948318..d59d0441614 100644 --- a/src/plugins/autotest/testresultdelegate.cpp +++ b/src/plugins/autotest/testresultdelegate.cpp @@ -55,13 +55,11 @@ void TestResultDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op { QStyleOptionViewItem opt = option; initStyleOption(&opt, index); - painter->save(); QFontMetrics fm(opt.font); QBrush background; QColor foreground; - const QAbstractItemView *view = qobject_cast(opt.widget); const bool selected = opt.state & QStyle::State_Selected; if (selected) { @@ -71,10 +69,14 @@ void TestResultDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op background = opt.palette.window().color(); foreground = opt.palette.text().color(); } + + auto resultFilterModel = qobject_cast(index.model()); + if (!resultFilterModel) + return; + painter->save(); painter->fillRect(opt.rect, background); painter->setPen(foreground); - TestResultFilterModel *resultFilterModel = static_cast(view->model()); LayoutPositions positions(opt, resultFilterModel); const TestResult *testResult = resultFilterModel->testResult(index); QTC_ASSERT(testResult, painter->restore();return); diff --git a/src/plugins/autotest/testresultdelegate.h b/src/plugins/autotest/testresultdelegate.h index 2161906a606..bc61f2a0675 100644 --- a/src/plugins/autotest/testresultdelegate.h +++ b/src/plugins/autotest/testresultdelegate.h @@ -56,7 +56,7 @@ private: class LayoutPositions { public: - LayoutPositions(QStyleOptionViewItem &options, TestResultFilterModel *filterModel) + LayoutPositions(QStyleOptionViewItem &options, const TestResultFilterModel *filterModel) : m_totalWidth(options.rect.width()), m_top(options.rect.top()), m_bottom(options.rect.bottom())