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

[local] Chase API change in TZRegionModel

Browse Source
This commit is contained in:
Adriaan de Groot 2019-12-09 23:36:32 -11:00
parent 01bba7b466
commit 9f06903115
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/locale/LocalePage.cpp
View File

@ -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

2
src/modules/locale/LocalePage.h
View File

@ -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;