[welcomeq] Coding style
- Apply coding style tool - Remove commented-out cruft - Drop TODO's that don't apply anymore
This commit is contained in:
parent
ab6c6a6748
commit
e930c74e85
@ -22,9 +22,9 @@
|
|||||||
#include "checker/GeneralRequirements.h"
|
#include "checker/GeneralRequirements.h"
|
||||||
|
|
||||||
#include "locale/LabelModel.h"
|
#include "locale/LabelModel.h"
|
||||||
|
#include "utils/Dirs.h"
|
||||||
#include "utils/Logger.h"
|
#include "utils/Logger.h"
|
||||||
#include "utils/Variant.h"
|
#include "utils/Variant.h"
|
||||||
#include "utils/Dirs.h"
|
|
||||||
|
|
||||||
#include "Branding.h"
|
#include "Branding.h"
|
||||||
#include "modulesystem/ModuleManager.h"
|
#include "modulesystem/ModuleManager.h"
|
||||||
@ -34,16 +34,9 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( WelcomeQmlViewStepFactory, registerPlugin<
|
|||||||
|
|
||||||
WelcomeQmlViewStep::WelcomeQmlViewStep( QObject* parent )
|
WelcomeQmlViewStep::WelcomeQmlViewStep( QObject* parent )
|
||||||
: Calamares::QmlViewStep( parent )
|
: Calamares::QmlViewStep( parent )
|
||||||
, m_config( new Config( this ) ) // the qml singleton takes ownership and deletes it
|
, m_config( new Config( this ) )
|
||||||
// , m_nextEnabled( false )
|
|
||||||
, m_requirementsChecker( new GeneralRequirements( this ) )
|
, m_requirementsChecker( new GeneralRequirements( this ) )
|
||||||
|
|
||||||
{
|
{
|
||||||
// connect( m_config,
|
|
||||||
// &Config::isNextEnabledChanged,
|
|
||||||
// this,
|
|
||||||
// &WelcomeQmlViewStep::nextStatusChanged );
|
|
||||||
// emit nextStatusChanged(true);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -96,16 +89,16 @@ WelcomeQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
|
|||||||
{
|
{
|
||||||
m_config->setConfigurationMap( configurationMap );
|
m_config->setConfigurationMap( configurationMap );
|
||||||
|
|
||||||
// TODO: figure out how the requirements (held by ModuleManager) should be accessible
|
|
||||||
// to QML as a model. //will be model as a qvariantmap containing a alert level and the message string
|
|
||||||
if ( configurationMap.contains( "requirements" )
|
if ( configurationMap.contains( "requirements" )
|
||||||
&& configurationMap.value( "requirements" ).type() == QVariant::Map )
|
&& configurationMap.value( "requirements" ).type() == QVariant::Map )
|
||||||
{
|
{
|
||||||
m_requirementsChecker->setConfigurationMap( configurationMap.value( "requirements" ).toMap() );
|
m_requirementsChecker->setConfigurationMap( configurationMap.value( "requirements" ).toMap() );
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
cWarning() << "no valid requirements map found in welcome "
|
{
|
||||||
|
cWarning() << "no valid requirements map found in welcomeq "
|
||||||
"module configuration.";
|
"module configuration.";
|
||||||
|
}
|
||||||
|
|
||||||
Calamares::QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation last
|
Calamares::QmlViewStep::setConfigurationMap( configurationMap ); // call parent implementation last
|
||||||
setContextProperty( "Welcome", m_config );
|
setContextProperty( "Welcome", m_config );
|
||||||
@ -122,4 +115,3 @@ WelcomeQmlViewStep::getConfig()
|
|||||||
{
|
{
|
||||||
return m_config;
|
return m_config;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -47,7 +47,6 @@ class PLUGINDLLEXPORT WelcomeQmlViewStep : public Calamares::QmlViewStep
|
|||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
|
||||||
public:
|
public:
|
||||||
|
|
||||||
explicit WelcomeQmlViewStep( QObject* parent = nullptr );
|
explicit WelcomeQmlViewStep( QObject* parent = nullptr );
|
||||||
|
|
||||||
QString prettyName() const override;
|
QString prettyName() const override;
|
||||||
|
Loading…
Reference in New Issue
Block a user