core/filter: Convert file to C

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

core/core.cpp

@@ -4,7 +4,9 @@
 #include <core/audio.h>
 #include <core/core.h>
 #include <core/deck.h>
+extern "C" {
 #include <core/filter.h>
+}
 #include <core/library.h>
 #include <core/playlist.h>
 #include <core/tags/tags.h>

core/filter.c

@@ -3,11 +3,8 @@
  */
 
 #include <core/filter.h>
-
-extern "C" {
 #include <core/index.h>
 #include <core/string.h>
-}
 
 
 static struct database filter_index;

core/tags/track.cpp

@@ -1,8 +1,8 @@
 /**
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <core/filter.h>
 extern "C" {
+#include <core/filter.h>
 #include <core/string.h>
 #include <taglib/tag_c.h>
 }

gui/queue/window.cpp

@@ -1,7 +1,9 @@
 /*
  * Copyright 2015 (c) Anna Schumaker.
  */
+extern "C" {
 #include <core/filter.h>
+}
 #include <gui/queue/window.h>
 
 QueueWindow :: QueueWindow(BaseObjectType *cobject,

include/core/filter.h

@@ -7,10 +7,7 @@
 #ifndef OCARINA_CORE_FILTER_H
 #define OCARINA_CORE_FILTER_H
 
-extern "C" {
 #include <core/set.h>
-}
-
 
 /* Called to initialize the filter index. */
 void filter_init();

tests/core/Sconscript

@@ -21,7 +21,7 @@ res += [ CoreTest("date",     "date.c")       ]
 res += [ CoreTest("set",      "set.c")        ]
 res += [ CoreTest("database", "database.c")   ]
 res += [ CoreTest("index",    "index.c")      ]
-res += [ CoreTest("filter",   "filter.cpp")   ]
+res += [ CoreTest("filter",   "filter.c")     ]
 res += [ CoreTest("idle",     "idle.cpp")     ]
 
 res += SConscript("tags/Sconscript")

tests/core/audio.cpp

@@ -2,7 +2,9 @@
  * Copyright 2013 (c) Anna Schumaker.
  */
 #include <core/audio.h>
+extern "C" {
 #include <core/filter.h>
+}
 #include <core/library.h>
 #include <core/tags/tags.h>
 #include "test.h"

tests/core/deck.cpp

@@ -2,7 +2,9 @@
  * Copyright 2013 (c) Anna Schumaker.
  */
 #include <core/deck.h>
+extern "C" {
 #include <core/filter.h>
+}
 #include <core/library.h>
 #include <core/tags/tags.h>
 #include "test.h"

tests/core/filter.c

@@ -2,7 +2,7 @@
  * Copyright 2014 (c) Anna Schumaker.
  */
 #include <core/filter.h>
-#include "test.h"
+#include <tests/test.h>
 
 const gchar *test_strings[] = {
 /* 0 */		"koji kondo",

tests/core/library.cpp

@@ -1,7 +1,9 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
+extern "C" {
 #include <core/filter.h>
+}
 #include <core/idle.h>
 #include <core/library.h>
 #include <core/tags/tags.h>

tests/core/playlist.cpp

@@ -1,7 +1,9 @@
 /*
  * Copyright 2013 (c) Anna Schumaker.
  */
+extern "C" {
 #include <core/filter.h>
+}
 #include <core/library.h>
 #include <core/playlist.h>
 #include <core/tags/tags.h>

tests/core/queue.cpp

@@ -1,9 +1,9 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <core/filter.h>
 #include <core/queue.h>
 extern "C" {
+#include <core/filter.h>
 #include <core/random.h>
 }
 #include <core/tags/tags.h>

tests/core/tags/track.cpp

@@ -2,9 +2,9 @@
  * Copyright 2014 (c) Anna Schumaker.
  */
 extern "C" {
+#include <core/filter.h>
 #include <core/string.h>
 }
-#include <core/filter.h>
 #include <core/tags/tags.h>
 #include <core/tags/track.h>
 #include "../test.h"