From 863d9cc51b406500dba596b6f1de733ec3f410c5 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Tue, 13 Jun 2017 00:49:13 +0100
Subject: Remove redundant _annotation_text from CPL.

---
 src/cpl.h | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/cpl.h')

diff --git a/src/cpl.h b/src/cpl.h
index 4219c523..7e6dac6f 100644
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -78,7 +78,11 @@ public:
 
 	/** @return contents of the &lt;AnnotationText&gt; node */
 	std::string annotation_text () const {
-		return _annotation_text;
+		return _metadata.annotation_text;
+	}
+
+	void set_annotation_text (std::string at) {
+		_metadata.annotation_text = at;
 	}
 
 	/** @return contents of the &lt;ContentTitleText&gt; node */
@@ -86,6 +90,10 @@ public:
 		return _content_title_text;
 	}
 
+	void set_content_title_text (std::string ct) {
+		_content_title_text = ct;
+	}
+
 	/** @return contents of the &lt;Id&gt; node within &lt;ContentVersion&gt; */
 	void set_content_version_id (std::string id) {
 		_content_version_id = id;
@@ -137,9 +145,8 @@ protected:
 	std::string pkl_type (Standard standard) const;
 
 private:
-	std::string _annotation_text;               ///< &lt;AnnotationText&gt;
-	/** &lt;Issuer&gt;, &lt;Creator&gt; and &lt;IssueDate&gt;.  These are grouped
-	 *  because they occur together in a few places.
+	/** &lt;Issuer&gt;, &lt;Creator&gt;, &lt;IssueDate&gt; and &lt;AnnotationText&gt.
+	 *  These are grouped because they occur together in a few places.
 	 */
 	XMLMetadata _metadata;
 	std::string _content_title_text;            ///< &lt;ContentTitleText&gt;
-- 
cgit v1.2.3