From 9f06903115ab46660154a3ce286320903fecc3fc Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 9 Dec 2019 23:36:32 -1100 Subject: [PATCH] [local] Chase API change in TZRegionModel --- src/modules/locale/LocalePage.cpp | 2 +- src/modules/locale/LocalePage.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp index 402351acf..5dfad3516 100644 --- a/src/modules/locale/LocalePage.cpp +++ b/src/modules/locale/LocalePage.cpp @@ -144,7 +144,7 @@ containsLocation( const QList< LocaleGlobal::Location >& locations, const QStrin void 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() ); // Setup locations diff --git a/src/modules/locale/LocalePage.h b/src/modules/locale/LocalePage.h index f4d352ccf..e918076d9 100644 --- a/src/modules/locale/LocalePage.h +++ b/src/modules/locale/LocalePage.h @@ -74,7 +74,7 @@ private: void changeLocale(); void changeFormats(); - std::unique_ptr< CalamaresUtils::Locale::TZRegionModel > m_regionModel; + std::shared_ptr< CalamaresUtils::Locale::TZRegionModel > m_regionModel; TimeZoneWidget* m_tzWidget; QComboBox* m_regionCombo;