From 8c21b5985396af73dc51f1c8b486f3553cdde409 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 20 Jul 2020 18:13:33 +0200 Subject: [PATCH] [locale] Remove unused localegen (moved to Config earlier) --- src/modules/locale/LocaleViewStep.cpp | 6 ------ src/modules/locale/LocaleViewStep.h | 5 ++--- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/src/modules/locale/LocaleViewStep.cpp b/src/modules/locale/LocaleViewStep.cpp index e35b5a112..d71523da1 100644 --- a/src/modules/locale/LocaleViewStep.cpp +++ b/src/modules/locale/LocaleViewStep.cpp @@ -201,12 +201,6 @@ LocaleViewStep::setConfigurationMap( const QVariantMap& configurationMap ) = CalamaresUtils::GeoIP::RegionZonePair( QStringLiteral( "America" ), QStringLiteral( "New_York" ) ); } - m_localeGenPath = CalamaresUtils::getString( configurationMap, "localeGenPath" ); - if ( m_localeGenPath.isEmpty() ) - { - m_localeGenPath = QStringLiteral( "/etc/locale.gen" ); - } - bool ok = false; QVariantMap geoip = CalamaresUtils::getSubMap( configurationMap, "geoip", ok ); if ( ok ) diff --git a/src/modules/locale/LocaleViewStep.h b/src/modules/locale/LocaleViewStep.h index 4e6c3d262..24764b172 100644 --- a/src/modules/locale/LocaleViewStep.h +++ b/src/modules/locale/LocaleViewStep.h @@ -72,10 +72,9 @@ private: bool m_nextEnabled; QString m_prettyStatus; - CalamaresUtils::GeoIP::RegionZonePair m_startingTimezone; - QString m_localeGenPath; - Calamares::JobList m_jobs; + + CalamaresUtils::GeoIP::RegionZonePair m_startingTimezone; std::unique_ptr< CalamaresUtils::GeoIP::Handler > m_geoip; std::unique_ptr< Config > m_config;