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

[welcome] Simplify code

Browse Source 
- Kevin Kofler pointed out there was a redundant else-if
 - Only use size for comparison if it's valid
This commit is contained in:
Adriaan de Groot 2019-12-02 11:42:32 +01:00
parent 7029c427f1
commit 5cb0ee6cc5
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,11 +67,7 @@ biggestSingleScreen()
for ( const auto* screen : QGuiApplication::screens() )
{
QSize thisScreen = screen->availableSize();
if ( !s.isValid() )
{
s = thisScreen;
}
else if ( s.width() * s.height() < thisScreen.width() * thisScreen.height() )
if ( !s.isValid() || ( s.width() * s.height() < thisScreen.width() * thisScreen.height() ) )
{
s = thisScreen;
}
@ -88,7 +84,7 @@ Calamares::RequirementsList GeneralRequirements::checkRequirements()
bool hasPower = false;
bool hasInternet = false;
bool isRoot = false;
bool enoughScreen = (availableSize.width() >= CalamaresUtils::windowMinimumWidth) && (availableSize.height() >= CalamaresUtils::windowMinimumHeight);
bool enoughScreen = availableSize.isValid() && (availableSize.width() >= CalamaresUtils::windowMinimumWidth) && (availableSize.height() >= CalamaresUtils::windowMinimumHeight);
qint64 requiredStorageB = CalamaresUtils::GiBtoBytes(m_requiredStorageGiB);
cDebug() << "Need at least storage bytes:" << requiredStorageB;