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

[libcalamares] GS improve load/save

Browse Source 
- save should be const
- rename save() to saveJson() for parity with saveYaml()
This commit is contained in:
Adriaan de Groot 2020-08-07 00:01:20 +02:00
parent 104452513b
commit 0121e3755b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/libcalamares/GlobalStorage.cpp
View File

@ -94,7 +94,7 @@ GlobalStorage::debugDump() const
} }
bool bool
GlobalStorage::save( const QString& filename ) GlobalStorage::saveJson( const QString& filename ) const
{ {
QFile f( filename ); QFile f( filename );
if ( !f.open( QFile::WriteOnly ) ) if ( !f.open( QFile::WriteOnly ) )
@ -108,7 +108,7 @@ GlobalStorage::save( const QString& filename )
} }
bool bool
GlobalStorage::load( const QString& filename ) GlobalStorage::loadJson( const QString& filename )
{ {
QFile f( filename ); QFile f( filename );
if ( !f.open( QFile::ReadOnly ) ) if ( !f.open( QFile::ReadOnly ) )
@ -139,7 +139,7 @@ GlobalStorage::load( const QString& filename )
} }
bool bool
GlobalStorage::saveYaml( const QString& filename ) GlobalStorage::saveYaml( const QString& filename ) const
{ {
return CalamaresUtils::saveYaml( filename, m ); return CalamaresUtils::saveYaml( filename, m );
} }

6
src/libcalamares/GlobalStorage.h
View File

@ -94,7 +94,7 @@ public:
* and this JSON file will contain that password in-the-only-slightly- * and this JSON file will contain that password in-the-only-slightly-
* obscured form. * obscured form.
*/ */
bool save( const QString& filename ); bool saveJson( const QString& filename ) const;
/** @brief Adds the keys from the given JSON file /** @brief Adds the keys from the given JSON file
* *
@ -103,13 +103,13 @@ public:
* the global storage. The storage is not cleared first: existing * the global storage. The storage is not cleared first: existing
* keys will remain; keys that also occur in the JSON file are overwritten. * keys will remain; keys that also occur in the JSON file are overwritten.
*/ */
bool load( const QString& filename ); bool loadJson( const QString& filename );
/** @brief write as YAML to the given filename /** @brief write as YAML to the given filename
* *
* See also save(), above. * See also save(), above.
*/ */
bool saveYaml( const QString& filename ); bool saveYaml( const QString& filename ) const;
/** @brief reads settings from the given filename /** @brief reads settings from the given filename
* *

2
src/modules/preservefiles/PreserveFiles.cpp
View File

@ -138,7 +138,7 @@ PreserveFiles::exec()
} }
if ( it.type == ItemType::Config ) if ( it.type == ItemType::Config )
{ {
if ( Calamares::JobQueue::instance()->globalStorage()->save( dest ) ) if ( Calamares::JobQueue::instance()->globalStorage()->saveJson( dest ) )
{ {
cWarning() << "Could not write config for" << dest; cWarning() << "Could not write config for" << dest;
} }