[local] Chase API change in TZRegionModel

main
Adriaan de Groot 5 years ago
parent 01bba7b466
commit 9f06903115

@ -144,7 +144,7 @@ containsLocation( const QList< LocaleGlobal::Location >& locations, const QStrin
void void
LocalePage::init( const QString& initialRegion, const QString& initialZone, const QString& localeGenPath ) LocalePage::init( const QString& initialRegion, const QString& initialZone, const QString& localeGenPath )
{ {
m_regionModel.reset( new CalamaresUtils::Locale::TZRegionModel ); m_regionModel = CalamaresUtils::Locale::TZRegionModel::fromZoneTab();
m_regionCombo->setModel( m_regionModel.get() ); m_regionCombo->setModel( m_regionModel.get() );
// Setup locations // Setup locations

@ -74,7 +74,7 @@ private:
void changeLocale(); void changeLocale();
void changeFormats(); void changeFormats();
std::unique_ptr< CalamaresUtils::Locale::TZRegionModel > m_regionModel; std::shared_ptr< CalamaresUtils::Locale::TZRegionModel > m_regionModel;
TimeZoneWidget* m_tzWidget; TimeZoneWidget* m_tzWidget;
QComboBox* m_regionCombo; QComboBox* m_regionCombo;

Loading…
Cancel
Save