From 800aeda63303f58384b3f8b905ee5c819a5c698a Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Thu, 12 Nov 2015 10:29:36 -0500 Subject: [PATCH] core/tags: Move tags_deinit() out of the tags namespace Signed-off-by: Anna Schumaker --- core/tags/tags.cpp | 2 +- include/core/tags/tags.h | 13 +++---------- tests/core/tags/track.cpp | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/core/tags/tags.cpp b/core/tags/tags.cpp index be5e134d..de2ba9ea 100644 --- a/core/tags/tags.cpp +++ b/core/tags/tags.cpp @@ -19,7 +19,7 @@ void tags_init() track_db_init(); } -void tags :: deinit() +void tags_deinit() { track_db_deinit(); library_db_deinit(); diff --git a/include/core/tags/tags.h b/include/core/tags/tags.h index b4812cdd..874f4047 100644 --- a/include/core/tags/tags.h +++ b/include/core/tags/tags.h @@ -4,18 +4,11 @@ #ifndef OCARINA_CORE_TAGS_TAGS_H #define OCARINA_CORE_TAGS_TAGS_H -/** - * Namespace for creating and accessing tags. - */ -namespace tags -{ - - void deinit(); - -} - /* Called to initialize and read all databases from disk. */ void tags_init(); +/* Called to clean up all databases. */ +void tags_deinit(); + #endif /* OCARINA_CORE_TAGS_TAGS_H */ diff --git a/tests/core/tags/track.cpp b/tests/core/tags/track.cpp index 8aaa441e..687cb7a3 100644 --- a/tests/core/tags/track.cpp +++ b/tests/core/tags/track.cpp @@ -216,7 +216,7 @@ static void test_track_db() test_equal(track_db_get()->db_size, 0); db_deinit(&track_db); - tags :: deinit(); + tags_deinit(); filter_deinit(); }