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

[welcome] Switch model to a list model

Browse Source 
- There doesn't seem to be a real benefit to providing the
   name and label as separate columns.
This commit is contained in:
Adriaan de Groot 2019-04-19 11:38:43 +02:00
parent 53fd1590b8
commit 0b833b1e75
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/welcome/LocaleModel.cpp
View File

@ -19,7 +19,7 @@
#include "LocaleModel.h" #include "LocaleModel.h"
LocaleModel::LocaleModel( const QStringList& locales, QObject* parent ) LocaleModel::LocaleModel( const QStringList& locales, QObject* parent )
: QAbstractTableModel( parent ) : QAbstractListModel( parent )
{ {
Q_ASSERT( locales.count() > 0 ); Q_ASSERT( locales.count() > 0 );
m_locales.reserve( locales.count() ); m_locales.reserve( locales.count() );
@ -32,12 +32,6 @@ LocaleModel::~LocaleModel()
{ {
} }
int
LocaleModel::columnCount( const QModelIndex& ) const
{
return 2;
}
int int
LocaleModel::rowCount( const QModelIndex& ) const LocaleModel::rowCount( const QModelIndex& ) const
{ {

5
src/modules/welcome/LocaleModel.h
View File

@ -19,13 +19,13 @@
#ifndef WELCOME_LOCALEMODEL_H #ifndef WELCOME_LOCALEMODEL_H
#define WELCOME_LOCALEMODEL_H #define WELCOME_LOCALEMODEL_H
#include <QAbstractTableModel> #include <QAbstractListModel>
#include <QVector> #include <QVector>
#include "utils/LocaleLabel.h" #include "utils/LocaleLabel.h"
class LocaleModel : public QAbstractTableModel class LocaleModel : public QAbstractListModel
{ {
public: public:
using LocaleLabel = CalamaresUtils::LocaleLabel; using LocaleLabel = CalamaresUtils::LocaleLabel;
@ -34,7 +34,6 @@ public:
virtual ~LocaleModel() override; virtual ~LocaleModel() override;
int rowCount( const QModelIndex& parent ) const override; int rowCount( const QModelIndex& parent ) const override;
int columnCount( const QModelIndex& parent ) const override;
QVariant data( const QModelIndex& index, int role ) const override; QVariant data( const QModelIndex& index, int role ) const override;