From 5795801be5272b0636b3cc663ee22bc5d131a571 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 28 Jan 2020 13:00:21 +0100
Subject: [PATCH] [welcome] Remove unneeded member variables.

 - local to the constructor, only needed to be members because
   of the weird split between constructor and init()
---
 .../welcome/checker/ResultsListWidget.cpp     | 21 ++++++++++---------
 .../welcome/checker/ResultsListWidget.h       |  2 --
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/modules/welcome/checker/ResultsListWidget.cpp b/src/modules/welcome/checker/ResultsListWidget.cpp
index e06f4e7a7..612ba62ce 100644
--- a/src/modules/welcome/checker/ResultsListWidget.cpp
+++ b/src/modules/welcome/checker/ResultsListWidget.cpp
@@ -143,16 +143,17 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem
 {
     setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
 
-    m_mainLayout = new QVBoxLayout;
-    setLayout( m_mainLayout );
+    QBoxLayout* mainLayout = new QVBoxLayout;
+    QBoxLayout* entriesLayout = new QVBoxLayout;
+
+    setLayout( mainLayout );
 
     int paddingSize = qBound( 32, CalamaresUtils::defaultFontHeight() * 4, 128 );
 
     QHBoxLayout* spacerLayout = new QHBoxLayout;
-    m_mainLayout->addLayout( spacerLayout );
+    mainLayout->addLayout( spacerLayout );
     spacerLayout->addSpacing( paddingSize );
-    m_entriesLayout = new QVBoxLayout;
-    spacerLayout->addLayout( m_entriesLayout );
+    spacerLayout->addLayout( entriesLayout );
     spacerLayout->addSpacing( paddingSize );
     CalamaresUtils::unmarginLayout( spacerLayout );
 
@@ -165,7 +166,7 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem
         {
             ResultWidget* ciw = new ResultWidget( entry.satisfied, entry.mandatory );
             CALAMARES_RETRANSLATE( ciw->setText( entry.negatedText() ); )
-            m_entriesLayout->addWidget( ciw );
+            entriesLayout->addWidget( ciw );
             ciw->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
 
             allChecked = false;
@@ -187,12 +188,12 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem
     QLabel* textLabel = new QLabel;
 
     textLabel->setWordWrap( true );
-    m_entriesLayout->insertWidget( 0, textLabel );
+    entriesLayout->insertWidget( 0, textLabel );
     textLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
 
     if ( !allChecked )
     {
-        m_entriesLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() / 2 );
+        entriesLayout->insertSpacing( 1, CalamaresUtils::defaultFontHeight() / 2 );
 
         if ( !requirementsSatisfied )
         {
@@ -251,7 +252,7 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem
                 }
 
                 imageLabel->setContentsMargins( 4, CalamaresUtils::defaultFontHeight() * 3 / 4, 4, 4 );
-                m_mainLayout->addWidget( imageLabel );
+                mainLayout->addWidget( imageLabel );
                 imageLabel->setAlignment( Qt::AlignCenter );
                 imageLabel->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding );
             }
@@ -263,7 +264,7 @@ ResultsListWidget::ResultsListWidget( QWidget* parent, const Calamares::Requirem
     }
     else
     {
-        m_mainLayout->addStretch();
+        mainLayout->addStretch();
     }
 }
 
diff --git a/src/modules/welcome/checker/ResultsListWidget.h b/src/modules/welcome/checker/ResultsListWidget.h
index ae5da67ea..8d0dcb155 100644
--- a/src/modules/welcome/checker/ResultsListWidget.h
+++ b/src/modules/welcome/checker/ResultsListWidget.h
@@ -34,8 +34,6 @@ public:
 private:
     void showDetailsDialog( const Calamares::RequirementsList& checkEntries );
 
-    QBoxLayout* m_mainLayout;
-    QBoxLayout* m_entriesLayout;
     const Calamares::RequirementsList& m_entries;
 };