summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-04-16 09:47:28 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-04-16 23:43:14 +1200
commit15b2dbede4bb7907d687cf72d54b4ecdd7cc42a9 (patch)
treede6109f33f2fab51b1cb8358bc9dd448572a2410
parentaa86d47e47b049addc8e09625e47df94383530a0 (diff)
downloadsubsurface-15b2dbede4bb7907d687cf72d54b4ecdd7cc42a9.tar.gz
Mobile: reinstate roleNames function in ConnectionListModel
Commit c69ca4df80c9c74aa842b7f1fb3c44b22ae3232e removed the roleNames function, which is not needed according to the docs, as a default function is provided. For unknown reasons this broke the QML combo box. Reinstate the function. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
-rw-r--r--core/connectionlistmodel.cpp7
-rw-r--r--core/connectionlistmodel.h1
2 files changed, 8 insertions, 0 deletions
diff --git a/core/connectionlistmodel.cpp b/core/connectionlistmodel.cpp
index 0e4d69828..e4ac8bfeb 100644
--- a/core/connectionlistmodel.cpp
+++ b/core/connectionlistmodel.cpp
@@ -7,6 +7,13 @@ ConnectionListModel::ConnectionListModel(QObject *parent) :
{
}
+QHash <int, QByteArray> ConnectionListModel::roleNames() const
+{
+ QHash<int, QByteArray> roles;
+ roles[Qt::DisplayRole] = "display";
+ return roles;
+}
+
QVariant ConnectionListModel::data(const QModelIndex &index, int role) const
{
if (index.row() < 0 || index.row() >= m_addresses.count())
diff --git a/core/connectionlistmodel.h b/core/connectionlistmodel.h
index d05b753c7..75bf9c7d6 100644
--- a/core/connectionlistmodel.h
+++ b/core/connectionlistmodel.h
@@ -7,6 +7,7 @@ class ConnectionListModel : public QAbstractListModel {
Q_OBJECT
public:
ConnectionListModel(QObject *parent = nullptr);
+ QHash<int, QByteArray> roleNames() const override;
QVariant data(const QModelIndex &index, int role) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
void addAddress(const QString &address);