models

11 files changed, 123 insertions, 49 deletions

diff --git a/src/model/EgoListModel.cpp b/src/model/EgoListModel.cpp
index 8327274..7fd9029 100644
--- a/src/model/EgoListModel.cpp
+++ b/src/model/EgoListModel.cpp
@@ -62,10 +62,10 @@ EgoListModel::data (const QModelIndex &index, int role) const
     return ego->name ();
 
   default:
-    return QVariant::Invalid;
+    return QVariant();
   }
 
-  return QVariant::Invalid;
+  return QVariant();
 }
 
 
diff --git a/src/model/NymListModel.cpp b/src/model/NymListModel.cpp
index 1277800..2ca6c70 100644
--- a/src/model/NymListModel.cpp
+++ b/src/model/NymListModel.cpp
@@ -62,10 +62,10 @@ NymListModel::data (const QModelIndex &index, int role) const
     return nym->name ();
 
   default:
-    return QVariant::Invalid;
+    return QVariant();
   }
 
-  return QVariant::Invalid;
+  return QVariant();
 }
 
 
diff --git a/src/model/PlaceListModel.cpp b/src/model/PlaceListModel.cpp
index f1b8c29..aaaf4ed 100644
--- a/src/model/PlaceListModel.cpp
+++ b/src/model/PlaceListModel.cpp
@@ -52,7 +52,7 @@ PlaceListModel::data (const QModelIndex &index, int role) const
 {
   int idx = index.row ();
   if (idx < 0 || m_data.count () <= idx)
-    return QVariant::Invalid;
+    return QVariant();
 
   Place *place = m_data[idx];
 
@@ -69,7 +69,7 @@ PlaceListModel::data (const QModelIndex &index, int role) const
   case THREADS:
     return &m_threads[idx];
   default:
-    return QVariant::Invalid;
+    return QVariant();
   }
 }
 
@@ -84,6 +84,7 @@ PlaceListModel::roleNames () const
   roles[PUBKEY] = "pubKey";
   roles[TYPE] = "type";
   roles[DESC] = "description";
+  roles[THREADS] = "threadListModel";
 
   return roles;
 }
diff --git a/src/model/ThreadListModel.cpp b/src/model/ThreadListModel.cpp
index cb310f4..aec692d 100644
--- a/src/model/ThreadListModel.cpp
+++ b/src/model/ThreadListModel.cpp
@@ -26,11 +26,11 @@ ThreadListModel::rowCount (const QModelIndex & parent) const
 
 
 QVariant
-ThreadListModel::data (const QModelIndex & index, int role) const
+ThreadListModel::data (const QModelIndex &index, int role) const
 {
   int idx = index.row ();
   if (idx < 0 || m_data.count () <= idx)
-    return QVariant::Invalid;
+    return QVariant();
 
   Message *msg = m_data[idx];
 
@@ -47,7 +47,7 @@ ThreadListModel::data (const QModelIndex & index, int role) const
     return msg->desc ();
 #endif
   default:
-    return QVariant::Invalid;
+    return QVariant();
   }
 }
 
@@ -105,12 +105,12 @@ ThreadListModel::count ()
 
 
 Message *
-ThreadListModel::get (int index)
+ThreadListModel::get (int idx)
 {
-  if (index < 0 || count () < index)
+  if (idx < 0 || count () < idx)
     return NULL;
 
-  Message *msg = m_data[index];
+  Message *msg = m_data[idx];
 
   //Set the ownership so QML don't delete it.
   QQmlEngine::setObjectOwnership (msg, QQmlEngine::CppOwnership);
@@ -129,6 +129,31 @@ ThreadListModel::get (QModelIndex index)
 }
 
 
+ThreadModel *
+ThreadListModel::threadModel (int idx)
+{
+  if (idx < 0 || count () < idx)
+    return NULL;
+
+  ThreadModel *thread = m_thread[idx];
+
+  //Set the ownership so QML don't delete it.
+  QQmlEngine::setObjectOwnership (thread, QQmlEngine::CppOwnership);
+
+  return thread;
+}
+
+
+ThreadModel *
+ThreadListModel::threadModel (QModelIndex index)
+{
+  if (count () < index.row ())
+    return NULL;
+
+  return m_thread[index.row ()];
+}
+
+
 #if FIXME
 bool
 ThreadListModel::contains (QString id)
diff --git a/src/model/ThreadListModel.h b/src/model/ThreadListModel.h
index d31e2e2..0d67b88 100644
--- a/src/model/ThreadListModel.h
+++ b/src/model/ThreadListModel.h
@@ -29,11 +29,17 @@ class ThreadListModel : public QAbstractListModel
     count ();
 
   Q_INVOKABLE Message *
-    get (int index);
+    get (int idx);
 
   Message *
     get (QModelIndex index);
 
+  Q_INVOKABLE ThreadModel *
+    threadModel (int idx);
+
+  ThreadModel *
+    threadModel (QModelIndex index);
+
 #if FIXME
   bool
     contains (QString id);
diff --git a/src/model/ThreadModel.cpp b/src/model/ThreadModel.cpp
index e72d2e6..4f5b2f6 100644
--- a/src/model/ThreadModel.cpp
+++ b/src/model/ThreadModel.cpp
@@ -1,5 +1,7 @@
+
 #include "ThreadModel.h"
 
+#include <QDebug>
 
 ThreadModel::ThreadModel (Message *root, QObject *parent)
   : QAbstractItemModel (parent)
@@ -20,13 +22,6 @@ ThreadModel::setRoot (Message *root)
 }
 
 
-int
-ThreadModel::columnCount (const QModelIndex &parent) const
-{
-  return 1;
-}
-
-
 Qt::ItemFlags
 ThreadModel::flags (const QModelIndex &index) const
 {
@@ -34,15 +29,25 @@ ThreadModel::flags (const QModelIndex &index) const
 }
 
 
-QVariant
-ThreadModel::data (const QModelIndex &index,
-                   int role) const
+int
+ThreadModel::rowCount (const QModelIndex &parent) const
 {
-  if (role != Qt::DisplayRole || !index.isValid())
-    return QVariant ();
+  if (0 != parent.column ())
+    return 0;
 
-  Message *msg = static_cast<Message *> (index.internalPointer());
-  return QVariant::fromValue (msg);
+  Message *
+    msg = (parent.isValid ())
+    ? static_cast<Message *> (parent.internalPointer())
+    : m_root;
+
+  return msg->childrenCount ();
+}
+
+
+int
+ThreadModel::columnCount (const QModelIndex &parent) const
+{
+  return 1;
 }
 
 
@@ -74,24 +79,34 @@ ThreadModel::parent (const QModelIndex &index) const
   Message *child = static_cast<Message *> (index.internalPointer());
   Message *parent = child->parent ();
 
-  return (parent == m_root)
+  return (parent == m_root || parent == 0)
     ? QModelIndex ()
     : createIndex (parent->index(), 0, parent);
 }
 
 
-int
-ThreadModel::rowCount (const QModelIndex &parent) const
+QVariant
+ThreadModel::data (const QModelIndex &index, int role) const
 {
-  if (0 != parent.column ())
-    return 0;
+  if (role != Qt::DisplayRole || !index.isValid())
+    return QVariant ();
 
-  Message *
-    msg = (parent.isValid ())
-    ? static_cast<Message *> (parent.internalPointer())
-    : m_root;
+  Message *msg = static_cast<Message *> (index.internalPointer());
+  return QVariant::fromValue (msg);
+}
 
-  return msg->childrenCount ();
+
+QModelIndex
+ThreadModel::index (Message *msg)
+{
+  if (m_index.contains (msg))
+  {
+    return m_index[msg];
+  }
+  else
+  {
+    return QModelIndex ();
+  }
 }
 
 
@@ -101,10 +116,20 @@ ThreadModel::rowCount (const QModelIndex &parent) const
 void
 ThreadModel::rowAdded (Message *msg)
 {
-#if FIXME
-  int idx = m_data.count () - 1;
+  int idx = msg->index ();
+  qDebug () << "ThreadModel::rowAdded: " << idx;
+
+  if (!msg->parent ())
+  {
+    qDebug () << "ThreadModel::rowAdded: no parent found";
+    Q_ASSERT (0);
+    return;
+  }
+
+  QModelIndex parent = index (msg->parent ());
+  m_index[msg] = createIndex (idx, 0, msg);
 
-  beginInsertRows (QModelIndex (), idx, idx);
+  beginInsertRows (parent, idx, idx);
   endInsertRows ();
 
   connect (msg, &Message::modified,
@@ -112,15 +137,12 @@ ThreadModel::rowAdded (Message *msg)
 
   connect (msg, &Message::childAdded,
            this, &ThreadModel::rowAdded);
-#endif
 }
 
 
 void
 ThreadModel::rowModified (Message *msg)
 {
-#if FIXME
-  QModelIndex index = this->index (msg->index ());
+  QModelIndex index = m_index[msg];
   emit dataChanged (index, index);
-#endif
 }
diff --git a/src/model/ThreadModel.h b/src/model/ThreadModel.h
index 656373b..ff1111f 100644
--- a/src/model/ThreadModel.h
+++ b/src/model/ThreadModel.h
@@ -45,6 +45,10 @@ class ThreadModel : public QAbstractItemModel
     columnCount (const QModelIndex &parent = QModelIndex())
     const Q_DECL_OVERRIDE;
 
+  QModelIndex
+    index (Message *msg);
+
+
  public slots:
 
   void
@@ -56,6 +60,7 @@ class ThreadModel : public QAbstractItemModel
  private:
 
   Message *m_root;
+  QHash<Message *, QModelIndex> m_index;
 };
 
 #endif
diff --git a/src/social/message.cpp b/src/social/message.cpp
index 41b1d3a..abc3f9c 100644
--- a/src/social/message.cpp
+++ b/src/social/message.cpp
@@ -55,6 +55,13 @@ Message::Message (const char *method,
 }
 
 
+Message::~Message ()
+{
+  // FIXME: delete children?
+  emit deleted (this);
+}
+
+
 /*** PSYC ***/
 
 
diff --git a/src/social/message.h b/src/social/message.h
index 5e36477..b3735ef 100644
--- a/src/social/message.h
+++ b/src/social/message.h
@@ -49,6 +49,8 @@ class Message : public QObject
              GNUNET_SOCIAL_Nym *nym = 0,
              Message *parent = 0);
 
+  ~Message ();
+
   /*** PSYC ***/
 
   void
@@ -178,6 +180,7 @@ class Message : public QObject
     m_data = text.toUtf8 ();
   }
 
+
  signals:
 
   void
@@ -186,6 +189,9 @@ class Message : public QObject
   void
     childAdded (Message *msg);
 
+  void
+    deleted (Message *msg);
+
  private:
 
   uint64_t m_id;
@@ -197,6 +203,8 @@ class Message : public QObject
   QList<Message *> m_children;
   Message *m_parent;
 
+  void *m_ptr;
+
   static int
     iterateEnv (void *cls, GNUNET_PSYC_Operator oper,
                 const char *name, const char *value,
diff --git a/src/social/socialapp.cpp b/src/social/socialapp.cpp
index 75279fd..e739574 100644
--- a/src/social/socialapp.cpp
+++ b/src/social/socialapp.cpp
@@ -1,8 +1,8 @@
-#include "social/socialapp.h"
+#include "socialapp.h"
 #include "app.h"
 
-#include "social/host.h"
-#include "social/guest.h"
+#include "host.h"
+#include "guest.h"
 
 
 SocialApp::SocialApp (struct GNUNET_CONFIGURATION_Handle *config,
diff --git a/src/social/socialapp.h b/src/social/socialapp.h
index 7bb7219..36b4ee4 100644
--- a/src/social/socialapp.h
+++ b/src/social/socialapp.h
@@ -4,8 +4,8 @@
 #include <QObject>
 #include <QDebug>
 
-#include "social/ego.h"
-#include "social/place.h"
+#include "ego.h"
+#include "place.h"
 #include "gnunet.h"
 
 class SocialApp : public QObject