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

[welcome] Don't const& POD

Browse Source 
- simplify parameter types in some set-methods
- while here, shuffle methods to bring things together
This commit is contained in:
Adriaan de Groot 2020-04-02 22:42:41 +02:00
parent e756cc8720
commit 5956c6678e
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/modules/welcome/Config.cpp
View File

@ -159,7 +159,7 @@ Config::setLanguageIcon( const QString& languageIcon )
}
void
Config::setLocaleIndex( const int& index )
Config::setLocaleIndex( int index )
{
if ( index == m_localeIndex || index > CalamaresUtils::Locale::availableTranslations()->rowCount( QModelIndex() )
|| index < 0 )
@ -170,7 +170,7 @@ Config::setLocaleIndex( const int& index )
m_localeIndex = index;
const auto& selectedLocale = m_languages->locale( m_localeIndex ).locale();
cDebug() << "Selected locale" << selectedLocale;
cDebug() << "Index" << index << "Selected locale" << selectedLocale;
QLocale::setDefault( selectedLocale );
CalamaresUtils::installTranslator( selectedLocale, Calamares::Branding::instance()->translationsDirectory() );
@ -185,7 +185,7 @@ Config::requirementsModel() const
}
void
Config::setIsNextEnabled( const bool& isNextEnabled )
Config::setIsNextEnabled( bool isNextEnabled )
{
m_isNextEnabled = isNextEnabled;
emit isNextEnabledChanged( m_isNextEnabled );

13
src/modules/welcome/Config.h
View File

@ -49,13 +49,17 @@ class Config : public QObject
public:
Config( QObject* parent = nullptr );
void setCountryCode( const QString& countryCode );
void setLanguageIcon( const QString& languageIcon );
Calamares::RequirementsModel& requirementsModel() const;
void setIsNextEnabled( const bool& isNextEnabled );
void setCountryCode( const QString& countryCode );
void setLocaleIndex( const int& index );
QString languageIcon() const;
void setLanguageIcon( const QString& languageIcon );
void setIsNextEnabled( bool isNextEnabled );
void setLocaleIndex( int index );
int localeIndex() const { return m_localeIndex; }
QString supportUrl() const;
@ -76,7 +80,6 @@ public:
public slots:
CalamaresUtils::Locale::LabelModel* languagesModel() const;
void retranslate();
QString languageIcon() const;
signals:
void countryCodeChanged( QString countryCode );