commit a7876727b0b405fec8dcbe82443c233c7493fa08
author Yingdi Yu <yuyingdi@gmail.com> Tue Mar 25 14:46:55 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri May 09 15:16:11 2014 -0700
tree 95c47eb34c8c286c6d0970601893f93f602fc5c2
parent 5a5ff203ab3f3b65db9d0c7596039a5c4603a570

time: Adapt to ndn-cpp-dev's new time structure

Change-Id: I4117d4e7aea5347cbaf3ec2e5e5a110f94930262

src/controller.cpp

diff --git a/src/controller.cpp b/src/controller.cpp
index 646dfc1..4d80604 100644
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -257,7 +257,7 @@
       m_identity.clear();
       // TODO: change below to system default;
       m_identity.append("chronochat-tmp-identity")
-        .append(boost::lexical_cast<std::string>(random::generateWord64()));
+        .append(getRandomString());
       
       m_nick = m_identity.get(-1).toUri();
     }
@@ -608,7 +608,7 @@
 {
   // Name interestName();
   Interest interest("/local/ndn/prefix");
-  interest.setInterestLifetime(1000);
+  interest.setInterestLifetime(time::milliseconds(1000));
   interest.setMustBeFresh(true);
 
   m_face->expressInterest(interest, 
@@ -650,7 +650,7 @@
   delete m_browseContactDialog;
   delete m_addContactPanel;
 
-  m_face->shutdown();
+  m_face->ioService()->stop();
 
   QApplication::quit();
 }
@@ -699,12 +699,12 @@
       chatroomCert = m_keyChain.getCertificate(m_keyChain.getDefaultCertificateNameForIdentity(m_identity));
 
       response.setContent(chatroomCert->wireEncode());
-      response.setFreshnessPeriod(1000);      
+      response.setFreshnessPeriod(time::milliseconds(1000));
     }
   else
     {
       response.setName(invitationName);
-      response.setFreshnessPeriod(1000);
+      response.setFreshnessPeriod(time::milliseconds(1000));
     }
   m_keyChain.signByIdentity(response, m_identity);
   
@@ -725,7 +725,7 @@
       
       Data wrappedData(wrappedName);
       wrappedData.setContent(response.wireEncode());
-      wrappedData.setFreshnessPeriod(1000);
+      wrappedData.setFreshnessPeriod(time::milliseconds(1000));
 
       m_keyChain.signByIdentity(wrappedData, m_identity);
       m_face->put(wrappedData);