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

[libcalamares] Drop superfluous enum

Browse Source
This commit is contained in:
Adriaan de Groot 2019-12-10 17:42:32 +06:30
parent 9a5e614172
commit da277fa7ba
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,7 +178,7 @@ TZRegionModel::rowCount( const QModelIndex& parent ) const
QVariant QVariant
TZRegionModel::data( const QModelIndex& index, int role ) const TZRegionModel::data( const QModelIndex& index, int role ) const
{ {
if ( ( role != LabelRole ) && ( role != Qt::UserRole ) ) if ( ( role != Qt::DisplayRole ) && ( role != Qt::UserRole ) )
{ {
return QVariant(); return QVariant();
} }
@ -189,7 +189,7 @@ TZRegionModel::data( const QModelIndex& index, int role ) const
} }
const TZRegion* region = m_regions.at( index.row() ); const TZRegion* region = m_regions.at( index.row() );
return role == LabelRole ? region->tr() : region->key(); return role == Qt::DisplayRole ? region->tr() : region->key();
} }
const TZRegion* const TZRegion*

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

@ -84,11 +84,6 @@ public:
class DLLEXPORT TZRegionModel : public QAbstractListModel class DLLEXPORT TZRegionModel : public QAbstractListModel
{ {
public: public:
enum
{
LabelRole = Qt::DisplayRole
};
/// @brief Create empty model (useless) /// @brief Create empty model (useless)
TZRegionModel(); TZRegionModel();
virtual ~TZRegionModel() override; virtual ~TZRegionModel() override;