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

[libcalamares] Drop unused parameter

Browse Source 
- the `parent` when installing a translator was not used, so drop it
  from the API. Chase some uses of the API, but leave welcome-modules
   broken: there's a merge of those coming.
This commit is contained in:
Adriaan de Groot 2020-03-25 12:08:27 +01:00
parent a33d9f5a06
commit 875f79b49f
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calamares/CalamaresApplication.cpp
View File

@ -83,7 +83,7 @@ CalamaresApplication::init()
initQmlPath(); initQmlPath();
initBranding(); initBranding();
CalamaresUtils::installTranslator( QLocale::system(), QString(), this ); CalamaresUtils::installTranslator( QLocale::system(), QString() );
setQuitOnLastWindowClosed( false ); setQuitOnLastWindowClosed( false );
setWindowIcon( QIcon( Calamares::Branding::instance()->imagePath( Calamares::Branding::ProductIcon ) ) ); setWindowIcon( QIcon( Calamares::Branding::instance()->imagePath( Calamares::Branding::ProductIcon ) ) );

2
src/libcalamares/utils/Retranslator.cpp
View File

@ -197,7 +197,7 @@ static QTranslator* s_tztranslator = nullptr;
static QString s_translatorLocaleName; static QString s_translatorLocaleName;
void void
installTranslator( const QLocale& locale, const QString& brandingTranslationsPrefix, QObject* ) installTranslator( const QLocale& locale, const QString& brandingTranslationsPrefix )
{ {
loadSingletonTranslator( BrandingLoader( locale, brandingTranslationsPrefix ), s_brandingTranslator ); loadSingletonTranslator( BrandingLoader( locale, brandingTranslationsPrefix ), s_brandingTranslator );
loadSingletonTranslator( TZLoader( locale ), s_tztranslator ); loadSingletonTranslator( TZLoader( locale ), s_tztranslator );

3
src/libcalamares/utils/Retranslator.h
View File

@ -36,9 +36,8 @@ namespace CalamaresUtils
* @brief installTranslator changes the application language. * @brief installTranslator changes the application language.
* @param locale the new locale. * @param locale the new locale.
* @param brandingTranslationsPrefix the branding path prefix, from Calamares::Branding. * @param brandingTranslationsPrefix the branding path prefix, from Calamares::Branding.
* @param parent the parent QObject.
*/ */
DLLEXPORT void installTranslator( const QLocale& locale, const QString& brandingTranslationsPrefix, QObject* parent ); DLLEXPORT void installTranslator( const QLocale& locale, const QString& brandingTranslationsPrefix );
DLLEXPORT QString translatorLocaleName(); DLLEXPORT QString translatorLocaleName();