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

[welcome] Reduce unused-parameter warnings

Browse Source 
- Don't use this if we don't need it (QObject::tr is static).
 - C++14 allows (copy) binding to arbitrary expresstions in lambda's,
   so detach from this.
This commit is contained in:
Adriaan de Groot 2019-04-11 11:49:26 +02:00
parent 713370da55
commit 6cfb5a9c88
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/modules/welcome/checker/GeneralRequirements.cpp
View File

@ -105,44 +105,40 @@ Calamares::RequirementsList GeneralRequirements::checkRequirements()
if ( entry == "storage" ) if ( entry == "storage" )
checkEntries.append( { checkEntries.append( {
entry, entry,
[this]{ return tr( "has at least %1 GB available drive space" ) [req=m_requiredStorageGB]{ return tr( "has at least %1 GB available drive space" ).arg( req ); },
.arg( m_requiredStorageGB ); }, [req=m_requiredStorageGB]{ return tr( "There is not enough drive space. At least %1 GB is required." ).arg( req ); },
[this]{ return tr( "There is not enough drive space. At least %1 GB is required." )
.arg( m_requiredStorageGB ); },
enoughStorage, enoughStorage,
m_entriesToRequire.contains( entry ) m_entriesToRequire.contains( entry )
} ); } );
else if ( entry == "ram" ) else if ( entry == "ram" )
checkEntries.append( { checkEntries.append( {
entry, entry,
[this]{ return tr( "has at least %1 GB working memory" ) [req=m_requiredRamGB]{ return tr( "has at least %1 GB working memory" ).arg( req ); },
.arg( m_requiredRamGB ); }, [req=m_requiredRamGB]{ return tr( "The system does not have enough working memory. At least %1 GB is required." ).arg( req ); },
[this]{ return tr( "The system does not have enough working memory. At least %1 GB is required." )
.arg( m_requiredRamGB ); },
enoughRam, enoughRam,
m_entriesToRequire.contains( entry ) m_entriesToRequire.contains( entry )
} ); } );
else if ( entry == "power" ) else if ( entry == "power" )
checkEntries.append( { checkEntries.append( {
entry, entry,
[this]{ return tr( "is plugged in to a power source" ); }, []{ return tr( "is plugged in to a power source" ); },
[this]{ return tr( "The system is not plugged in to a power source." ); }, []{ return tr( "The system is not plugged in to a power source." ); },
hasPower, hasPower,
m_entriesToRequire.contains( entry ) m_entriesToRequire.contains( entry )
} ); } );
else if ( entry == "internet" ) else if ( entry == "internet" )
checkEntries.append( { checkEntries.append( {
entry, entry,
[this]{ return tr( "is connected to the Internet" ); }, []{ return tr( "is connected to the Internet" ); },
[this]{ return tr( "The system is not connected to the Internet." ); }, []{ return tr( "The system is not connected to the Internet." ); },
hasInternet, hasInternet,
m_entriesToRequire.contains( entry ) m_entriesToRequire.contains( entry )
} ); } );
else if ( entry == "root" ) else if ( entry == "root" )
checkEntries.append( { checkEntries.append( {
entry, entry,
[this]{ return QString(); }, //we hide it []{ return QString(); }, //we hide it
[this]{ return Calamares::Settings::instance()->isSetupMode() []{ return Calamares::Settings::instance()->isSetupMode()
? tr( "The setup program is not running with administrator rights." ) ? tr( "The setup program is not running with administrator rights." )
: tr( "The installer is not running with administrator rights." ); }, : tr( "The installer is not running with administrator rights." ); },
isRoot, isRoot,
@ -151,8 +147,8 @@ Calamares::RequirementsList GeneralRequirements::checkRequirements()
else if ( entry == "screen" ) else if ( entry == "screen" )
checkEntries.append( { checkEntries.append( {
entry, entry,
[this]{ return QString(); }, // we hide it []{ return QString(); }, // we hide it
[this]{ return Calamares::Settings::instance()->isSetupMode() []{ return Calamares::Settings::instance()->isSetupMode()
? tr( "The screen is too small to display the setup program." ) ? tr( "The screen is too small to display the setup program." )
: tr( "The screen is too small to display the installer." ); }, : tr( "The screen is too small to display the installer." ); },
enoughScreen, enoughScreen,