diff options
author | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-02-23 09:13:21 +0200 |
---|---|---|
committer | Kimmo Ollila <kimmo.ollila@theqtcompany.com> | 2016-03-02 12:51:24 +0000 |
commit | c6b5855b446c73f8a60cc3d4427fc445e0ba400d (patch) | |
tree | b57f45df2a297335392f56953410a4c3ab599a8d /src/localesettings | |
parent | f1d884b6dad5a93d7a3077b6b05d3ec7fcd9a6ea (diff) |
Migrate settings UI to use Qt Quick Controls 2
Task-number: QTEE-1057
Change-Id: I389d784241d4b68384765dfde4b572e7652eb76c
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Diffstat (limited to 'src/localesettings')
-rw-r--r-- | src/localesettings/localefiltermodel.cpp | 2 | ||||
-rw-r--r-- | src/localesettings/localemodel.cpp | 10 | ||||
-rw-r--r-- | src/localesettings/localemodel.h | 4 | ||||
-rw-r--r-- | src/localesettings/systemlocale_p.h | 4 |
4 files changed, 11 insertions, 9 deletions
diff --git a/src/localesettings/localefiltermodel.cpp b/src/localesettings/localefiltermodel.cpp index 027caba..a45c568 100644 --- a/src/localesettings/localefiltermodel.cpp +++ b/src/localesettings/localefiltermodel.cpp @@ -91,6 +91,6 @@ QVariant LocaleFilterModel::itemFromRow(const int row) const return nameRole; } } - return QVariant::fromValue(QString("")); + return QVariant(); } diff --git a/src/localesettings/localemodel.cpp b/src/localesettings/localemodel.cpp index 40d5fc8..f1f50da 100644 --- a/src/localesettings/localemodel.cpp +++ b/src/localesettings/localemodel.cpp @@ -98,13 +98,12 @@ void LocaleModel::generateModel(LocaleModel* model) QList<QLocale> allLocales = QLocale::matchingLocales(QLocale::AnyLanguage, QLocale::AnyScript, QLocale::AnyCountry); for (const QLocale &locale : allLocales) { - if (locale.name() != "C") { + if (locale.name() != QStringLiteral("C")) { LocaleItem *l = new LocaleItem(locale); l->moveToThread(model->thread()); QMetaObject::invokeMethod(model, "addNewItem", Q_ARG( QObject*, qobject_cast<QObject*>(l))); } } - } void LocaleModel::addNewItem(QObject *item) @@ -139,6 +138,9 @@ QVariant LocaleModel::data(const QModelIndex & index, int role) const LocaleItem *item = m_items[index.row()]; switch (role) { + case Qt::UserRole: + return QVariant::fromValue(static_cast<QObject*>(item)); + break; case Country: return item->country(); break; @@ -149,7 +151,7 @@ QVariant LocaleModel::data(const QModelIndex & index, int role) const return item->code(); break; default: - return ""; + return QVariant(); } } @@ -162,5 +164,5 @@ void LocaleModel::sort(int column, Qt::SortOrder order) { Q_UNUSED(column); Q_UNUSED(order); - qSort(m_items.begin(), m_items.end(), LocaleModel::variantLessThan); + std::sort(m_items.begin(), m_items.end(), LocaleModel::variantLessThan); } diff --git a/src/localesettings/localemodel.h b/src/localesettings/localemodel.h index 6ed5844..a1525b8 100644 --- a/src/localesettings/localemodel.h +++ b/src/localesettings/localemodel.h @@ -74,8 +74,8 @@ public: static bool variantLessThan(const LocaleItem* v1, const LocaleItem* v2); enum Roles { - Language = Qt::DisplayPropertyRole, - Country = Qt::UserRole, + Language = Qt::UserRole + 1, + Country, Code }; diff --git a/src/localesettings/systemlocale_p.h b/src/localesettings/systemlocale_p.h index 417b958..0f3e6df 100644 --- a/src/localesettings/systemlocale_p.h +++ b/src/localesettings/systemlocale_p.h @@ -59,11 +59,11 @@ public: } QString locale() const { - return m_localeCache["LANG"]; + return m_localeCache[QStringLiteral("LANG")]; } void setLocale(const QString& aLocale) { - m_localeCache["LANG"] = aLocale; + m_localeCache[QStringLiteral("LANG")] = aLocale; updateLocale(); } |