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

Merge pull request #824 from stikonas/kpmcore-3.2

Browse Source 
KPMcore: Pass QStringList to fs->name() instead of QString.
This commit is contained in:
abucodonosor 2017-09-30 18:02:37 +02:00 committed by GitHub
commit 2546442e88
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/partition/jobs/FillGlobalStorageJob.cpp
View File

@ -85,7 +85,7 @@ mapForPartition( Partition* partition, const QString& uuid )
map[ "device" ] = partition->partitionPath();
map[ "mountPoint" ] = PartitionInfo::mountPoint( partition );
map[ "fsName" ] = partition->fileSystem().name();
map[ "fs" ] = partition->fileSystem().name( QStringLiteral("C") ); // Untranslated
map[ "fs" ] = partition->fileSystem().name( { QStringLiteral("C") } ); // Untranslated
if ( partition->fileSystem().type() == FileSystem::Luks &&
dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS() )
map[ "fs" ] = dynamic_cast< FS::luks& >( partition->fileSystem() ).innerFS()->name();