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

[libcalamares] Accessors for key and complete region data

Browse Source
This commit is contained in:
Adriaan de Groot 2019-12-09 17:20:46 -04:00
parent b29b89579e
commit 1d17cf5c77
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/libcalamares/locale/TimeZone.cpp
View File

@ -180,6 +180,15 @@ TZRegionModel::data( const QModelIndex& index, int role ) const
return region.tr(); return region.tr();
} }
const TZRegion&
TZRegionModel::region( int index ) const
{
if ( ( index < 0 ) || ( index >= m_regions.count() ) )
{
index = 0;
}
return m_regions[ index ];
}
} // namespace Locale } // namespace Locale
} // namespace CalamaresUtils } // namespace CalamaresUtils

4
src/libcalamares/locale/TimeZone.h
View File

@ -54,6 +54,8 @@ public:
/// @brief Give the localized human-readable form /// @brief Give the localized human-readable form
virtual QString tr() const = 0; virtual QString tr() const = 0;
const char* key() const { return m_key; }
protected: protected:
char* m_human = nullptr; char* m_human = nullptr;
char* m_key = nullptr; char* m_key = nullptr;
@ -91,6 +93,8 @@ public:
QVariant data( const QModelIndex& index, int role ) const override; QVariant data( const QModelIndex& index, int role ) const override;
const TZRegion& region( int index ) const;
private: private:
QVector< TZRegion > m_regions; QVector< TZRegion > m_regions;
}; };