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

[netinstall] Apply Calamares C++ style

Browse Source
This commit is contained in:
Adriaan de Groot 2017-11-06 05:34:57 -05:00
parent f424af36d3
commit 91e949f8fc
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/modules/netinstall/NetInstallPage.cpp
View File

@ -111,7 +111,8 @@ NetInstallPage::dataIsHere( QNetworkReply* reply )
emit checkReady( true );
}
QList<PackageTreeItem::ItemData> NetInstallPage::selectedPackages() const
QList<PackageTreeItem::ItemData>
NetInstallPage::selectedPackages() const
{
if ( m_groups )
return m_groups->getPackages();
@ -122,7 +123,8 @@ QList<PackageTreeItem::ItemData> NetInstallPage::selectedPackages() const
}
}
void NetInstallPage::loadGroupList()
void
NetInstallPage::loadGroupList()
{
QString confUrl(
Calamares::JobQueue::instance()->globalStorage()->value(
@ -141,13 +143,15 @@ void NetInstallPage::loadGroupList()
m_networkManager.get( request );
}
void NetInstallPage::setRequired(bool b)
void
NetInstallPage::setRequired( bool b )
{
m_required = b;
}
void NetInstallPage::onActivate()
void
NetInstallPage::onActivate()
{
ui->groupswidget->setFocus();
}

5
src/modules/netinstall/NetInstallPage.h
View File

@ -55,7 +55,10 @@ public:
// corrupt or unavailable data causes checkReady() to be emitted
// true (not-required) or false.
void setRequired( bool );
bool getRequired() const { return m_required; }
bool getRequired() const
{
return m_required;
}
// Returns the list of packages belonging to groups that are
// selected in the view in this given moment. No data is cached here, so

6
src/modules/netinstall/NetInstallViewStep.cpp
View File

@ -139,7 +139,7 @@ NetInstallViewStep::onLeave()
QVariant details( package.packageName );
// If it's a package with a pre- or post-script, replace
// with the more complicated datastructure.
if (!package.preScript.isEmpty() || !package.postScript.isEmpty())
if ( !package.preScript.isEmpty() || !package.postScript.isEmpty() )
{
QMap<QString, QVariant> sdetails;
sdetails.insert( "pre-script", package.preScript );
@ -157,14 +157,14 @@ NetInstallViewStep::onLeave()
{
QMap<QString, QVariant> op;
op.insert( "install", QVariant( installPackages ) );
packageOperations.append(op);
packageOperations.append( op );
cDebug() << " .." << installPackages.length() << "critical packages.";
}
if ( !tryInstallPackages.empty() )
{
QMap<QString, QVariant> op;
op.insert( "try_install", QVariant( tryInstallPackages ) );
packageOperations.append(op);
packageOperations.append( op );
cDebug() << " .." << tryInstallPackages.length() << "non-critical packages.";
}