core/tags: Move tags_init() out of the tags namespace

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>

core/core.cpp

@@ -15,7 +15,7 @@ extern "C" {
 void core :: init()
 {
 	filter_init();
-	tags     :: init();
+	tags_init();
 	collection :: init();
 	playlist :: init();
 	deck     :: init();

core/tags/tags.cpp

@@ -10,7 +10,7 @@ extern "C" {
 #include <core/tags/tags.h>
 #include <core/tags/track.h>
 
-void tags :: init()
+void tags_init()
 {
 	album_db_init();
 	artist_db_init();

include/core/tags/tags.h

@@ -10,10 +10,12 @@
 namespace tags
 {
 
-	/** Called to read all databases from disk. */
-	void init();
 	void deinit();
 
 }
 
+
+/* Called to initialize and read all databases from disk. */
+void tags_init();
+
 #endif /* OCARINA_CORE_TAGS_TAGS_H */

tests/core/audio.cpp

@@ -86,7 +86,7 @@ void test_init()
 	test_equal(track, TRACK_NULL);
 
 	filter_init();
-	tags :: init();
+	tags_init();
 	collection :: init();
 	audio :: init();
 

tests/core/deck.cpp

@@ -22,7 +22,7 @@ static void test_init()
 
 	test_cp_data_dir();
 	filter_init();
-	tags :: init();
+	tags_init();
 	collection :: init();
 	deck :: init();
 

tests/core/library.cpp

@@ -22,7 +22,7 @@ static void test_init()
 
 	test_cp_data_dir();
 	filter_init();
-	tags :: init();
+	tags_init();
 	collection :: init();
 
 	test_equal(q->size(), (unsigned)24);

tests/core/playlist.cpp

@@ -27,7 +27,7 @@ static void test_init()
 
 	test_cp_data_dir();
 	filter_init();
-	tags :: init();
+	tags_init();
 	collection :: init();
 	playlist :: init();
 

tests/core/queue.cpp

@@ -92,7 +92,7 @@ void test_add_remove()
 
 	test_cp_data_dir();
 	filter_init();
-	tags :: init();
+	tags_init();
 
 	test_equal(q.length(), expected);
 	test_equal(q.size(), (unsigned)0);

tests/core/tags/track.cpp

@@ -97,7 +97,7 @@ static void test_track()
 
 	std::setlocale(LC_TIME, "C");
 	filter_init();
-	tags :: init();
+	tags_init();
 	file_init(&f, "track_tag", 0);
 	date    = string_tm2str(now);
 	library = library_find("tests/Music");