applications/calamares
2
0
Fork 0
mirror of https://github.com/parchlinux/calamares.git synced 2025-06-30 02:45:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

[partition] Reduce direct dependency of PartUtils on PartitionCoreModule

Browse source
This commit is contained in:
Corentin Noël 2020-10-05 11:39:04 +02:00
parent 063482339f
commit 08138f5a41
3 changed files with 9 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/modules/partition/core/PartUtils.cpp
View file

@ -11,8 +11,6 @@
#include "PartUtils.h"
#include "PartitionCoreModule.h"
#include "core/DeviceModel.h"
#include "core/KPMHelpers.h"
#include "core/PartitionInfo.h"
@ -198,13 +196,12 @@ canBeResized( Partition* candidate )
bool
canBeResized( PartitionCoreModule* core, const QString& partitionPath )
canBeResized( DeviceModel* dm, const QString& partitionPath )
{
cDebug() << "Checking if" << partitionPath << "can be resized.";
QString partitionWithOs = partitionPath;
if ( partitionWithOs.startsWith( "/dev/" ) )
{
DeviceModel* dm = core->deviceModel();
for ( int i = 0; i < dm->rowCount(); ++i )
{
Device* dev = dm->deviceForIndex( dm->index( i ) );
@ -358,7 +355,7 @@ findPartitionPathForMountPoint( const FstabEntryList& fstab, const QString& moun
OsproberEntryList
runOsprober( PartitionCoreModule* core )
runOsprober( DeviceModel* dm )
{
QString osproberOutput;
QProcess osprober;
@ -406,7 +403,7 @@ runOsprober( PartitionCoreModule* core )
QString homePath = findPartitionPathForMountPoint( fstabEntries, "/home" );
osproberEntries.append(
{ prettyName, path, QString(), canBeResized( core, path ), lineColumns, fstabEntries, homePath } );
{ prettyName, path, QString(), canBeResized( dm, path ), lineColumns, fstabEntries, homePath } );
osproberCleanLines.append( line );
}
}