renamed structs PICA_conninfo to PICA_c2n (client-to-node) and PICA_chaninfo to PICA_c2c (client-to-client)

git-svn-id: svn://localhost/project_picapica/trunk@340 fb96df88-216d-11de-830c-f3023f12d8ac

4 files changed, 21 insertions, 21 deletions

diff --git a/pica-client/nodethread.cpp b/pica-client/nodethread.cpp
index 393c156..3850397 100644
--- a/pica-client/nodethread.cpp
+++ b/pica-client/nodethread.cpp
@@ -6,7 +6,7 @@
 
 QMutex NodeThread::finished_mutex;
 
-NodeThread::NodeThread(Nodes::NodeRecord &addr, bool *completed, Accounts::AccountRecord &acc, PICA_conninfo **pica_conn, QMutex *wm) :
+NodeThread::NodeThread(Nodes::NodeRecord &addr, bool *completed, Accounts::AccountRecord &acc, PICA_c2n **pica_conn, QMutex *wm) :
     QThread(0)
 {
     node_addr = addr;
diff --git a/pica-client/nodethread.h b/pica-client/nodethread.h
index 79de4d0..524688e 100644
--- a/pica-client/nodethread.h
+++ b/pica-client/nodethread.h
@@ -12,7 +12,7 @@ class NodeThread : public QThread
 {
     Q_OBJECT
 public:
-    explicit NodeThread( Nodes::NodeRecord &addr, bool *completed,Accounts::AccountRecord &acc,struct PICA_conninfo **pica_conn, QMutex *wm);
+    explicit NodeThread( Nodes::NodeRecord &addr, bool *completed,Accounts::AccountRecord &acc,struct PICA_c2n **pica_conn, QMutex *wm);
     void CloseThread();
 private:
     void run();
@@ -22,9 +22,9 @@ private:
 
     bool *finished_flag;
     Nodes::NodeRecord  node_addr;
-    struct PICA_conninfo *ci;
+    struct PICA_c2n *ci;
     Accounts::AccountRecord user_account;
-    struct PICA_conninfo **connection;
+    struct PICA_c2n **connection;
 
     int exit;
 
diff --git a/pica-client/skynet.cpp b/pica-client/skynet.cpp
index 54b1a85..fda9a31 100644
--- a/pica-client/skynet.cpp
+++ b/pica-client/skynet.cpp
@@ -89,7 +89,7 @@ void SkyNet::nodethread_connected(QString addr, quint16 port, NodeThread *thread
     {
         int ret;
         write_mutex.lock();
-        struct PICA_chaninfo *chan = NULL;
+        struct PICA_c2c *chan = NULL;
 
         ret = PICA_create_channel(nodelink, (const unsigned char*)c2c_peer_ids[i].constData(), &chan);
 
@@ -181,7 +181,7 @@ void SkyNet::timerEvent(QTimerEvent *e)
             {
                 int ret;
 
-                struct PICA_chaninfo *chan = NULL;
+                struct PICA_c2c *chan = NULL;
 
                 ret = PICA_create_channel(nodelink, (const unsigned char*)c2c_peer_ids[i].constData(), &chan);
 
@@ -240,7 +240,7 @@ bool SkyNet::isSelfAware()
 void SkyNet::SendFile(QByteArray to, QString filepath)
 {
 int ret = PICA_OK;
-struct PICA_chaninfo *iptr;
+struct PICA_c2c *iptr;
 
 write_mutex.lock();//<<
 
@@ -263,7 +263,7 @@ if ( (iptr = find_active_chan(to)) )
     }
     else
     {
-       struct PICA_chaninfo *chan = NULL;
+       struct PICA_c2c *chan = NULL;
 
        ret = PICA_create_channel(nodelink, (const unsigned char*)to.constData(), &chan);
 
@@ -283,7 +283,7 @@ write_mutex.unlock();//>>
 void SkyNet::AcceptFile(QByteArray from, QString filepath)
 {
 int ret = PICA_OK;
-struct PICA_chaninfo *iptr;
+struct PICA_c2c *iptr;
 
 write_mutex.lock();//<<
 if ( (iptr = find_active_chan(from)) )
@@ -302,7 +302,7 @@ write_mutex.unlock();//>>
 void SkyNet::DenyFile(QByteArray from)
 {
 int ret = PICA_OK;
-struct PICA_chaninfo *iptr;
+struct PICA_c2c *iptr;
 
 write_mutex.lock();//<<
 if ( (iptr = find_active_chan(from)) )
@@ -321,7 +321,7 @@ write_mutex.unlock();//>>
 void SkyNet::PauseFile(QByteArray peer_id, bool pause_sending)
 {
 int ret = PICA_OK;
-struct PICA_chaninfo *iptr;
+struct PICA_c2c *iptr;
 
 write_mutex.lock();//<<
 if ( (iptr = find_active_chan(peer_id)) )
@@ -340,7 +340,7 @@ write_mutex.unlock();//>>
 void SkyNet::ResumeFile(QByteArray peer_id, bool resume_sending)
 {
 int ret = PICA_OK;
-struct PICA_chaninfo *iptr;
+struct PICA_c2c *iptr;
 
 write_mutex.lock();//<<
 if ( (iptr = find_active_chan(peer_id)) )
@@ -358,7 +358,7 @@ write_mutex.unlock();//>>
 void SkyNet::CancelFile(QByteArray peer_id, bool cancel_sending)
 {
 int ret = PICA_OK;
-struct PICA_chaninfo *iptr;
+struct PICA_c2c *iptr;
 
 write_mutex.lock();//<<
 if ( (iptr = find_active_chan(peer_id)) )
@@ -376,7 +376,7 @@ write_mutex.unlock();//>>
 void SkyNet::SendMessage(QByteArray to, QString msg)
 {
 int ret = PICA_OK;
-struct PICA_chaninfo *iptr;
+struct PICA_c2c *iptr;
 
 write_mutex.lock();//<<
 
@@ -399,7 +399,7 @@ if ( (iptr = find_active_chan(to)) )
     }
     else
     {
-        struct PICA_chaninfo *chan = NULL;
+        struct PICA_c2c *chan = NULL;
 
         ret = PICA_create_channel(nodelink, (const unsigned char*)to.constData(), &chan);
 
@@ -418,7 +418,7 @@ write_mutex.unlock();//>>
 
 void SkyNet::flush_queues(QByteArray to)
 {
-    struct PICA_chaninfo *chan;
+    struct PICA_c2c *chan;
     int ret;
 
     if (self_aware && (msgqueues.contains(to) || sndfilequeues.contains(to)))
@@ -466,12 +466,12 @@ void SkyNet::flush_queues(QByteArray to)
     }
 }
 
-struct PICA_chaninfo * SkyNet::find_active_chan(QByteArray peer_id)
+struct PICA_c2c * SkyNet::find_active_chan(QByteArray peer_id)
 {
 if (!nodelink)
   return NULL;
 
-struct PICA_chaninfo *iptr = nodelink->chan_list_head;
+struct PICA_c2c *iptr = nodelink->chan_list_head;
 
 while(iptr)
     {
@@ -491,7 +491,7 @@ QList<QByteArray> SkyNet::filter_existing_chans(QList<QByteArray> peer_ids)
     if (!nodelink)
       return ret;
 
-    struct PICA_chaninfo *iptr = nodelink->chan_list_head;
+    struct PICA_c2c *iptr = nodelink->chan_list_head;
 
     while(iptr)
         {
diff --git a/pica-client/skynet.h b/pica-client/skynet.h
index 5aeb332..a0f974b 100644
--- a/pica-client/skynet.h
+++ b/pica-client/skynet.h
@@ -62,7 +62,7 @@ private:
     QList<NodeThread*> threads;
     bool self_aware;
     QString status;
-    struct PICA_conninfo *nodelink;
+    struct PICA_c2n *nodelink;
     Accounts::AccountRecord skynet_account;
     QMutex write_mutex;
     QMap<QByteArray, QList<QString> > msgqueues;
@@ -72,7 +72,7 @@ private:
     void timerEvent(QTimerEvent * e);
 
     void flush_queues(QByteArray to);
-    struct PICA_chaninfo *find_active_chan(QByteArray peer_id);
+    struct PICA_c2c *find_active_chan(QByteArray peer_id);
     QList<QByteArray> filter_existing_chans(QList<QByteArray> peer_ids);
 
     void emit_MessageReceived(QByteArray from, QString msg);