commit 0cfc151552b6287dc0d9c51bc780240a80329ac7
author Qiuhan Ding <dingqiuhan@gmail.com> Tue Feb 17 17:44:11 2015 -0800
committer Qiuhan Ding <dingqiuhan@gmail.com> Sun Apr 12 16:02:10 2015 -0700
tree 62cd8b4309ff4cca24675953285b9d4b956db1d6
parent f340118c72a97a31e1393b68c3ed4ae145d79622

remove protobuf dependency

Change-Id: I10bf90ba940bbde27d91df58056f4f558843f697

src/contact-manager.hpp

diff --git a/src/contact-manager.hpp b/src/contact-manager.hpp
index 635f5a1..5ef7983 100644
--- a/src/contact-manager.hpp
+++ b/src/contact-manager.hpp
@@ -6,6 +6,7 @@
  * BSD license, See the LICENSE file for more information
  *
  * Author: Yingdi Yu <yingdi@cs.ucla.edu>
+ *         Qiuhan Ding <qiuhanding@cs.ucla.edu>
  */
 
 #ifndef CHRONOCHAT_CONTACT_MANAGER_HPP
@@ -18,8 +19,8 @@
 #include "contact-storage.hpp"
 #include "endorse-certificate.hpp"
 #include "profile.hpp"
-#include "endorse-info.pb.h"
-#include "endorse-collection.pb.h"
+#include "endorse-info.hpp"
+#include "endorse-collection.hpp"
 #include <ndn-cxx/security/key-chain.hpp>
 #include <ndn-cxx/security/validator.hpp>
 #include <boost/thread/locks.hpp>
@@ -63,7 +64,7 @@
   fetchCollectEndorse(const Name& identity);
 
   void
-  fetchEndorseCertificateInternal(const Name& identity, int certIndex);
+  fetchEndorseCertificateInternal(const Name& identity, size_t certIndex);
 
   void
   prepareEndorseInfo(const Name& identity);
@@ -97,12 +98,13 @@
   // PROFILE-CERT: endorse-certificate
   void
   onEndorseCertificateInternal(const Interest& interest, Data& data,
-                               const Name& identity, int certIndex, std::string hash);
+                               const Name& identity, size_t certIndex,
+                               std::string hash);
 
   void
   onEndorseCertificateInternalTimeout(const Interest& interest,
                                       const Name& identity,
-                                      int certIndex);
+                                      size_t certIndex);
 
   // Collect endorsement
   void
@@ -181,7 +183,7 @@
 
 signals:
   void
-  contactEndorseInfoReady(const chronochat::EndorseInfo& endorseInfo);
+  contactEndorseInfoReady(const EndorseInfo& endorseInfo);
 
   void
   contactInfoFetchFailed(const QString& identity);
@@ -257,7 +259,7 @@
     shared_ptr<EndorseCertificate> m_selfEndorseCert;
     shared_ptr<EndorseCollection> m_endorseCollection;
     std::vector<shared_ptr<EndorseCertificate> > m_endorseCertList;
-    shared_ptr<chronochat::EndorseInfo> m_endorseInfo;
+    shared_ptr<EndorseInfo> m_endorseInfo;
   };
 
   typedef std::map<Name, FetchedInfo> BufferedContacts;
@@ -282,10 +284,10 @@
   const ndn::RegisteredPrefixId* m_dnsListenerId;
 
   RecLock m_collectCountMutex;
-  int m_collectCount;
+  size_t m_collectCount;
 
   RecLock m_idCertCountMutex;
-  int m_idCertCount;
+  size_t m_idCertCount;
 };
 
 } // namespace chronochat