From 949f9e466f726f0c25950c8cab7f696e90676722 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Tue, 20 Jul 2021 16:24:09 +0200 Subject: [PATCH] [summary] createContentWidget is called exactly once, refactor --- src/modules/summary/SummaryPage.cpp | 15 ++++----------- src/modules/summary/SummaryPage.h | 1 - 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/modules/summary/SummaryPage.cpp b/src/modules/summary/SummaryPage.cpp index 1c44a3063..8abfb8804 100644 --- a/src/modules/summary/SummaryPage.cpp +++ b/src/modules/summary/SummaryPage.cpp @@ -89,7 +89,10 @@ createBodyLabel( const QString& text, const QPalette& bodyPalette ) void SummaryPage::onActivate() { - createContentWidget(); + delete m_contentWidget; // It might have been created previously + m_contentWidget = new QWidget; + m_layout = new QVBoxLayout( m_contentWidget ); + CalamaresUtils::unmarginLayout( m_layout ); QFont titleFont = font(); titleFont.setWeight( QFont::Light ); @@ -184,16 +187,6 @@ SummaryPage::stepsForSummary( const Calamares::ViewStepList& allSteps ) const return steps; } - -void -SummaryPage::createContentWidget() -{ - delete m_contentWidget; - m_contentWidget = new QWidget; - m_layout = new QVBoxLayout( m_contentWidget ); - CalamaresUtils::unmarginLayout( m_layout ); -} - void SummaryPage::onLeave() { diff --git a/src/modules/summary/SummaryPage.h b/src/modules/summary/SummaryPage.h index 718328c8f..7d98cc711 100644 --- a/src/modules/summary/SummaryPage.h +++ b/src/modules/summary/SummaryPage.h @@ -54,7 +54,6 @@ public: private: Calamares::ViewStepList stepsForSummary( const Calamares::ViewStepList& allSteps ) const; - void createContentWidget(); const SummaryViewStep* m_thisViewStep;