[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34129 - in gnunet-qt/SecureShare: . core core/identity cor
From: |
gnunet |
Subject: |
[GNUnet-SVN] r34129 - in gnunet-qt/SecureShare: . core core/identity core/social models |
Date: |
Sat, 9 Aug 2014 01:37:05 +0200 |
Author: bratao
Date: 2014-08-09 01:37:05 +0200 (Sat, 09 Aug 2014)
New Revision: 34129
Added:
gnunet-qt/SecureShare/core/social/
gnunet-qt/SecureShare/core/social/socialservice.cpp
gnunet-qt/SecureShare/core/social/socialservice.h
Modified:
gnunet-qt/SecureShare/SecureShare.pro
gnunet-qt/SecureShare/core/identity/identity.h
gnunet-qt/SecureShare/core/identity/identityService.cpp
gnunet-qt/SecureShare/models/IdentityModel.cpp
gnunet-qt/SecureShare/models/IdentityModel.h
Log:
Prepare for Social Service
Modified: gnunet-qt/SecureShare/SecureShare.pro
===================================================================
--- gnunet-qt/SecureShare/SecureShare.pro 2014-08-08 22:20:48 UTC (rev
34128)
+++ gnunet-qt/SecureShare/SecureShare.pro 2014-08-08 23:37:05 UTC (rev
34129)
@@ -18,7 +18,8 @@
core/identity/identity.cpp \
models/IdentityModel.cpp \
utils/helpers.cpp \
- utils/qrimageprovider.cpp
+ utils/qrimageprovider.cpp \
+ core/social/socialservice.cpp
RESOURCES += qml.qrc
@@ -41,4 +42,5 @@
core/identity/identity.h \
models/IdentityModel.h \
utils/helpers.h \
- utils/qrimageprovider.h
+ utils/qrimageprovider.h \
+ core/social/socialservice.h
Modified: gnunet-qt/SecureShare/core/identity/identity.h
===================================================================
--- gnunet-qt/SecureShare/core/identity/identity.h 2014-08-08 22:20:48 UTC
(rev 34128)
+++ gnunet-qt/SecureShare/core/identity/identity.h 2014-08-08 23:37:05 UTC
(rev 34129)
@@ -2,6 +2,7 @@
#define IDENTITY_H
#include <QObject>
+#include "core/gnunet/gnunet_includes.h"
class Identity : public QObject
{
@@ -33,10 +34,19 @@
QString url(){
return QString("GNUNET://GNS/%1/").arg(m_key);
}
+
+ GNUNET_IDENTITY_Ego* ego(){
+ return m_ego;
+ }
+ void setEgo(GNUNET_IDENTITY_Ego* ego){
+ m_ego = ego;
+ }
+
private:
int m_index;
QString m_name;
QString m_key;
+ GNUNET_IDENTITY_Ego * m_ego;
signals:
void modifiedSignal(int index);
Modified: gnunet-qt/SecureShare/core/identity/identityService.cpp
===================================================================
--- gnunet-qt/SecureShare/core/identity/identityService.cpp 2014-08-08
22:20:48 UTC (rev 34128)
+++ gnunet-qt/SecureShare/core/identity/identityService.cpp 2014-08-08
23:37:05 UTC (rev 34129)
@@ -114,7 +114,7 @@
QString strId = QString::fromLatin1(id);
QString strName = QString::fromLatin1(name);
- identity = theApp->models()->identityModel()->add(strId,strName);
+ identity = theApp->models()->identityModel()->add(strId,strName,ego);
*ego_ctx = identity;
Added: gnunet-qt/SecureShare/core/social/socialservice.cpp
===================================================================
--- gnunet-qt/SecureShare/core/social/socialservice.cpp
(rev 0)
+++ gnunet-qt/SecureShare/core/social/socialservice.cpp 2014-08-08 23:37:05 UTC
(rev 34129)
@@ -0,0 +1,29 @@
+#include "socialservice.h"
+
+
+SocialService::SocialService(QObject *parent) :
+ QObject(parent)
+{
+}
+
+
+void SocialService::id_host_ego_cb (void *cls, const struct
GNUNET_IDENTITY_Ego *ego)
+{
+ /*
+
+ GNUNET_assert (NULL != ego);
+ host_ego = ego;
+
+ host_slicer = GNUNET_SOCIAL_slicer_create ();
+ GNUNET_SOCIAL_slicer_add (host_slicer, "",
+ &host_recv_method, &host_recv_modifier,
+ &host_recv_data, &host_recv_eom, NULL);
+
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING, "Entering to place as host.\n");
+ hst = GNUNET_SOCIAL_host_enter (cfg, host_ego, place_key,
+ GNUNET_PSYC_CHANNEL_PRIVATE, host_slicer,
+ &host_entered, &host_answer_door,
+ &host_farewell, NULL);
+
+ */
+}
Added: gnunet-qt/SecureShare/core/social/socialservice.h
===================================================================
--- gnunet-qt/SecureShare/core/social/socialservice.h
(rev 0)
+++ gnunet-qt/SecureShare/core/social/socialservice.h 2014-08-08 23:37:05 UTC
(rev 34129)
@@ -0,0 +1,23 @@
+#ifndef SOCIALSERVICE_H
+#define SOCIALSERVICE_H
+
+#include <QObject>
+#include "core/gnunet/gnunet_includes.h"
+
+class SocialService : public QObject
+{
+ Q_OBJECT
+public:
+ explicit SocialService(QObject *parent = 0);
+
+ void id_host_ego_cb(void *cls, const GNUNET_IDENTITY_Ego *ego);
+signals:
+
+public slots:
+
+private:
+ GNUNET_IDENTITY_Ego *m_hostEgo;
+
+};
+
+#endif // SOCIALSERVICE_H
Modified: gnunet-qt/SecureShare/models/IdentityModel.cpp
===================================================================
--- gnunet-qt/SecureShare/models/IdentityModel.cpp 2014-08-08 22:20:48 UTC
(rev 34128)
+++ gnunet-qt/SecureShare/models/IdentityModel.cpp 2014-08-08 23:37:05 UTC
(rev 34129)
@@ -93,10 +93,11 @@
* @param key
* @return Return the new created place
*/
-Identity* IdentityModel::add(QString key, QString name)
+Identity* IdentityModel::add(QString key, QString name, struct
GNUNET_IDENTITY_Ego *ego)
{
Identity* iden = new Identity(key);
iden->setName(name);
+ iden->setEgo(ego);
iden->moveToThread(this->thread());
emit addNewIdentitySignal(iden,key);
Modified: gnunet-qt/SecureShare/models/IdentityModel.h
===================================================================
--- gnunet-qt/SecureShare/models/IdentityModel.h 2014-08-08 22:20:48 UTC
(rev 34128)
+++ gnunet-qt/SecureShare/models/IdentityModel.h 2014-08-08 23:37:05 UTC
(rev 34129)
@@ -39,7 +39,7 @@
explicit IdentityModel(QObject *parent = 0);
- Identity *add(QString key, QString name);
+ Identity *add(QString key, QString name, struct GNUNET_IDENTITY_Ego *ego);
Q_INVOKABLE int getCount();
bool contains(QString id);
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34129 - in gnunet-qt/SecureShare: . core core/identity core/social models,
gnunet <=