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

[libcalamares] Reduce clang warnings (only-inline-virtual, unused parameters)

Browse Source
This commit is contained in:
Adriaan de Groot 2020-01-07 10:33:21 +01:00
parent 1b62b2f66c
commit 5fbd0169ca
1 changed files with 62 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -58,7 +58,7 @@ struct TranslationLoader
{ {
} }
virtual ~TranslationLoader() {}; virtual ~TranslationLoader();
/// @brief Loads @p translator with the specific translations of this type /// @brief Loads @p translator with the specific translations of this type
virtual bool tryLoad( QTranslator* translator ) = 0; virtual bool tryLoad( QTranslator* translator ) = 0;
@ -66,6 +66,7 @@ struct TranslationLoader
QString m_localeName; QString m_localeName;
}; };
/// @brief Loads translations for branding
struct BrandingLoader : public TranslationLoader struct BrandingLoader : public TranslationLoader
{ {
BrandingLoader( const QLocale& locale, const QString& prefix ) BrandingLoader( const QLocale& locale, const QString& prefix )
@ -74,7 +75,29 @@ struct BrandingLoader : public TranslationLoader
{ {
} }
bool tryLoad( QTranslator* translator ) override bool tryLoad( QTranslator* translator ) override;
QString m_prefix;
};
/// @brief Loads regular Calamares translations (program text)
struct CalamaresLoader : public TranslationLoader
{
using TranslationLoader::TranslationLoader;
bool tryLoad( QTranslator* translator ) override;
};
/// @brief Loads timezone name translations
struct TZLoader : public TranslationLoader
{
using TranslationLoader::TranslationLoader;
bool tryLoad( QTranslator* translator ) override;
};
TranslationLoader::~TranslationLoader() {}
bool
BrandingLoader::tryLoad( QTranslator* translator )
{ {
if ( m_prefix.isEmpty() ) if ( m_prefix.isEmpty() )
{ {
@ -102,14 +125,8 @@ struct BrandingLoader : public TranslationLoader
return false; return false;
} }
QString m_prefix; bool
}; CalamaresLoader::tryLoad( QTranslator* translator )
struct CalamaresLoader : public TranslationLoader
{
using TranslationLoader::TranslationLoader;
bool tryLoad( QTranslator* translator ) override
{ {
if ( translator->load( QString( ":/lang/calamares_" ) + m_localeName ) ) if ( translator->load( QString( ":/lang/calamares_" ) + m_localeName ) )
{ {
@ -122,12 +139,9 @@ struct CalamaresLoader : public TranslationLoader
return translator->load( QString( ":/lang/calamares_en" ) ); return translator->load( QString( ":/lang/calamares_en" ) );
} }
} }
};
struct TZLoader : public TranslationLoader bool
{ TZLoader::tryLoad( QTranslator* translator )
using TranslationLoader::TranslationLoader;
bool tryLoad( QTranslator* translator ) override
{ {
if ( translator->load( QString( ":/lang/tz_" ) + m_localeName ) ) if ( translator->load( QString( ":/lang/tz_" ) + m_localeName ) )
{ {
@ -136,12 +150,10 @@ struct TZLoader : public TranslationLoader
} }
else else
{ {
cDebug() << Logger::SubEntry cDebug() << Logger::SubEntry << "Calamares Timezones using default, system locale not found:" << m_localeName;
<< "Calamares Timezones using default, system locale not found:" << m_localeName;
return translator->load( QString( ":/lang/tz_en" ) ); return translator->load( QString( ":/lang/tz_en" ) );
} }
} }
};
static void static void
loadSingletonTranslator( TranslationLoader&& loader, QTranslator*& translator_p ) loadSingletonTranslator( TranslationLoader&& loader, QTranslator*& translator_p )
@ -167,7 +179,7 @@ static QTranslator* s_tztranslator = nullptr;
static QString s_translatorLocaleName; static QString s_translatorLocaleName;
void void
installTranslator( const QLocale& locale, const QString& brandingTranslationsPrefix, QObject* parent ) installTranslator( const QLocale& locale, const QString& brandingTranslationsPrefix, QObject* )
{ {
loadSingletonTranslator( BrandingLoader( locale, brandingTranslationsPrefix ), s_brandingTranslator ); loadSingletonTranslator( BrandingLoader( locale, brandingTranslationsPrefix ), s_brandingTranslator );
loadSingletonTranslator( TZLoader( locale ), s_tztranslator ); loadSingletonTranslator( TZLoader( locale ), s_tztranslator );