commit 67e9e0a5e4250ed7522cb5bd239ee61daf59c796
author Jeff Thompson <jefft0@gmail.com> Fri Aug 02 19:16:19 2013 -0700
committer Jeff Thompson <jefft0@gmail.com> Fri Aug 02 19:16:19 2013 -0700
tree e57556a29d2de5839e37175305ace02c55fb9628
parent f544701cb8e2a62809e43db03c78fb5b9779731c

Rename encode and decode to wireEncode and wireDecode

ndn-cpp/Interest.hpp

diff --git a/ndn-cpp/Interest.hpp b/ndn-cpp/Interest.hpp
index 449c0e5..370b093 100644
--- a/ndn-cpp/Interest.hpp
+++ b/ndn-cpp/Interest.hpp
@@ -140,29 +140,29 @@
   {
   }
   
-  ptr_lib::shared_ptr<std::vector<unsigned char> > encode(WireFormat &wireFormat) const 
+  ptr_lib::shared_ptr<std::vector<unsigned char> > wireEncode(WireFormat &wireFormat) const 
   {
     return wireFormat.encodeInterest(*this);
   }
-  ptr_lib::shared_ptr<std::vector<unsigned char> > encode() const 
+  ptr_lib::shared_ptr<std::vector<unsigned char> > wireEncode() const 
   {
-    return encode(*WireFormat::getDefaultWireFormat());
+    return wireEncode(*WireFormat::getDefaultWireFormat());
   }
-  void decode(const unsigned char *input, unsigned int inputLength, WireFormat &wireFormat) 
+  void wireDecode(const unsigned char *input, unsigned int inputLength, WireFormat &wireFormat) 
   {
     wireFormat.decodeInterest(*this, input, inputLength);
   }
-  void decode(const unsigned char *input, unsigned int inputLength) 
+  void wireDecode(const unsigned char *input, unsigned int inputLength) 
   {
-    decode(input, inputLength, *WireFormat::getDefaultWireFormat());
+    wireDecode(input, inputLength, *WireFormat::getDefaultWireFormat());
   }
-  void decode(const std::vector<unsigned char> &input, WireFormat &wireFormat) 
+  void wireDecode(const std::vector<unsigned char> &input, WireFormat &wireFormat) 
   {
-    decode(&input[0], input.size(), wireFormat);
+    wireDecode(&input[0], input.size(), wireFormat);
   }
-  void decode(const std::vector<unsigned char> &input) 
+  void wireDecode(const std::vector<unsigned char> &input) 
   {
-    decode(&input[0], input.size());
+    wireDecode(&input[0], input.size());
   }
   
   /**

ndn-cpp/data.hpp

diff --git a/ndn-cpp/data.hpp b/ndn-cpp/data.hpp
index bb616fb..7da6dad 100644
--- a/ndn-cpp/data.hpp
+++ b/ndn-cpp/data.hpp
@@ -84,29 +84,29 @@
   
 class Data {
 public:
-  ptr_lib::shared_ptr<std::vector<unsigned char> > encode(WireFormat &wireFormat) const 
+  ptr_lib::shared_ptr<std::vector<unsigned char> > wireEncode(WireFormat &wireFormat) const 
   {
     return wireFormat.encodeData(*this);
   }
-  ptr_lib::shared_ptr<std::vector<unsigned char> > encode() const 
+  ptr_lib::shared_ptr<std::vector<unsigned char> > wireEncode() const 
   {
-    return encode(*WireFormat::getDefaultWireFormat());
+    return wireEncode(*WireFormat::getDefaultWireFormat());
   }
-  void decode(const unsigned char *input, unsigned int inputLength, WireFormat &wireFormat) 
+  void wireDecode(const unsigned char *input, unsigned int inputLength, WireFormat &wireFormat) 
   {
     wireFormat.decodeData(*this, input, inputLength);
   }
-  void decode(const unsigned char *input, unsigned int inputLength) 
+  void wireDecode(const unsigned char *input, unsigned int inputLength) 
   {
-    decode(input, inputLength, *WireFormat::getDefaultWireFormat());
+    wireDecode(input, inputLength, *WireFormat::getDefaultWireFormat());
   }
-  void decode(const std::vector<unsigned char> &input, WireFormat &wireFormat) 
+  void wireDecode(const std::vector<unsigned char> &input, WireFormat &wireFormat) 
   {
-    decode(&input[0], input.size(), wireFormat);
+    wireDecode(&input[0], input.size(), wireFormat);
   }
-  void decode(const std::vector<unsigned char> &input) 
+  void wireDecode(const std::vector<unsigned char> &input) 
   {
-    decode(&input[0], input.size());
+    wireDecode(&input[0], input.size());
   }
   
   /**

ndn-cpp/face.cpp

diff --git a/ndn-cpp/face.cpp b/ndn-cpp/face.cpp
index f2212ea..4fa2325 100644
--- a/ndn-cpp/face.cpp
+++ b/ndn-cpp/face.cpp
@@ -16,7 +16,7 @@
 void Face::expressInterest(const Name &name, const shared_ptr<Closure> &closure, const Interest *interestTemplate)
 {
   Interest interest(name);
-  shared_ptr<vector<unsigned char> > encoding = interest.encode();  
+  shared_ptr<vector<unsigned char> > encoding = interest.wireEncode();  
 
   // TODO: This should go in the PIT.
   tempClosure_ = closure;
@@ -31,7 +31,7 @@
   
   if (decoder.peekDTag(ndn_BinaryXml_DTag_ContentObject)) {
     shared_ptr<Data> data(new Data());
-    data->decode(element, elementLength);
+    data->wireDecode(element, elementLength);
     
     shared_ptr<Interest> dummyInterest;
     UpcallInfo upcallInfo(this, dummyInterest, 0, data);