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

[libcalamares] Handle qlonglong when writing YAML

Browse Source 
- Handle qlonglong explicitly
- Add a fallbackfor things that convert to qulonglong, to
  avoid these remaining integer types from hitting the
  very end of the if-chain, and being written out as
  the **string** "<typename>"
This commit is contained in:
Adriaan de Groot 2020-04-08 16:58:05 +02:00
parent c6463a30ea
commit 3b354b8b20
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libcalamares/utils/Yaml.cpp
View File

@ -260,10 +260,20 @@ dumpYamlElement( QFile& f, const QVariant& value, int indent )
{
f.write( QString::number( value.toInt() ).toUtf8() );
}
else if ( value.type() == QVariant::Type::LongLong )
{
f.write( QString::number( value.toLongLong() ).toUtf8() );
}
else if ( value.type() == QVariant::Type::Double )
{
f.write( QString::number( value.toDouble() ).toUtf8() );
}
else if ( value.canConvert( QVariant::Type::ULongLong ) )
{
// This one needs to be *after* bool, int, double to avoid this branch
// .. grabbing those convertible types un-necessarily.
f.write( QString::number( value.toULongLong() ).toUtf8() );
}
else if ( value.type() == QVariant::Type::List )
{
int c = 0;