[local] Chase API change in TZRegionModel

5 years ago · 9f06903115
parent 01bba7b466
commit 9f06903115
2 changed files with 2 additions and 2 deletions
--- 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
--- 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;