ego & place models

12 files changed, 179 insertions, 242 deletions

diff --git a/src/app.cpp b/src/app.cpp
index 15063cb..bb703da 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -78,11 +78,17 @@ App::startGnuNet ()
 void
 App::setConnected (bool connected)
 {
-  #if FIXME
-  m_models->egos ()->setData (m_gnunet->social ()->egos ());
-  connect (m_gnunet->social (), SIGNAL (egoAdded ()),
-           m_models->egos (), SLOT (add ()));
-  #endif
+  qDebug () << "setConnected: " << connected;
+  if (connected)
+  {
+    m_models->setEgos (new EgoListModel (m_gnunet->social ()->egos (), this));
+    connect (m_gnunet->social (), &SocialApp::egoAddedSignal,
+             m_models->egos (), &EgoListModel::rowAddedSlot);
+
+    m_models->setPlaces (new PlaceListModel (m_gnunet->social ()->places (), this));
+    connect (m_gnunet->social (), &SocialApp::placeAddedSignal,
+             m_models->places (), &PlaceListModel::rowAddedSlot);
+  }
 
   m_connected = connected;
   emit connectedChanged (m_connected);
diff --git a/src/app.h b/src/app.h
index ba7806d..d187806 100644
--- a/src/app.h
+++ b/src/app.h
@@ -37,7 +37,6 @@ class App : public QObject
 
   Q_PROPERTY (bool connected
               READ isConnected
-              WRITE setConnected
               NOTIFY connectedChanged);
 
 public:
diff --git a/src/model/EgoListModel.cpp b/src/model/EgoListModel.cpp
index 3ffe6bd..0e279bb 100644
--- a/src/model/EgoListModel.cpp
+++ b/src/model/EgoListModel.cpp
@@ -25,33 +25,18 @@
 #include "EgoListModel.h"
 
 
-EgoListModel::EgoListModel (QObject * parent)
-  : QAbstractListModel (parent)
+EgoListModel::EgoListModel (const QList<Ego *> &data, QObject * parent)
+  : QAbstractListModel (parent),
+    m_data (data)
 {
-  connect (this, &EgoListModel::addEgoSignal,
-           this, &EgoListModel::addEgoSlot, Qt::BlockingQueuedConnection);
-}
-
-
-void
-EgoListModel::setData (const QList<Ego *> &data)
-{
-  m_data = data;
 }
 
 
 int
-EgoListModel::rowCount (const QModelIndex & parent) const
+EgoListModel::rowCount (const QModelIndex &parent) const
 {
   Q_UNUSED (parent);
-  return m_data.size ();
-}
-
-
-bool
-EgoListModel::contains (QString pubKey)
-{
-  return m_lookupIndex.contains (pubKey);
+  return m_data.count ();
 }
 
 
@@ -65,12 +50,12 @@ EgoListModel::data (const QModelIndex &index, int role) const
 
   switch (role)
   {
-  case NAME:
-    return ego->name ();
-    break;
   case PUBKEY:
     return ego->pubKeyString ();
-    break;
+
+  case NAME:
+    return ego->name ();
+
   default:
     return QVariant::Invalid;
   }
@@ -91,71 +76,51 @@ EgoListModel::roleNames () const
 }
 
 
+/**
+ * An ego was added to the source data.
+ */
 void
-EgoListModel::modifiedSlot (int indexRow)
+EgoListModel::rowAddedSlot (Ego *ego)
 {
-  QModelIndex modelIndex = this->index (indexRow);
+  int index = m_data.count ();
+  beginInsertRows (QModelIndex (), index, index);
+  ego->setIndex (index);
 
-  emit dataChanged (modelIndex, modelIndex);
+  connect (ego, &Ego::modifiedSignal,
+           this, &EgoListModel::rowModifiedSlot);
+
+  //m_lookupIndex[pubKey] = index;
+  endInsertRows ();
 }
 
 
-/**
- * @brief EgoListModel::add, add a new ego to the model.
- * @param key
- * @param name
- * @return Return the newly created ego
- */
 void
-EgoListModel::add (Ego *ego)
+EgoListModel::rowModifiedSlot (int index)
 {
-  emit addEgoSignal (ego, ego->pubKeyString ());
+  QModelIndex modelIndex = this->index (index);
+  emit dataChanged (modelIndex, modelIndex);
 }
 
 
-/**
- * @brief EgoListModel::addEgoSlot
- * @param key, the ego key.
- * @return return the same place as item
- */
-Ego *
-EgoListModel::addEgoSlot (Ego *item, QString pubKey)
+int
+EgoListModel::getCount ()
 {
-
-  //Search if already exists
-  if (m_lookupIndex.contains (pubKey))
-  {
-    return NULL;
-  }
-  else
-  {
-    int index = m_data.count ();
-
-    beginInsertRows (QModelIndex (), index, index);
-    m_data.append (item);
-    item->setIndex (index);
-
-    //Notify modifications
-    connect (item, &Ego::modifiedSignal,
-             this, &EgoListModel::modifiedSlot);
-
-    m_lookupIndex[pubKey] = index;
-    endInsertRows ();
-    return item;
-  }
+  return m_data.count ();
 }
 
 
 Ego *
-EgoListModel::get (QString key)
+EgoListModel::get (int index)
 {
-  if (m_lookupIndex.contains (key))
-  {
-    Ego *ego = m_data[m_lookupIndex[key]];
-    return ego;
-  }
-  else
+  if (index < 0 || m_data.count () <= index)
     return NULL;
+
+  Ego *ego = m_data[index];
+
+  //Set the ownership so QML don't delete it.
+  QQmlEngine::setObjectOwnership (ego, QQmlEngine::CppOwnership);
+
+  return ego;
 }
 
 
@@ -169,23 +134,23 @@ EgoListModel::get (QModelIndex index)
 }
 
 
-Ego *
-EgoListModel::get (int index)
+#if FIXME
+bool
+EgoListModel::contains (QString pubKey)
 {
-  if (index < 0 || m_data.count () <= index)
-    return NULL;
-
-  Ego *ego = m_data[index];
-
-  //Set he ownership so QML don't delete it.
-  QQmlEngine::setObjectOwnership (ego, QQmlEngine::CppOwnership);
-
-  return ego;
+  return m_lookupIndex.contains (pubKey);
 }
 
 
-int
-EgoListModel::getCount ()
+Ego *
+EgoListModel::get (QString key)
 {
-  return m_data.count ();
+  if (m_lookupIndex.contains (key))
+  {
+    Ego *ego = m_data[m_lookupIndex[key]];
+    return ego;
+  }
+  else
+    return NULL;
 }
+#endif
diff --git a/src/model/EgoListModel.h b/src/model/EgoListModel.h
index 33a9cbe..dbc4147 100644
--- a/src/model/EgoListModel.h
+++ b/src/model/EgoListModel.h
@@ -35,47 +35,41 @@ class EgoListModel : public QAbstractListModel
 public:
   enum EgoRoles
   {
-    NAME = Qt::UserRole + 1,
-    PUBKEY,
+    PUBKEY = Qt::UserRole + 1,
+    NAME,
     NB_PLACE_COLUMNS
   };
 
   explicit
-    EgoListModel (QObject *parent = 0);
-
-  void
-    setData (const QList<Ego *> &data);
-
-  void
-    add (Ego *ego);
+    EgoListModel (const QList<Ego *> &data, QObject *parent = 0);
 
   Q_INVOKABLE int
     getCount ();
 
-  bool
-    contains (QString id);
-
   Q_INVOKABLE Ego *
     get (int index);
+
   Ego *
     get (QModelIndex index);
+
+#if FIXME
+  bool
+    contains (QString id);
+
   Ego *
     get (QString key);
 
-signals:
-
-  void
-    addEgoSignal (Ego *item, QString pubKey);
+#endif
 
 public slots:
 
   void
-    modifiedSlot (int indexRow);
+    rowAddedSlot (Ego *ego);
 
-private slots:
+  void
+    rowModifiedSlot (int index);
 
-  Ego *
-    addEgoSlot (Ego *item, QString name);
+private slots:
 
 private:
 
@@ -88,8 +82,11 @@ private:
   QHash<int, QByteArray>
     roleNames () const;
 
+  const QList<Ego *> &m_data;
+
+  #if FIXME
   QHash<QString, int> m_lookupIndex;
-  QList<Ego *> m_data;
+  #endif
 };
 
 #endif
diff --git a/src/model/PlaceListModel.cpp b/src/model/PlaceListModel.cpp
index 1116679..896fa22 100644
--- a/src/model/PlaceListModel.cpp
+++ b/src/model/PlaceListModel.cpp
@@ -21,21 +21,15 @@
 
 #include <sstream>
 #include <QQmlEngine>
+#include <QDebug>
 
 #include "PlaceListModel.h"
 
 
-PlaceListModel::PlaceListModel (QObject * parent)
-  : QAbstractListModel (parent)
+PlaceListModel::PlaceListModel (const QList<Place *> &data, QObject * parent)
+  : QAbstractListModel (parent),
+    m_data (data)
 {
-  connect (this, &PlaceListModel::addPlaceSignal,
-           this, &PlaceListModel::addPlaceSlot);
-}
-
-
-PlaceListModel::~PlaceListModel ()
-{
-
 }
 
 
@@ -47,13 +41,6 @@ PlaceListModel::rowCount (const QModelIndex & parent) const
 }
 
 
-bool
-PlaceListModel::contains (QString id)
-{
-  return m_lookupIndex.contains (id);
-}
-
-
 QVariant
 PlaceListModel::data (const QModelIndex & index, int role) const
 {
@@ -98,74 +85,53 @@ PlaceListModel::roleNames () const
 }
 
 
+/**
+ * A place was added to the source data.
+ */
 void
-PlaceListModel::modifiedSlot (int indexRow)
+PlaceListModel::rowAddedSlot (Place *place)
 {
-  QModelIndex modelIndex = this->index (indexRow);
+  int index = m_data.count () - 1;
+  qDebug () << "PlaceListModel::rowAddedSlot: " << index;
 
-  emit dataChanged (modelIndex, modelIndex);
+  beginInsertRows (QModelIndex (), index, index);
+  place->setIndex (index);
+
+  connect (place, &Place::modifiedSignal,
+           this, &PlaceListModel::rowModifiedSlot);
+
+  //m_lookupIndex[pubKey] = index;
+  endInsertRows ();
 }
 
 
-/**
- * @brief PlaceListModel::add, add a new place to the model.
- * @param key
- * @return Return the new created place
- */
 void
-PlaceListModel::add (Place *place)
+PlaceListModel::rowModifiedSlot (int index)
 {
-  emit addPlaceSignal (place, place->pubKeyString ());
+  QModelIndex modelIndex = this->index (index);
+  emit dataChanged (modelIndex, modelIndex);
 }
 
 
-/**
- * @brief PlaceListModel::addPlaceSlot
- * @param key, the place ID.
- * @return return the same place as item
- */
-Place *
-PlaceListModel::addPlaceSlot (Place *item, QString pubKey)
+int
+PlaceListModel::getCount ()
 {
-
-  //Search if already exists
-  if (m_lookupIndex.contains (pubKey))
-  {
-    return NULL;
-  }
-  else
-  {
-    int index = m_data.count ();
-
-    beginInsertRows (QModelIndex (), index, index);
-    m_data.append (item);
-    item->setIndex (index);
-
-    //Notify modifications
-    connect (item, &Place::modifiedSignal,
-             this, &PlaceListModel::modifiedSlot);
-
-    m_lookupIndex[pubKey] = index;
-    endInsertRows ();
-    return item;
-  }
-
-
+  return m_data.count ();
 }
 
 
 Place *
-PlaceListModel::get (QString key)
+PlaceListModel::get (int index)
 {
-  if (m_lookupIndex.contains (key))
-  {
-    Place *place = m_data[m_lookupIndex[key]];
+  if (index < 0 || getCount () < index)
+    return NULL;
 
-    return place;
+  Place *place = m_data[index];
 
-  }
-  else
-    return NULL;
+  //Set the ownership so QML don't delete it.
+  QQmlEngine::setObjectOwnership (place, QQmlEngine::CppOwnership);
+
+  return place;
 }
 
 
@@ -179,23 +145,25 @@ PlaceListModel::get (QModelIndex index)
 }
 
 
-Place *
-PlaceListModel::get (int index)
+#if FIXME
+bool
+PlaceListModel::contains (QString id)
 {
-  if (index < 0 || getCount () < index)
-    return NULL;
-
-  Place *place = m_data[index];
-
-  //Set he ownership so QML don't delete it.
-  QQmlEngine::setObjectOwnership (place, QQmlEngine::CppOwnership);
-
-  return place;
+  return m_lookupIndex.contains (id);
 }
 
 
-int
-PlaceListModel::getCount ()
+Place *
+PlaceListModel::get (QString key)
 {
-  return m_data.count ();
+  if (m_lookupIndex.contains (key))
+  {
+    Place *place = m_data[m_lookupIndex[key]];
+
+    return place;
+
+  }
+  else
+    return NULL;
 }
+#endif
diff --git a/src/model/PlaceListModel.h b/src/model/PlaceListModel.h
index b66044d..d93a3f4 100644
--- a/src/model/PlaceListModel.h
+++ b/src/model/PlaceListModel.h
@@ -42,42 +42,32 @@ class PlaceListModel : public QAbstractListModel
   };
 
   explicit
-    PlaceListModel (QObject *parent = 0);
-  ~PlaceListModel ();
+    PlaceListModel (const QList<Place *> &data, QObject *parent = 0);
 
-  void
-    add (Place *place);
-  int
+  Q_INVOKABLE int
     getCount ();
-  bool
-    contains (QString id);
 
   Q_INVOKABLE Place *
     get (int index);
+
   Place *
     get (QModelIndex index);
-  Place *
-    get (QString key);
-
-  void
-    save ();
-  void
-    load ();
 
- signals:
+#if FIXME
+  bool
+    contains (QString id);
 
-  void
-    addPlaceSignal (Place *item, QString key);
+  Place *
+    get (QString key);
+#endif
 
  public slots:
 
   void
-    modifiedSlot (int indexRow);
+    rowAddedSlot (Place *place);
 
- private slots:
-
-   Place *
-   addPlaceSlot (Place *item, QString name);
+  void
+    rowModifiedSlot (int index);
 
  private:
 
@@ -88,8 +78,8 @@ class PlaceListModel : public QAbstractListModel
   QHash<int, QByteArray>
     roleNames () const;
 
-  QHash<QString, int> m_lookupIndex;
-  QList<Place *> m_data;
+  const QList<Place *> &m_data;
+  //QHash<QString, int> m_lookupIndex;
 };
 
 #endif
diff --git a/src/model/models.cpp b/src/model/models.cpp
index cdac395..4472b51 100644
--- a/src/model/models.cpp
+++ b/src/model/models.cpp
@@ -25,16 +25,4 @@
 Models::Models (QObject *parent)
   : QObject (parent)
 {
-  m_egos = new EgoListModel (this);
-  m_places = new PlaceListModel (this);
-}
-
-
-Models::~Models ()
-{
-  delete m_egos;
-  m_egos = NULL;
-
-  delete m_places;
-  m_places = NULL;
 }
diff --git a/src/model/models.h b/src/model/models.h
index 11449b5..246d18e 100644
--- a/src/model/models.h
+++ b/src/model/models.h
@@ -26,7 +26,7 @@
 #include "model/EgoListModel.h"
 #include "model/PlaceListModel.h"
 
-class Models:public QObject
+class Models : public QObject
 {
   Q_OBJECT;
 
@@ -38,26 +38,46 @@ class Models:public QObject
               READ places
               NOTIFY placesChanged);
 
+
  public:
 
-  explicit Models (QObject * parent = 0);
-  ~Models ();
+  explicit
+    Models (QObject *parent = 0);
 
-  EgoListModel *egos () const
+  EgoListModel *
+  egos () const
   {
     return m_egos;
   }
 
-  PlaceListModel *places () const
+  PlaceListModel
+  *places () const
   {
     return m_places;
   }
 
+  void
+  setEgos (EgoListModel *egos)
+  {
+    m_egos = egos;
+    emit egosChanged (egos);
+  }
+
+  void
+  setPlaces (PlaceListModel *places)
+  {
+    m_places = places;
+    emit placesChanged (places);
+  }
+
 
  signals:
 
-  void egosChanged (EgoListModel *);
-  void placesChanged (PlaceListModel *);
+  void
+    egosChanged (EgoListModel *);
+
+  void
+    placesChanged (PlaceListModel *);
 
 
  private:
diff --git a/src/nym/nym.h b/src/nym/nym.h
index bddf91d..d961c69 100644
--- a/src/nym/nym.h
+++ b/src/nym/nym.h
@@ -21,7 +21,7 @@ class Nym : public QObject
          QObject *parent = 0);
 
   int
-  getIndex () const
+  index () const
   {
     return m_index;
   }
diff --git a/src/social/place.cpp b/src/social/place.cpp
index ddfa100..06e9c35 100644
--- a/src/social/place.cpp
+++ b/src/social/place.cpp
@@ -32,8 +32,6 @@ Place::init (const GNUNET_CRYPTO_EddsaPublicKey pubKey)
 
   setPubKey (pubKey);
   setName (pubKeyStr);
-
-  theApp->models()->places()->add (this);
 }
 
 /**
diff --git a/src/social/place.h b/src/social/place.h
index e0d4788..f59c444 100644
--- a/src/social/place.h
+++ b/src/social/place.h
@@ -12,7 +12,7 @@ class Place : public QObject
 {
 
   Q_OBJECT;
-  Q_PROPERTY (QString pubkey READ pubKeyString);
+  Q_PROPERTY (QString pubkey READ pubKeyString NOTIFY pubKeyStringChanged);
   Q_PROPERTY (QString name READ name WRITE setName NOTIFY nameChanged);
   Q_PROPERTY (QString desc READ desc WRITE setDesc NOTIFY descChanged);
 
@@ -21,7 +21,7 @@ class Place : public QObject
   explicit Place (QObject *parent = 0);
 
   //Index
-  int getIndex () const
+  int index () const
   {
     return m_index;
   }
@@ -39,6 +39,7 @@ class Place : public QObject
   {
     m_name = name;
     emit nameChanged (name);
+    emit modifiedSignal (m_index);
   }
 
   // Desc
@@ -50,6 +51,7 @@ class Place : public QObject
   {
     m_desc = desc;
     emit descChanged (desc);
+    emit modifiedSignal (m_index);
   }
 
   //Type
@@ -61,6 +63,7 @@ class Place : public QObject
   {
     m_type = type;
     emit typeChanged (type);
+    emit modifiedSignal (m_index);
   }
 
   //Is Host ?
@@ -86,6 +89,8 @@ class Place : public QObject
     char *pubKeyChr = GNUNET_CRYPTO_eddsa_public_key_to_string (&pubKey);
     m_pubKeyStr = QString::fromLatin1 (pubKeyChr);
     GNUNET_free (pubKeyChr);
+    emit pubKeyStringChanged (m_pubKeyStr);
+    emit modifiedSignal (m_index);
   }
 
   Q_INVOKABLE void
@@ -217,6 +222,8 @@ class Place : public QObject
 
   void modifiedSignal (int index);
 
+  void pubKeyStringChanged (QString pubKeyString);
+
   void nameChanged (QString name);
 
   void descChanged (QString desc);
diff --git a/src/social/socialapp.cpp b/src/social/socialapp.cpp
index c789e7e..b6f5d7c 100644
--- a/src/social/socialapp.cpp
+++ b/src/social/socialapp.cpp
@@ -50,7 +50,6 @@ SocialApp::addEgo (Ego *ego)
 {
   m_egos += ego;
   emit egoAddedSignal (ego);
-  theApp->models ()->egos ()->add (ego); // FIXME
 }
 
 void
@@ -101,7 +100,7 @@ SocialApp::findEgo (const QString pubKeyStr)
 void
 SocialApp::placeCreate (GNUNET_SOCIAL_Ego *ego)
 {
-  addPlace (new Host (m_app, ego, GNUNET_PSYC_CHANNEL_PRIVATE, this)); // FIXME: ego
+  addPlace (new Host (m_app, ego, GNUNET_PSYC_CHANNEL_PRIVATE, this));
 }