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

[libcalamares] Adjust code to changed name

Browse source 
- renamed setting in the configuration file, but not in the code
 - add documentation to getters
This commit is contained in:
Adriaan de Groot 2019-04-21 17:15:53 +02:00
parent 4ceaa5ffe7
commit d506296aa7
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libcalamares/Settings.cpp
View file

@ -207,7 +207,7 @@ Settings::Settings( const QString& settingsFilePath,
m_doChroot = !requireBool( config, "dont-chroot", false ); m_doChroot = !requireBool( config, "dont-chroot", false );
m_isSetupMode = requireBool( config, "oem-setup", !m_doChroot ); m_isSetupMode = requireBool( config, "oem-setup", !m_doChroot );
m_disableCancel = requireBool( config, "disable-cancel", false ); m_disableCancel = requireBool( config, "disable-cancel", false );
m_dontCancel = requireBool( config, "dont-cancel", false ); m_dontCancel = requireBool( config, "disable-cancel-during-exec", false );
} }
catch ( YAML::Exception& e ) catch ( YAML::Exception& e )
{ {

3
src/libcalamares/Settings.h
View file

@ -69,8 +69,9 @@ public:
*/ */
bool isSetupMode() const { return m_isSetupMode; } bool isSetupMode() const { return m_isSetupMode; }
/** @brief Global setting of disable-cancel: can't cancel ever. */
bool disableCancel() const; bool disableCancel() const;
/** @brief Temporary setting of disable-cancel: can't cancel during exec. */
bool dontCancel() const; bool dontCancel() const;
private: private: