Rename LanguageTag::to_string -> as_string().

8 files changed, 32 insertions, 32 deletions

diff --git a/src/cpl.cc b/src/cpl.cc
index 0e4fed89..f3e8f6dc 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -807,7 +807,7 @@ CPL::set_additional_subtitle_languages(vector<dcp::LanguageTag> const& langs)
 {
 	_additional_subtitle_languages.clear();
 	for (auto const& i: langs) {
-		_additional_subtitle_languages.push_back(i.to_string());
+		_additional_subtitle_languages.push_back(i.as_string());
 	}
 }
 
diff --git a/src/cpl.h b/src/cpl.h
index 938d5f3b..389ec411 100644
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -224,7 +224,7 @@ public:
 	}
 
 	void set_full_content_title_text_language(dcp::LanguageTag l) {
-		_full_content_title_text_language = l.to_string();
+		_full_content_title_text_language = l.as_string();
 	}
 
 	boost::optional<std::string> release_territory() const {
@@ -324,7 +324,7 @@ public:
 	void set_additional_subtitle_languages(std::vector<dcp::LanguageTag> const& lang);
 
 	void set_sign_language_video_language(dcp::LanguageTag lang) {
-		_sign_language_video_language = lang.to_string();
+		_sign_language_video_language = lang.as_string();
 	}
 
 	boost::optional<std::string> sign_language_video_language() const {
diff --git a/src/language_tag.cc b/src/language_tag.cc
index 037814f9..227620be 100644
--- a/src/language_tag.cc
+++ b/src/language_tag.cc
@@ -149,7 +149,7 @@ LanguageTag::LanguageTag (string tag)
 
 
 string
-LanguageTag::to_string () const
+LanguageTag::as_string() const
 {
 	if (!_language) {
 		throw LanguageTagError("No language set up");
@@ -336,28 +336,28 @@ LanguageTag::subtag_type_name (SubtagType type)
 bool
 dcp::operator== (dcp::LanguageTag const& a, dcp::LanguageTag const& b)
 {
-	return a.to_string() == b.to_string();
+	return a.as_string() == b.as_string();
 }
 
 
 bool
 dcp::operator!= (dcp::LanguageTag const& a, dcp::LanguageTag const& b)
 {
-	return a.to_string() != b.to_string();
+	return a.as_string() != b.as_string();
 }
 
 
 bool
 dcp::operator< (dcp::LanguageTag const& a, dcp::LanguageTag const& b)
 {
-	return a.to_string() < b.to_string();
+	return a.as_string() < b.as_string();
 }
 
 
 ostream&
 dcp::operator<< (ostream& os, dcp::LanguageTag const& tag)
 {
-	os << tag.to_string();
+	os << tag.as_string();
 	return os;
 }
 
diff --git a/src/language_tag.h b/src/language_tag.h
index 3232dda9..d3eba28b 100644
--- a/src/language_tag.h
+++ b/src/language_tag.h
@@ -53,8 +53,8 @@ namespace dcp {
 class LanguageTag
 {
 public:
-	std::string to_string () const;
-	std::string description () const;
+	std::string as_string() const;
+	std::string description() const;
 
 	struct SubtagData
 	{
diff --git a/src/reel_text_asset.cc b/src/reel_text_asset.cc
index 248a2ab3..31cbdacd 100644
--- a/src/reel_text_asset.cc
+++ b/src/reel_text_asset.cc
@@ -86,7 +86,7 @@ ReelTextAsset::ReelTextAsset(std::shared_ptr<const cxml::Node> node)
 void
 ReelTextAsset::set_language(dcp::LanguageTag language)
 {
-	_language = language.to_string();
+	_language = language.as_string();
 }
 
 
diff --git a/src/smpte_text_asset.h b/src/smpte_text_asset.h
index 24665d3a..6a08ffe4 100644
--- a/src/smpte_text_asset.h
+++ b/src/smpte_text_asset.h
@@ -104,7 +104,7 @@ public:
 	}
 
 	void set_language (dcp::LanguageTag l) {
-		_language = l.to_string();
+		_language = l.as_string();
 	}
 
 	void set_issue_date (LocalTime t) {
diff --git a/src/sound_asset.cc b/src/sound_asset.cc
index c73255b8..f671a58a 100644
--- a/src/sound_asset.cc
+++ b/src/sound_asset.cc
@@ -127,7 +127,7 @@ SoundAsset::SoundAsset (Fraction edit_rate, int sampling_rate, int channels, Lan
 	, _edit_rate (edit_rate)
 	, _channels (channels)
 	, _sampling_rate (sampling_rate)
-	, _language (language.to_string())
+	, _language(language.as_string())
 {
 
 }
diff --git a/test/language_tag_test.cc b/test/language_tag_test.cc
index 684937b1..e3547bbc 100644
--- a/test/language_tag_test.cc
+++ b/test/language_tag_test.cc
@@ -48,7 +48,7 @@ BOOST_AUTO_TEST_CASE (language_tag_create_test)
 	{
 		dcp::LanguageTag t;
 
-		BOOST_CHECK_THROW (t.to_string(), dcp::LanguageTagError);
+		BOOST_CHECK_THROW(t.as_string(), dcp::LanguageTagError);
 
 		BOOST_CHECK_THROW (t.set_language("sheila"), dcp::LanguageTagError);
 		BOOST_CHECK_THROW (t.set_script("frobozz"), dcp::LanguageTagError);
@@ -74,7 +74,7 @@ BOOST_AUTO_TEST_CASE (language_tag_create_test)
 	{
 		dcp::LanguageTag t;
 		BOOST_CHECK_NO_THROW (t.set_language("de"));
-		BOOST_CHECK_EQUAL (t.to_string(), "de");
+		BOOST_CHECK_EQUAL(t.as_string(), "de");
 		BOOST_CHECK_EQUAL (t.description(), "German");
 	}
 
@@ -83,7 +83,7 @@ BOOST_AUTO_TEST_CASE (language_tag_create_test)
 	{
 		dcp::LanguageTag t;
 		BOOST_CHECK_NO_THROW (t.set_language("dE"));
-		BOOST_CHECK_EQUAL (t.to_string(), "dE");
+		BOOST_CHECK_EQUAL(t.as_string(), "dE");
 	}
 
 	/* Language + script */
@@ -92,7 +92,7 @@ BOOST_AUTO_TEST_CASE (language_tag_create_test)
 		dcp::LanguageTag t;
 		BOOST_CHECK_NO_THROW (t.set_language("zh"));
 		BOOST_CHECK_NO_THROW (t.set_script("Hant"));
-		BOOST_CHECK_EQUAL (t.to_string(), "zh-Hant");
+		BOOST_CHECK_EQUAL(t.as_string(), "zh-Hant");
 		BOOST_CHECK_EQUAL (t.description(), "Chinese written using the Han (Traditional variant) script");
 	}
 
@@ -102,7 +102,7 @@ BOOST_AUTO_TEST_CASE (language_tag_create_test)
 		dcp::LanguageTag t;
 		BOOST_CHECK_NO_THROW (t.set_language("de"));
 		BOOST_CHECK_NO_THROW (t.set_region("DE"));
-		BOOST_CHECK_EQUAL (t.to_string(), "de-DE");
+		BOOST_CHECK_EQUAL(t.as_string(), "de-DE");
 		BOOST_CHECK_EQUAL (t.description(), "German for Germany");
 	}
 
@@ -112,7 +112,7 @@ BOOST_AUTO_TEST_CASE (language_tag_create_test)
 		dcp::LanguageTag t;
 		BOOST_CHECK_NO_THROW (t.set_language("sl"));
 		BOOST_CHECK_NO_THROW (t.add_variant("rozaj"));
-		BOOST_CHECK_EQUAL (t.to_string(), "sl-rozaj");
+		BOOST_CHECK_EQUAL(t.as_string(), "sl-rozaj");
 		BOOST_CHECK_EQUAL (t.description(), "Resian/Resianic/Rezijan dialect of Slovenian");
 	}
 
@@ -123,7 +123,7 @@ BOOST_AUTO_TEST_CASE (language_tag_create_test)
 		BOOST_CHECK_NO_THROW (t.set_language("sl"));
 		BOOST_CHECK_NO_THROW (t.add_variant("biske"));
 		BOOST_CHECK_NO_THROW (t.add_variant("rozaj"));
-		BOOST_CHECK_EQUAL (t.to_string(), "sl-biske-rozaj");
+		BOOST_CHECK_EQUAL(t.as_string(), "sl-biske-rozaj");
 		BOOST_CHECK_EQUAL (t.description(), "The San Giorgio dialect of Resian/The Bila dialect of Resian dialect of Resian/Resianic/Rezijan dialect of Slovenian");
 	}
 
@@ -133,7 +133,7 @@ BOOST_AUTO_TEST_CASE (language_tag_create_test)
 		dcp::LanguageTag t;
 		BOOST_CHECK_NO_THROW (t.set_language("sl"));
 		BOOST_CHECK_NO_THROW (t.add_extlang("afb"));
-		BOOST_CHECK_EQUAL (t.to_string(), "sl-afb");
+		BOOST_CHECK_EQUAL(t.as_string(), "sl-afb");
 		BOOST_CHECK_EQUAL (t.description(), "Slovenian, Gulf Arabic");
 	}
 
@@ -144,7 +144,7 @@ BOOST_AUTO_TEST_CASE (language_tag_create_test)
 		BOOST_CHECK_NO_THROW (t.set_language("sl"));
 		BOOST_CHECK_NO_THROW (t.add_extlang("afb"));
 		BOOST_CHECK_NO_THROW (t.add_extlang("ltg"));
-		BOOST_CHECK_EQUAL (t.to_string(), "sl-afb-ltg");
+		BOOST_CHECK_EQUAL(t.as_string(), "sl-afb-ltg");
 		BOOST_CHECK_EQUAL (t.description(), "Slovenian, Gulf Arabic, Latgalian");
 	}
 
@@ -155,7 +155,7 @@ BOOST_AUTO_TEST_CASE (language_tag_create_test)
 		BOOST_CHECK_NO_THROW (t.set_language("zh"));
 		BOOST_CHECK_NO_THROW (t.set_script("Hant"));
 		BOOST_CHECK_NO_THROW (t.set_region("DE"));
-		BOOST_CHECK_EQUAL (t.to_string(), "zh-Hant-DE");
+		BOOST_CHECK_EQUAL(t.as_string(), "zh-Hant-DE");
 		BOOST_CHECK_EQUAL (t.description(), "Chinese written using the Han (Traditional variant) script for Germany");
 	}
 
@@ -167,7 +167,7 @@ BOOST_AUTO_TEST_CASE (language_tag_create_test)
 		BOOST_CHECK_NO_THROW (t.set_script("Latn"));
 		BOOST_CHECK_NO_THROW (t.set_region("IT"));
 		BOOST_CHECK_NO_THROW (t.add_variant("arevela"));
-		BOOST_CHECK_EQUAL (t.to_string(), "hy-Latn-IT-arevela");
+		BOOST_CHECK_EQUAL(t.as_string(), "hy-Latn-IT-arevela");
 		BOOST_CHECK_EQUAL (t.description(), "Eastern Armenian dialect of Armenian written using the Latin script for Italy");
 	}
 
@@ -180,7 +180,7 @@ BOOST_AUTO_TEST_CASE (language_tag_create_test)
 		BOOST_CHECK_NO_THROW (t.set_region("IT"));
 		BOOST_CHECK_NO_THROW (t.add_variant("arevela"));
 		BOOST_CHECK_NO_THROW (t.add_extlang("ltg"));
-		BOOST_CHECK_EQUAL (t.to_string(), "hy-Latn-IT-arevela-ltg");
+		BOOST_CHECK_EQUAL(t.as_string(), "hy-Latn-IT-arevela-ltg");
 		BOOST_CHECK_EQUAL (t.description(), "Eastern Armenian dialect of Armenian written using the Latin script for Italy, Latgalian");
 	}
 
@@ -195,12 +195,12 @@ BOOST_AUTO_TEST_CASE (language_tag_parse_test)
 	BOOST_CHECK_THROW (dcp::LanguageTag("de-Dogr-fish"), dcp::LanguageTagError);
 	BOOST_CHECK_THROW (dcp::LanguageTag("de-Dogr-DE-aranes-fish"), dcp::LanguageTagError);
 
-	BOOST_CHECK_EQUAL (dcp::LanguageTag("de").to_string(), "de");
-	BOOST_CHECK_EQUAL (dcp::LanguageTag("de-Dogr").to_string(), "de-Dogr");
-	BOOST_CHECK_EQUAL (dcp::LanguageTag("de-Dogr-DE").to_string(), "de-Dogr-DE");
-	BOOST_CHECK_EQUAL (dcp::LanguageTag("de-Dogr-DE-aranes").to_string(), "de-Dogr-DE-aranes");
-	BOOST_CHECK_EQUAL (dcp::LanguageTag("de-Dogr-DE-aranes-lemosin").to_string(), "de-Dogr-DE-aranes-lemosin");
-	BOOST_CHECK_EQUAL (dcp::LanguageTag("de-Dogr-DE-aranes-lemosin-abv").to_string(), "de-Dogr-DE-aranes-lemosin-abv");
-	BOOST_CHECK_EQUAL (dcp::LanguageTag("de-Dogr-DE-aranes-lemosin-abv-zsm").to_string(), "de-Dogr-DE-aranes-lemosin-abv-zsm");
+	BOOST_CHECK_EQUAL(dcp::LanguageTag("de").as_string(), "de");
+	BOOST_CHECK_EQUAL(dcp::LanguageTag("de-Dogr").as_string(), "de-Dogr");
+	BOOST_CHECK_EQUAL(dcp::LanguageTag("de-Dogr-DE").as_string(), "de-Dogr-DE");
+	BOOST_CHECK_EQUAL(dcp::LanguageTag("de-Dogr-DE-aranes").as_string(), "de-Dogr-DE-aranes");
+	BOOST_CHECK_EQUAL(dcp::LanguageTag("de-Dogr-DE-aranes-lemosin").as_string(), "de-Dogr-DE-aranes-lemosin");
+	BOOST_CHECK_EQUAL(dcp::LanguageTag("de-Dogr-DE-aranes-lemosin-abv").as_string(), "de-Dogr-DE-aranes-lemosin-abv");
+	BOOST_CHECK_EQUAL(dcp::LanguageTag("de-Dogr-DE-aranes-lemosin-abv-zsm").as_string(), "de-Dogr-DE-aranes-lemosin-abv-zsm");
 }