Tidy-up of version code

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@474493 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 14 insertions, 9 deletions

diff --git a/cpp/src/qpid/framing/ProtocolInitiation.cpp b/cpp/src/qpid/framing/ProtocolInitiation.cpp
index 6a0e1d31f5..22a2bd44e5 100644
--- a/cpp/src/qpid/framing/ProtocolInitiation.cpp
+++ b/cpp/src/qpid/framing/ProtocolInitiation.cpp
@@ -35,8 +35,8 @@ void qpid::framing::ProtocolInitiation::encode(Buffer& buffer){
     buffer.putOctet('P');
     buffer.putOctet(1);//class
     buffer.putOctet(1);//instance
-    buffer.putOctet(version.major_);
-    buffer.putOctet(version.minor_);    
+    buffer.putOctet(version.getMajor());
+    buffer.putOctet(version.getMinor());    
 }
 
 bool qpid::framing::ProtocolInitiation::decode(Buffer& buffer){
@@ -47,8 +47,8 @@ bool qpid::framing::ProtocolInitiation::decode(Buffer& buffer){
 	buffer.getOctet();//P
 	buffer.getOctet();//class
 	buffer.getOctet();//instance
-	version.major_ = buffer.getOctet();
-	version.minor_ = buffer.getOctet();
+	version.setMajor(buffer.getOctet());
+	version.setMinor(buffer.getOctet());
 	return true;
     }else{
 	return false;
diff --git a/cpp/src/qpid/framing/ProtocolInitiation.h b/cpp/src/qpid/framing/ProtocolInitiation.h
index 60ebbcfdf0..77c64363dd 100644
--- a/cpp/src/qpid/framing/ProtocolInitiation.h
+++ b/cpp/src/qpid/framing/ProtocolInitiation.h
@@ -42,8 +42,8 @@ public:
     virtual void encode(Buffer& buffer); 
     virtual bool decode(Buffer& buffer); 
     inline virtual u_int32_t size() const { return 8; }
-    inline u_int8_t getMajor(){ return version.major_; }
-    inline u_int8_t getMinor(){ return version.minor_; }
+    inline u_int8_t getMajor() const { return version.getMajor(); }
+    inline u_int8_t getMinor() const { return version.getMinor(); }
     inline const ProtocolVersion& getVersion() const { return version; }
 };
 
diff --git a/cpp/src/qpid/framing/ProtocolVersion.cpp b/cpp/src/qpid/framing/ProtocolVersion.cpp
index ff6c518d58..4d9b954f99 100644
--- a/cpp/src/qpid/framing/ProtocolVersion.cpp
+++ b/cpp/src/qpid/framing/ProtocolVersion.cpp
@@ -37,7 +37,7 @@ ProtocolVersion::ProtocolVersion(const ProtocolVersion::ProtocolVersion& p):
 
 ProtocolVersion::~ProtocolVersion()
 {}
-    
+
 bool  ProtocolVersion::equals(u_int8_t _major, u_int8_t _minor) const
 {
     return major_ == _major && minor_ == _minor;
diff --git a/cpp/src/qpid/framing/ProtocolVersion.h b/cpp/src/qpid/framing/ProtocolVersion.h
index 07ed3f10ed..3dbbd18535 100644
--- a/cpp/src/qpid/framing/ProtocolVersion.h
+++ b/cpp/src/qpid/framing/ProtocolVersion.h
@@ -30,15 +30,20 @@ namespace framing
 
 class ProtocolVersion
 {
-public:
+private:
     u_int8_t major_;
 	u_int8_t minor_;
     
+public:
     ProtocolVersion();
     ProtocolVersion(u_int8_t _major, u_int8_t _minor);
     ProtocolVersion(const ProtocolVersion& p);
     virtual ~ProtocolVersion();
-    
+
+    inline u_int8_t getMajor() const { return major_; }
+    inline void setMajor(u_int8_t major) { major_ = major; }
+    inline u_int8_t getMinor() const { return minor_; }
+    inline void setMinor(u_int8_t minor) { minor_ = minor; }
     virtual bool equals(u_int8_t _major, u_int8_t _minor) const;
     virtual bool equals(const ProtocolVersion& p) const;
     virtual const std::string toString() const;