From 95d0736bb65d33d263a0f9cace4685b3e1ab3298 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Thu, 25 Jun 2015 23:25:29 -0700
Subject: [PATCH] More coding guidelines name changes, and use "using".

Change-Id: I48a898d13623749a55c469ba558155cd1467b4ce
---
 src/MessageReader.h | 10 +++-------
 src/MessageWriter.h | 16 +++++-----------
 src/WireDecoder.h   |  4 ++--
 src/WireEncoder.h   |  8 ++++----
 4 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/src/MessageReader.h b/src/MessageReader.h
index fbcfbc2de2..97897e61bd 100644
--- a/src/MessageReader.h
+++ b/src/MessageReader.h
@@ -52,15 +52,11 @@ class MessageReader : private WireDecoder {
                          unsigned int proto_rev);
   ~MessageReader();
 
-  void SetProtocolRev(unsigned int proto_rev) {
-    WireDecoder::SetProtocolRev(proto_rev);
-  }
-
   bool Run();
 
-  void Reset() { WireDecoder::Reset(); }
-
-  const char* GetError() const { return WireDecoder::GetError(); }
+  using WireDecoder::set_proto_rev;
+  using WireDecoder::Reset;
+  using WireDecoder::error;
 
   MessageReader(const MessageReader&) = delete;
   MessageReader& operator=(const MessageReader&) = delete;
diff --git a/src/MessageWriter.h b/src/MessageWriter.h
index a8f81e405b..88c8126618 100644
--- a/src/MessageWriter.h
+++ b/src/MessageWriter.h
@@ -17,17 +17,11 @@ class MessageWriter : private WireEncoder {
   explicit MessageWriter(unsigned int proto_rev) : WireEncoder(proto_rev) {}
   ~MessageWriter();
 
-  void SetProtocolRev(unsigned int proto_rev) {
-    WireEncoder::SetProtocolRev(proto_rev);
-  }
-
-  void Reset() { WireEncoder::Reset(); }
-
-  const char* GetError() const { return WireEncoder::GetError(); }
-
-  const char* GetData() const { return WireEncoder::GetData(); }
-
-  std::size_t GetSize() const { return WireEncoder::GetSize(); }
+  using WireEncoder::set_proto_rev;
+  using WireEncoder::Reset;
+  using WireEncoder::error;
+  using WireEncoder::data;
+  using WireEncoder::size;
 
   void WriteKeepAlive();
   void WriteClientHello(const NT_String& self_id);
diff --git a/src/WireDecoder.h b/src/WireDecoder.h
index 4bc6217692..9e48760602 100644
--- a/src/WireDecoder.h
+++ b/src/WireDecoder.h
@@ -21,11 +21,11 @@ class WireDecoder {
   explicit WireDecoder(raw_istream& is, unsigned int proto_rev);
   ~WireDecoder();
 
-  void SetProtocolRev(unsigned int proto_rev) { m_proto_rev = proto_rev; }
+  void set_proto_rev(unsigned int proto_rev) { m_proto_rev = proto_rev; }
 
   void Reset() { m_error = nullptr; }
 
-  const char* GetError() const { return m_error; }
+  const char* error() const { return m_error; }
 
   bool Read(char** buf, std::size_t len) {
     if (len > m_allocated) Realloc(len);
diff --git a/src/WireEncoder.h b/src/WireEncoder.h
index 80262d5dd2..c462883e06 100644
--- a/src/WireEncoder.h
+++ b/src/WireEncoder.h
@@ -20,18 +20,18 @@ class WireEncoder {
   explicit WireEncoder(unsigned int proto_rev);
   ~WireEncoder();
 
-  void SetProtocolRev(unsigned int proto_rev) { m_proto_rev = proto_rev; }
+  void set_proto_rev(unsigned int proto_rev) { m_proto_rev = proto_rev; }
 
   void Reset() {
     m_cur = m_start;
     m_error = nullptr;
   }
 
-  const char* GetError() const { return m_error; }
+  const char* error() const { return m_error; }
 
-  const char* GetData() const { return m_start; }
+  const char* data() const { return m_start; }
 
-  std::size_t GetSize() const { return m_cur - m_start; }
+  std::size_t size() const { return m_cur - m_start; }
 
   void Reserve(std::size_t len) {
     // assert(m_end > m_cur);