models

8 files changed, 30 insertions, 16 deletions

diff --git a/src/model/EgoListModel.cpp b/src/model/EgoListModel.cpp
index 0cef0d4..8327274 100644
--- a/src/model/EgoListModel.cpp
+++ b/src/model/EgoListModel.cpp
@@ -29,6 +29,11 @@ EgoListModel::EgoListModel (const QList<Ego *> &data, QObject * parent)
   : QAbstractListModel (parent),
     m_data (data)
 {
+  QListIterator<Ego *> it (m_data);
+  while (it.hasNext ())
+  {
+    rowAdded (it.next ());
+  }
 }
 
 
@@ -82,9 +87,9 @@ EgoListModel::roleNames () const
 void
 EgoListModel::rowAdded (Ego *ego)
 {
-  int index = m_data.count ();
-  beginInsertRows (QModelIndex (), index, index);
-  ego->setIndex (index);
+  int idx = m_count++;
+  beginInsertRows (QModelIndex (), idx, idx);
+  ego->setIndex (idx);
 
   connect (ego, &Ego::modified,
            this, &EgoListModel::rowModified);
@@ -103,9 +108,9 @@ EgoListModel::rowModified (int index)
 
 
 int
-EgoListModel::getCount ()
+EgoListModel::count ()
 {
-  return m_data.count ();
+  return m_count;
 }
 
 
diff --git a/src/model/EgoListModel.h b/src/model/EgoListModel.h
index bb2d94b..3347ab7 100644
--- a/src/model/EgoListModel.h
+++ b/src/model/EgoListModel.h
@@ -44,7 +44,7 @@ public:
     EgoListModel (const QList<Ego *> &data, QObject *parent = 0);
 
   Q_INVOKABLE int
-    getCount ();
+    count ();
 
   Q_INVOKABLE Ego *
     get (int index);
@@ -83,6 +83,7 @@ private:
     roleNames () const;
 
   const QList<Ego *> &m_data;
+  int m_count;
 
   #if FIXME
   QHash<QString, int> m_lookupIndex;
diff --git a/src/model/NymListModel.cpp b/src/model/NymListModel.cpp
index 76fa9a4..1277800 100644
--- a/src/model/NymListModel.cpp
+++ b/src/model/NymListModel.cpp
@@ -29,6 +29,11 @@ NymListModel::NymListModel (const QList<Nym *> &data, QObject * parent)
   : QAbstractListModel (parent),
     m_data (data)
 {
+  QListIterator<Nym *> it (m_data);
+  while (it.hasNext ())
+  {
+    rowAdded (it.next ());
+  }
 }
 
 
@@ -82,9 +87,9 @@ NymListModel::roleNames () const
 void
 NymListModel::rowAdded (Nym *nym)
 {
-  int index = m_data.count ();
-  beginInsertRows (QModelIndex (), index, index);
-  nym->setIndex (index);
+  int idx = m_count++;
+  beginInsertRows (QModelIndex (), idx, idx);
+  nym->setIndex (idx);
 
   connect (nym, &Nym::modified,
            this, &NymListModel::rowModified);
@@ -103,9 +108,9 @@ NymListModel::rowModified (int index)
 
 
 int
-NymListModel::getCount ()
+NymListModel::count ()
 {
-  return m_data.count ();
+  return m_count;
 }
 
 
diff --git a/src/model/NymListModel.h b/src/model/NymListModel.h
index c680d98..1546c26 100644
--- a/src/model/NymListModel.h
+++ b/src/model/NymListModel.h
@@ -44,7 +44,7 @@ public:
     NymListModel (const QList<Nym *> &data, QObject *parent = 0);
 
   Q_INVOKABLE int
-    getCount ();
+    count ();
 
   Q_INVOKABLE Nym *
     get (int index);
@@ -81,6 +81,7 @@ private:
     roleNames () const;
 
   const QList<Nym *> &m_data;
+  int m_count;
 
   #if FIXME
   QHash<QString, int> m_lookupIndex;
diff --git a/src/model/PlaceListModel.cpp b/src/model/PlaceListModel.cpp
index d14ac60..f1b8c29 100644
--- a/src/model/PlaceListModel.cpp
+++ b/src/model/PlaceListModel.cpp
@@ -95,7 +95,7 @@ PlaceListModel::roleNames () const
 void
 PlaceListModel::rowAdded (Place *place)
 {
-  int idx = m_data.count () - 1;
+  int idx = m_count++;
   qDebug () << "PlaceListModel::rowAdded: " << idx;
 
   m_threads += new ThreadListModel (place->threads (), this);
@@ -122,7 +122,7 @@ PlaceListModel::rowModified (Place *place)
 int
 PlaceListModel::count ()
 {
-  return m_data.count ();
+  return m_count;
 }
 
 
diff --git a/src/model/PlaceListModel.h b/src/model/PlaceListModel.h
index b3c9941..452162a 100644
--- a/src/model/PlaceListModel.h
+++ b/src/model/PlaceListModel.h
@@ -83,6 +83,7 @@ class PlaceListModel : public QAbstractListModel
     roleNames () const;
 
   const QList<Place *> &m_data;
+  int m_count;
 
   QList<ThreadListModel *> m_threads;
 };
diff --git a/src/model/ThreadListModel.cpp b/src/model/ThreadListModel.cpp
index 02f0092..cb310f4 100644
--- a/src/model/ThreadListModel.cpp
+++ b/src/model/ThreadListModel.cpp
@@ -72,7 +72,7 @@ ThreadListModel::roleNames () const
 void
 ThreadListModel::rowAdded (Message *msg)
 {
-  int idx = m_data.count () - 1;
+  int idx = m_count++;
   qDebug () << "ThreadListModel::rowAdded: " << idx;
 
   m_thread += new ThreadModel (msg, this);
@@ -100,7 +100,7 @@ ThreadListModel::rowModified (Message *msg)
 int
 ThreadListModel::count ()
 {
-  return m_data.count ();
+  return m_count;
 }
 
 
diff --git a/src/model/ThreadListModel.h b/src/model/ThreadListModel.h
index d5a664d..d31e2e2 100644
--- a/src/model/ThreadListModel.h
+++ b/src/model/ThreadListModel.h
@@ -62,6 +62,7 @@ class ThreadListModel : public QAbstractListModel
     roleNames () const;
 
   const QList<Message *> &m_data;
+  int m_count;
 
   QList<ThreadModel *> m_thread;
 };