[welcome] Don't const& POD

- simplify parameter types in some set-methods
- while here, shuffle methods to bring things together
main
Adriaan de Groot 6 years ago
parent e756cc8720
commit 5956c6678e

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

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

Loading…
Cancel
Save