core/containers: Move index into the containers/ directory

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

core/containers/index.c

@@ -1,7 +1,7 @@
 /*
  * Copyright 2014 (c) Anna Schumaker.
  */
-#include <core/index.h>
+#include <core/containers/index.h>
 
 
 static struct index_entry *__index_alloc(gchar *key)

core/filter.c

@@ -2,8 +2,8 @@
  * Copyright 2013 (c) Anna Schumaker.
  */
 
+#include <core/containers/index.h>
 #include <core/filter.h>
-#include <core/index.h>
 #include <core/string.h>
 
 

gui/manager.cpp

@@ -5,7 +5,7 @@ extern "C" {
 #include <core/containers/database.h>
 #include <core/idle.h>
 }
-#include <core/index.h>
+#include <core/containers/index.h>
 #include <core/library.h>
 #include <core/playlist.h>
 #include <gui/ocarina.h>

include/core/containers/index.h

@@ -4,8 +4,8 @@
  * The struct index_entry is used to associate a database key
  * with a set of integers, creating an inverted index.
  */
-#ifndef OCARINA_CORE_INDEX_H
-#define OCARINA_CORE_INDEX_H
+#ifndef OCARINA_CORE_CONTAINERS_INDEX_H
+#define OCARINA_CORE_CONTAINERS_INDEX_H
 
 #include <core/containers/database.h>
 #include <core/containers/set.h>
@@ -35,4 +35,4 @@ bool index_has(struct database *, const gchar *, unsigned int);
 #ifdef CONFIG_TESTING
 const struct db_ops *test_index_ops();
 #endif /* CONFIG_TESTING */
-#endif /* OCARINA_CORE_INDEX_H */
+#endif /* OCARINA_CORE_CONTAINERS_INDEX_H */

include/core/playlist.h

@@ -5,7 +5,7 @@
 #define OCARINA_CORE_PLAYLIST_H
 
 extern "C" {
-#include <core/index.h>
+#include <core/containers/index.h>
 }
 #include <core/queue.h>
 

tests/core/Sconscript

@@ -20,7 +20,6 @@ res += [ CoreTest("file",     "file.c")       ]
 res += [ CoreTest("date",     "date.c")       ]
 
 res += SConscript("containers/Sconscript")
-res += [ CoreTest("index",    "index.c")      ]
 res += [ CoreTest("filter",   "filter.c")     ]
 res += [ CoreTest("idle",     "idle.c")       ]
 

tests/core/containers/Sconscript

@@ -13,5 +13,6 @@ def ContainerTest(name, source):
 
 res  = [ ContainerTest("set",      "set.c")      ]
 res  = [ ContainerTest("database", "database.c") ]
+res += [ ContainerTest("index",    "index.c")    ]
 
 Return("res")

tests/core/containers/index.c

@@ -2,7 +2,7 @@
  * Copyright 2014 (c) Anna Schumaker.
  * Test a Database
  */
-#include <core/index.h>
+#include <core/containers/index.h>
 #include <tests/test.h>