1 files changed, 26 insertions, 26 deletions

diff --git a/cpp/src/qpid/framing/BasicHeaderProperties.h b/cpp/src/qpid/framing/BasicHeaderProperties.h
index 45539ca801..5dd470c37c 100644
--- a/cpp/src/qpid/framing/BasicHeaderProperties.h
+++ b/cpp/src/qpid/framing/BasicHeaderProperties.h
@@ -54,37 +54,37 @@ namespace framing {
 	virtual void encode(Buffer& buffer) const;
 	virtual void decode(Buffer& buffer, u_int32_t size);
 
-	inline virtual u_int8_t classId(){ return BASIC; }
+	inline virtual u_int8_t classId() { return BASIC; }
 
-	inline string& getContentType(){ return contentType; }
-	inline string& getContentEncoding(){ return contentEncoding; }
-	inline FieldTable& getHeaders(){ return headers; }
-	inline u_int8_t getDeliveryMode(){ return deliveryMode; }
-	inline u_int8_t getPriority(){ return priority; }
-	inline string& getCorrelationId(){return correlationId; }
-	inline string& getReplyTo(){ return replyTo; }
-	inline string& getExpiration(){ return expiration; }
-	inline string& getMessageId(){return messageId; }
-	inline u_int64_t getTimestamp(){ return timestamp; }
-	inline string& getType(){ return type; }
-	inline string& getUserId(){ return userId; }
-	inline string& getAppId(){ return appId; }
-	inline string& getClusterId(){ return clusterId; }
+	inline const string& getContentType() const { return contentType; }
+	inline const string& getContentEncoding() const { return contentEncoding; }
+	inline FieldTable& getHeaders() { return headers; }
+	inline u_int8_t getDeliveryMode() const { return deliveryMode; }
+	inline u_int8_t getPriority() const { return priority; }
+	inline const string& getCorrelationId() const {return correlationId; }
+	inline const string& getReplyTo() const { return replyTo; }
+	inline const string& getExpiration() const { return expiration; }
+	inline const string& getMessageId() const {return messageId; }
+	inline u_int64_t getTimestamp() const { return timestamp; }
+	inline const string& getType() const { return type; }
+	inline const string& getUserId() const { return userId; }
+	inline const string& getAppId() const { return appId; }
+	inline const string& getClusterId() const { return clusterId; }
 
-	void inline setContentType(string& _type){ contentType = _type; }
-	void inline setContentEncoding(string& encoding){ contentEncoding = encoding; }
-	void inline setHeaders(FieldTable& _headers){ headers = _headers; }
+	void inline setContentType(const string& _type){ contentType = _type; }
+	void inline setContentEncoding(const string& encoding){ contentEncoding = encoding; }
+	void inline setHeaders(const FieldTable& _headers){ headers = _headers; }
 	void inline setDeliveryMode(u_int8_t mode){ deliveryMode = mode; }
 	void inline setPriority(u_int8_t _priority){ priority = _priority; }
-	void inline setCorrelationId(string& _correlationId){ correlationId = _correlationId; }
-	void inline setReplyTo(string& _replyTo){ replyTo = _replyTo;}
-	void inline setExpiration(string&  _expiration){ expiration = _expiration; }
-	void inline setMessageId(string& _messageId){ messageId = _messageId; }
+	void inline setCorrelationId(const string& _correlationId){ correlationId = _correlationId; }
+	void inline setReplyTo(const string& _replyTo){ replyTo = _replyTo;}
+	void inline setExpiration(const string&  _expiration){ expiration = _expiration; }
+	void inline setMessageId(const string& _messageId){ messageId = _messageId; }
 	void inline setTimestamp(u_int64_t _timestamp){ timestamp = _timestamp; }
-	void inline setType(string& _type){ type = _type; }
-	void inline setUserId(string& _userId){ userId = _userId; }
-	void inline setAppId(string& _appId){appId = _appId; }
-	void inline setClusterId(string& _clusterId){ clusterId = _clusterId; }
+	void inline setType(const string& _type){ type = _type; }
+	void inline setUserId(const string& _userId){ userId = _userId; }
+	void inline setAppId(const string& _appId){appId = _appId; }
+	void inline setClusterId(const string& _clusterId){ clusterId = _clusterId; }
     };
 
 }