napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[summaryq] Nothing in the Config is specific to this QML view-step

Browse Source
This commit is contained in:
Adriaan de Groot 2021-07-13 21:25:57 +02:00
parent a316f1b40d
commit a658e88575
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/summaryq/Config.cpp
View File

@ -68,7 +68,7 @@ SummaryModel::setSummary( const Calamares::ViewStepList& steps, bool withWidgets
Q_EMIT endResetModel(); Q_EMIT endResetModel();
} }
Config::Config( QObject* parent ) Config::Config( Calamares::ViewStep* parent )
: QObject( parent ) : QObject( parent )
, m_thisViewStep( static_cast< SummaryQmlViewStep* >( parent ) ) , m_thisViewStep( static_cast< SummaryQmlViewStep* >( parent ) )
, m_summary( new SummaryModel( this ) ) , m_summary( new SummaryModel( this ) )

8
src/modules/summaryq/Config.h
View File

@ -12,13 +12,11 @@
#define SUMMARY_CONFIG_H #define SUMMARY_CONFIG_H
#include "viewpages/ViewStep.h" #include "viewpages/ViewStep.h"
#include <QAbstractListModel> #include <QAbstractListModel>
#include <QObject> #include <QObject>
#include <QQmlParserStatus> #include <QQmlParserStatus>
class SummaryQmlViewStep;
/** @brief Data for one step /** @brief Data for one step
* *
* A step generally has a text description, but **may** have a * A step generally has a text description, but **may** have a
@ -61,7 +59,7 @@ class Config : public QObject, public QQmlParserStatus
Q_PROPERTY( SummaryModel* summaryModel READ summaryModel CONSTANT FINAL ) Q_PROPERTY( SummaryModel* summaryModel READ summaryModel CONSTANT FINAL )
public: public:
explicit Config( QObject* parent = nullptr ); explicit Config( Calamares::ViewStep* parent = nullptr );
virtual void componentComplete() override; virtual void componentComplete() override;
virtual void classBegin() override {} virtual void classBegin() override {}
@ -74,7 +72,7 @@ private:
Calamares::ViewStepList stepsForSummary( const Calamares::ViewStepList& allSteps ) const; Calamares::ViewStepList stepsForSummary( const Calamares::ViewStepList& allSteps ) const;
void retranslate(); void retranslate();
const SummaryQmlViewStep* m_thisViewStep; const Calamares::ViewStep* m_thisViewStep;
SummaryModel* m_summary; SummaryModel* m_summary;
QString m_message; QString m_message;