X-Git-Url: http://git.maemo.org/git/?p=mardrone;a=blobdiff_plain;f=mardrone%2Fuilistelement.cpp;h=59b0a22e6041ed2f81bb536140eddb570c4b8b52;hp=7611cd360c4fa15aa85b8f8c2046813a896ffd96;hb=04dd9eeea7b747c1cee4882673a7e1c17519fe1a;hpb=f7f1d7c4427cba2c8490f2767259b1d06f66c7ed

diff --git a/mardrone/uilistelement.cpp b/mardrone/uilistelement.cpp
index 7611cd3..59b0a22 100644
--- a/mardrone/uilistelement.cpp
+++ b/mardrone/uilistelement.cpp
@@ -21,8 +21,8 @@ uiListModel::uiListModel(QObject *parent)
  {
      QHash<int, QByteArray> roles;
      roles[NameRole] = "name";
+     roles[TextRole] = "text";
      roles[FileRole] = "file";
-     roles[ModelDataRole] = "modelData";
      setRoleNames(roles);
  }
 
@@ -36,22 +36,20 @@ uiListModel::uiListModel(QObject *parent)
  int uiListModel::rowCount(const QModelIndex & parent) const {
      return m_uiList.count();
  }
- int uiListModel::count()
-{
-     qDebug() <<"Count:" << m_uiList.count();
-     return m_uiList.count();
- }
 
  QVariant uiListModel::data(const QModelIndex & index, int role) const {
      if (index.row() < 0 || index.row() > m_uiList.count())
          return QVariant();
-
+qDebug() << "uiListModel::data" << index << role;
      const uiListElement *ui = m_uiList[index.row()];
-     if (role == NameRole)
+
+     if (role == NameRole ||role == TextRole ) {
+         qDebug() << "uiListModel::data" << index << role << ui->name();
          return ui->name();
-     else if (role == FileRole)
+     }
+     else if (role == FileRole) {
+         qDebug() << "uiListModel::data" << index << role << ui->file();
          return ui->file();
-     else if (role == ModelDataRole)
-         return ui->modelData();
+     }
      return QVariant();
  }