From ac1983eae32caa7c6f10ec4bab32a9657bdb2668 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 8 Jan 2014 19:43:09 +0100
Subject: tag/TagBuilder: rename Commit() to CommitNew()

---
 src/tag/Tag.cxx        | 2 +-
 src/tag/TagBuilder.cxx | 2 +-
 src/tag/TagBuilder.hxx | 2 +-
 src/tag/TagId3.cxx     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/tag')

diff --git a/src/tag/Tag.cxx b/src/tag/Tag.cxx
index acfd24260..d6b3abe55 100644
--- a/src/tag/Tag.cxx
+++ b/src/tag/Tag.cxx
@@ -94,7 +94,7 @@ Tag::Merge(const Tag &base, const Tag &add)
 {
 	TagBuilder builder(add);
 	builder.Complement(base);
-	return builder.Commit();
+	return builder.CommitNew();
 }
 
 Tag *
diff --git a/src/tag/TagBuilder.cxx b/src/tag/TagBuilder.cxx
index 3e6d2aeb8..190307986 100644
--- a/src/tag/TagBuilder.cxx
+++ b/src/tag/TagBuilder.cxx
@@ -134,7 +134,7 @@ TagBuilder::Commit(Tag &tag)
 }
 
 Tag *
-TagBuilder::Commit()
+TagBuilder::CommitNew()
 {
 	Tag *tag = new Tag();
 	Commit(*tag);
diff --git a/src/tag/TagBuilder.hxx b/src/tag/TagBuilder.hxx
index fe647db08..302873ee4 100644
--- a/src/tag/TagBuilder.hxx
+++ b/src/tag/TagBuilder.hxx
@@ -101,7 +101,7 @@ public:
 	 * returned object is owned by the caller.  This object is
 	 * empty afterwards.
 	 */
-	Tag *Commit();
+	Tag *CommitNew();
 
 	void SetTime(int _time) {
 		time = _time;
diff --git a/src/tag/TagId3.cxx b/src/tag/TagId3.cxx
index 5e9432ce3..0397c0039 100644
--- a/src/tag/TagId3.cxx
+++ b/src/tag/TagId3.cxx
@@ -370,7 +370,7 @@ tag_id3_import(struct id3_tag *tag)
 	scan_id3_tag(tag, &add_tag_handler, &tag_builder);
 	return tag_builder.IsEmpty()
 		? nullptr
-		: tag_builder.Commit();
+		: tag_builder.CommitNew();
 }
 
 static size_t
-- 
cgit v1.2.3